diff --git a/.github/ISSUE_TEMPLATE/flaky-test.yml b/.github/ISSUE_TEMPLATE/flaky-test.yml index f46ff539849ec..d3e5ec061713e 100644 --- a/.github/ISSUE_TEMPLATE/flaky-test.yml +++ b/.github/ISSUE_TEMPLATE/flaky-test.yml @@ -51,9 +51,9 @@ body:
Full exception stacktrace - 
+        

           full exception stacktrace here
-        

+
validations: required: true diff --git a/.github/workflows/ci-go-functions.yaml b/.github/workflows/ci-go-functions.yaml index cb21a5028c63e..8ff8023fe4660 100644 --- a/.github/workflows/ci-go-functions.yaml +++ b/.github/workflows/ci-go-functions.yaml @@ -32,10 +32,10 @@ concurrency: cancel-in-progress: true env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_OPTS: -Xss1500k -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 jobs: - changed_files_job: + preconditions: name: Preconditions runs-on: ubuntu-20.04 outputs: @@ -65,8 +65,8 @@ jobs: build/pulsar_ci_tool.sh check_ready_to_test check-style: - needs: changed_files_job - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: preconditions + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} name: Go ${{ matrix.go-version }} Functions style check runs-on: ubuntu-20.04 strategy: diff --git a/.github/workflows/ci-maven-cache-update.yaml b/.github/workflows/ci-maven-cache-update.yaml index bf7f70bb032f2..daba3dcc0321e 100644 --- a/.github/workflows/ci-maven-cache-update.yaml +++ b/.github/workflows/ci-maven-cache-update.yaml @@ -42,7 +42,7 @@ on: - cron: '30 */12 * * *' env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_OPTS: -Xss1500k -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 jobs: update-maven-dependencies-cache: diff --git a/.github/workflows/ci-owasp-dependency-check.yaml b/.github/workflows/ci-owasp-dependency-check.yaml index 595d82f4ce07e..38bd7f9eec419 100644 --- a/.github/workflows/ci-owasp-dependency-check.yaml +++ b/.github/workflows/ci-owasp-dependency-check.yaml @@ -23,7 +23,7 @@ on: - cron: '15 0 * * *' env: - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_OPTS: -Xss1500k -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 jobs: run-owasp-dependency-check: diff --git a/.github/workflows/ci-semantic-pull-request.yml b/.github/workflows/ci-semantic-pull-request.yml index 2473f8e11266c..28246eb2b819c 100644 --- a/.github/workflows/ci-semantic-pull-request.yml +++ b/.github/workflows/ci-semantic-pull-request.yml @@ -57,10 +57,12 @@ jobs: # txn -> transaction # ws -> websocket # ml -> managed ledger + # zk -> zookeeper + # bk -> bookkeeper scopes: | admin + bk broker - ml build ci cli @@ -70,6 +72,7 @@ jobs: io meta misc + ml monitor offload proxy @@ -81,12 +84,13 @@ jobs: test txn ws - # The pull request's title should be fulfill the following pattern: + zk + # The pull request's title should be fulfilled the following pattern: # # [][] # # ... where valid types and scopes can be found above; for example: # # [fix][test] flaky test V1_ProxyAuthenticationTest.anonymousSocketTest - headerPattern: '^\[(\w*)\](?:\[(.*)\])? (.*)$' + headerPattern: '^\[(\w*?)\](?:\[(.*?)\])?(?:\s*)(.*)$' headerPatternCorrespondence: type, scope, subject diff --git a/.github/workflows/pulsar-ci-flaky.yaml b/.github/workflows/pulsar-ci-flaky.yaml index b5fa8e4a7540c..9c52cfe77d65d 100644 --- a/.github/workflows/pulsar-ci-flaky.yaml +++ b/.github/workflows/pulsar-ci-flaky.yaml @@ -29,14 +29,14 @@ concurrency: cancel-in-progress: true env: - MAVEN_OPTS: -Xmx1024m -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_OPTS: -Xss1500k -Xmx1024m -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 # defines the retention period for the intermediate build artifacts needed for rerunning a failed build job # it's possible to rerun individual failed jobs when the build artifacts are available # if the artifacts have already been expired, the complete workflow can be rerun by closing and reopening the PR or by rebasing the PR ARTIFACT_RETENTION_DAYS: 3 jobs: - changed_files_job: + preconditions: name: Preconditions runs-on: ubuntu-20.04 outputs: @@ -67,11 +67,11 @@ jobs: build/pulsar_ci_tool.sh check_ready_to_test build-and-test: - needs: changed_files_job + needs: preconditions name: Flaky tests suite runs-on: ubuntu-20.04 timeout-minutes: 100 - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} steps: - name: checkout uses: actions/checkout@v3 @@ -108,7 +108,7 @@ jobs: - name: Run unit test group BROKER_FLAKY run: | - CHANGED_TESTS="${{ needs.changed_files_job.outputs.tests_files }}" ./build/run_unit_group.sh BROKER_FLAKY + CHANGED_TESTS="${{ needs.preconditions.outputs.tests_files }}" ./build/run_unit_group.sh BROKER_FLAKY - name: print JVM thread dumps when cancelled if: cancelled() diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml index c7198b04917ec..ea518b580432d 100644 --- a/.github/workflows/pulsar-ci.yaml +++ b/.github/workflows/pulsar-ci.yaml @@ -22,6 +22,8 @@ on: pull_request: branches: - master + schedule: + - cron: '0 12 * * *' workflow_dispatch: concurrency: @@ -29,16 +31,17 @@ concurrency: cancel-in-progress: true env: - MAVEN_OPTS: -Xmx1024m -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 + MAVEN_OPTS: -Xss1500k -Xmx1024m -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 # defines the retention period for the intermediate build artifacts needed for rerunning a failed build job # it's possible to rerun individual failed jobs when the build artifacts are available # if the artifacts have already been expired, the complete workflow can be rerun by closing and reopening the PR or by rebasing the PR ARTIFACT_RETENTION_DAYS: 3 jobs: - changed_files_job: + preconditions: name: Preconditions runs-on: ubuntu-20.04 + if: (github.event_name != 'schedule') || (github.repository == 'apache/pulsar') outputs: docs_only: ${{ steps.check_changes.outputs.docs_only }} changed_tests: ${{ steps.changes.outputs.tests_files }} @@ -68,11 +71,11 @@ jobs: build/pulsar_ci_tool.sh check_ready_to_test build-and-license-check: - needs: changed_files_job + needs: preconditions name: Build and License check runs-on: ubuntu-20.04 timeout-minutes: 60 - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} steps: - name: checkout uses: actions/checkout@v3 @@ -106,9 +109,12 @@ jobs: - name: Check source code license headers run: mvn -B -T 8 -ntp initialize apache-rat:check license:check + - name: Check source code style + run: mvn -B -T 8 -ntp initialize checkstyle:check + - name: Build core-modules run: | - mvn -B -T 1C -ntp -Pcore-modules,-main clean install -DskipTests -Dlicense.skip=true -Drat.skip=true + mvn -B -T 1C -ntp -Pcore-modules,-main clean install -DskipTests -Dlicense.skip=true -Drat.skip=true -Dcheckstyle.skip=true - name: Check binary licenses run: src/check-binary-license.sh ./distribution/server/target/apache-pulsar-*-bin.tar.gz @@ -139,8 +145,8 @@ jobs: name: CI - Unit - ${{ matrix.name }} runs-on: ubuntu-20.04 timeout-minutes: ${{ matrix.timeout || 60 }} - needs: ['changed_files_job', 'build-and-license-check'] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: ['preconditions', 'build-and-license-check'] + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} strategy: fail-fast: false matrix: @@ -162,6 +168,8 @@ jobs: group: PROXY - name: Pulsar IO group: PULSAR_IO + - name: Pulsar Client + group: CLIENT steps: - name: checkout @@ -207,7 +215,7 @@ jobs: - name: Run unit test group '${{ matrix.group }}' run: | - CHANGED_TESTS="${{ needs.changed_files_job.outputs.tests_files }}" ./build/run_unit_group.sh ${{ matrix.group }} + CHANGED_TESTS="${{ needs.preconditions.outputs.tests_files }}" ./build/run_unit_group.sh ${{ matrix.group }} - name: print JVM thread dumps when cancelled if: cancelled() @@ -260,8 +268,8 @@ jobs: name: Build Pulsar java-test-image docker image runs-on: ubuntu-20.04 timeout-minutes: 60 - needs: ['changed_files_job', 'build-and-license-check'] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true'}} + needs: ['preconditions', 'build-and-license-check'] + if: ${{ needs.preconditions.outputs.docs_only != 'true'}} env: UBUNTU_MIRROR: http://azure.archive.ubuntu.com/ubuntu/ steps: @@ -325,8 +333,8 @@ jobs: name: CI - Integration - ${{ matrix.name }} runs-on: ubuntu-20.04 timeout-minutes: ${{ matrix.timeout || 60 }} - needs: ['changed_files_job', 'pulsar-java-test-image'] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: ['preconditions', 'pulsar-java-test-image'] + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} env: PULSAR_TEST_IMAGE_NAME: apachepulsar/java-test-image:latest strategy: @@ -465,10 +473,10 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 10 needs: [ - 'changed_files_job', + 'preconditions', 'integration-tests' ] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} steps: - name: checkout uses: actions/checkout@v3 @@ -487,8 +495,8 @@ jobs: name: Build Pulsar docker image runs-on: ubuntu-20.04 timeout-minutes: 60 - needs: ['changed_files_job', 'build-and-license-check'] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: ['preconditions', 'build-and-license-check'] + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} env: UBUNTU_MIRROR: http://azure.archive.ubuntu.com/ubuntu/ steps: @@ -541,29 +549,33 @@ jobs: -Pmain,docker -Dmaven.test.skip=true -Ddocker.squash=true \ -Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true -Drat.skip=true + # check full build artifacts licenses + - name: Check binary licenses + run: src/check-binary-license.sh ./distribution/server/target/apache-pulsar-*-bin.tar.gz + - name: Clean up disk space run: | # release disk space since saving docker image consumes local disk space # echo "::group::Available diskspace before cleaning" time df -BM / /mnt - echo "::endgroup::" + echo "::endgroup::" echo "::group::Clean build directory" # docker build changes some files to root ownership, fix this before deleting files sudo chown -R $USER:$GROUP . # clean build directories time git clean -fdx - echo "::endgroup::" + echo "::endgroup::" echo "::group::Available diskspace after cleaning build directory" time df -BM / /mnt echo "::endgroup::" echo "::group::Delete maven repository" # delete maven repository time rm -rf ~/.m2/repository - echo "::endgroup::" + echo "::endgroup::" echo "::group::Available diskspace after cleaning maven repository" time df -BM / /mnt - echo "::endgroup::" + echo "::endgroup::" - name: save docker image apachepulsar/pulsar-test-latest-version:latest to Github artifact cache run: | @@ -581,8 +593,8 @@ jobs: name: CI - System - ${{ matrix.name }} runs-on: ubuntu-20.04 timeout-minutes: 60 - needs: ['changed_files_job', 'pulsar-test-latest-version-image'] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: ['preconditions', 'pulsar-test-latest-version-image'] + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} env: PULSAR_TEST_IMAGE_NAME: apachepulsar/pulsar-test-latest-version:latest strategy: @@ -709,8 +721,8 @@ jobs: name: CI Flaky - System - ${{ matrix.name }} runs-on: ubuntu-20.04 timeout-minutes: 60 - needs: [ 'changed_files_job', 'pulsar-test-latest-version-image' ] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: [ 'preconditions', 'pulsar-test-latest-version-image' ] + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} env: PULSAR_TEST_IMAGE_NAME: apachepulsar/pulsar-test-latest-version:latest strategy: @@ -821,11 +833,11 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 10 needs: [ - 'changed_files_job', + 'preconditions', 'system-tests', 'flaky-system-tests' ] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} steps: - name: checkout uses: actions/checkout@v3 @@ -844,8 +856,8 @@ jobs: name: Build Pulsar on MacOS runs-on: macos-11 timeout-minutes: 120 - needs: ['changed_files_job', 'integration-tests'] - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + needs: ['preconditions', 'integration-tests'] + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} steps: - name: checkout uses: actions/checkout@v3 @@ -876,8 +888,8 @@ jobs: name: OWASP dependency check runs-on: ubuntu-20.04 timeout-minutes: 120 - needs: [ 'changed_files_job', 'integration-tests' ] - if: ${{ needs.changed_files_job.outputs.need_owasp == 'true' }} + needs: [ 'preconditions', 'integration-tests' ] + if: ${{ needs.preconditions.outputs.need_owasp == 'true' }} steps: - name: checkout uses: actions/checkout@v3 @@ -942,11 +954,11 @@ jobs: # It cleans up the binaries in the same job in order to not spin up another runner for basically doing nothing. pulsar-ci-checks-completed: name: "Pulsar CI checks completed" - if: always() + if: ${{ always() && ((github.event_name != 'schedule') || (github.repository == 'apache/pulsar')) }} runs-on: ubuntu-20.04 timeout-minutes: 10 needs: [ - 'changed_files_job', + 'preconditions', 'unit-tests', 'integration-tests', 'system-tests', @@ -955,7 +967,7 @@ jobs: ] steps: - name: Check that all required jobs were completed successfully - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} run: | if [[ ! ( \ "${{ needs.unit-tests.result }}" == "success" \ @@ -964,23 +976,23 @@ jobs: && "${{ needs.macos-build.result }}" == "success" \ ) ]]; then echo "Required jobs haven't been completed successfully." - exit 1 + exit 1 fi - name: checkout - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} uses: actions/checkout@v3 - name: Tune Runner VM - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} uses: ./.github/actions/tune-runner-vm - name: Install gh-actions-artifact-client.js - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} uses: apache/pulsar-test-infra/gh-actions-artifact-client/dist@master - name: Delete maven repository binaries from GitHub Actions Artifacts - if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }} + if: ${{ needs.preconditions.outputs.docs_only != 'true' }} run: | gh-actions-artifact-client.js delete pulsar-maven-repository-binaries.tar.zst || true gh-actions-artifact-client.js delete pulsar-server-distribution.tar.zst || true diff --git a/.gitignore b/.gitignore index 19a86045daf17..2759cf054f57e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ pulsar-functions/worker/src/test/resources/ !.idea/vcs.xml *.iml *.iws +.fleet/* # NetBeans nb-configuration.xml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c57f9ab74b94e..db83924c47c8a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,6 +21,4 @@ ## Contributing to Apache Pulsar -We would love for you to contribute to Apache Pulsar and make it even better! -Please check the [Contributing to Apache Pulsar](https://pulsar.apache.org/contributing/) -page before starting to work on the project. +We would love for you to contribute to Apache Pulsar and make it even better! Please check the [Apache Pulsar Contributing Guide](https://pulsar.apache.org/contribute/) before starting to work on the project. diff --git a/README.md b/README.md index 4b2486e50b7e1..59911199f9810 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,7 @@ [![docker pull](https://img.shields.io/docker/pulls/apachepulsar/pulsar-all.svg)](https://hub.docker.com/r/apachepulsar/pulsar) [![contributors](https://img.shields.io/github/contributors-anon/apache/pulsar)](https://github.com/apache/pulsar/graphs/contributors) [![last commit](https://img.shields.io/github/last-commit/apache/pulsar)](https://github.com/apache/pulsar/commits/master) -[![release](https://img.shields.io/github/v/release/apache/pulsar)](https://github.com/apache/pulsar/releases) -[![release date](https://img.shields.io/github/release-date/apache/pulsar)](https://github.com/apache/pulsar/releases) +[![release](https://img.shields.io/github/v/release/apache/pulsar?sort=semver)](https://pulsar.apache.org/download/) [![downloads](https://img.shields.io/github/downloads/apache/pulsar/total)](https://pulsar.apache.org/download/) Pulsar is a distributed pub-sub messaging platform with a very @@ -68,18 +67,15 @@ components in the Pulsar ecosystem, including connectors, adapters, and other la ### Ecosystem - [Pulsar Adapters](https://github.com/apache/pulsar-adapters) -- [Pulsar Connectors](https://github.com/apache/pulsar-connectors) -- [Pulsar SQL (Pulsar Presto Connector)](https://github.com/apache/pulsar-presto) ### Clients -- [C++ Client](https://github.com/apache/pulsar-client-cpp) -- [Python Client](https://github.com/apache/pulsar-client-python) - [.NET/C# Client](https://github.com/apache/pulsar-dotpulsar) +- [C++ Client](https://github.com/apache/pulsar-client-cpp) - [Go Client](https://github.com/apache/pulsar-client-go) - [NodeJS Client](https://github.com/apache/pulsar-client-node) +- [Python Client](https://github.com/apache/pulsar-client-python) - [Reactive Java Client](https://github.com/apache/pulsar-client-reactive) -- [Ruby Client](https://github.com/apache/pulsar-client-ruby) ### Dashboard & Management Tools @@ -89,39 +85,42 @@ components in the Pulsar ecosystem, including connectors, adapters, and other la - [Pulsar Site](https://github.com/apache/pulsar-site) -### Documentation - -- [Pulsar Translation](https://github.com/apache/pulsar-translation) - ### CI/CD - [Pulsar CI](https://github.com/apache/pulsar-test-infra) +### Archived/Halted + +- [Pulsar Connectors](https://github.com/apache/pulsar-connectors) (bundled as [pulsar-io](pulsar-io)) +- [Pulsar Translation](https://github.com/apache/pulsar-translation) +- [Pulsar SQL (Pulsar Presto Connector)](https://github.com/apache/pulsar-presto) (bundled as [pulsar-sql](pulsar-sql)) +- [Ruby Client](https://github.com/apache/pulsar-client-ruby) + ## Pulsar Runtime Java Version Recommendation - pulsar ver > 2.10 and master branch -| Pulsar Components | Java Version | -| ----------------- | :-----------: | -| Broker | 17 | -| Functions / IO | 17 | -| CLI | 17 | -| Java Client | 8 or 11 or 17 | +| Components | Java Version | +|----------------|:-------------:| +| Broker | 17 | +| Functions / IO | 17 | +| CLI | 17 | +| Java Client | 8 or 11 or 17 | - 2.8 <= pulsar ver <= 2.10 -| Pulsar Components | Java Version | -| ----------------- | :----------: | -| Broker | 11 | -| Functions / IO | 11 | -| CLI | 8 or 11 | -| Java Client | 8 or 11 | +| Components | Java Version | +|----------------|:------------:| +| Broker | 11 | +| Functions / IO | 11 | +| CLI | 8 or 11 | +| Java Client | 8 or 11 | - pulsar ver < 2.8 -| Pulsar Components | Java Version | -| ----------------- | :----------: | -| All | 8 or 11 | +| Components | Java Version | +|------------|:------------:| +| All | 8 or 11 | ## Build Pulsar @@ -129,19 +128,24 @@ components in the Pulsar ecosystem, including connectors, adapters, and other la - JDK - | Pulsar Version | JDK Version | - | ----------------- | :----------: | - | master and 2.11 + | [JDK 17](https://adoptium.net/?variant=openjdk17) | - | 2.8 / 2.9 / 2.10 | [JDK 11](https://adoptium.net/?variant=openjdk11) | - | 2.7 - | [JDK 8](https://adoptium.net/?variant=openjdk8) | + | Pulsar Version | JDK Version | + |-------------------|:-------------------------------------------------:| + | master and 2.11 + | [JDK 17](https://adoptium.net/?variant=openjdk17) | + | 2.8 / 2.9 / 2.10 | [JDK 11](https://adoptium.net/?variant=openjdk11) | + | 2.7 - | [JDK 8](https://adoptium.net/?variant=openjdk8) | - Maven 3.6.1+ - zip -> Note: this project includes a [Maven Wrapper](https://maven.apache.org/wrapper/) that can be used instead of a system installed Maven. -> Use it by replacing `mvn` by `./mvnw` on Linux and `mvnw.cmd` on Windows in the commands below. +> **Note**: +> +> This project includes a [Maven Wrapper](https://maven.apache.org/wrapper/) that can be used instead of a system-installed Maven. +> Use it by replacing `mvn` by `./mvnw` on Linux and `mvnw.cmd` on Windows in the commands below. +> +> It's better to use CMD rather than Powershell on Windows. Because maven will activate the `windows` profile which runs `rename-netty-native-libs.cmd`. ### Build + Compile and install: ```bash @@ -156,7 +160,7 @@ $ mvn -pl module-name (e.g: pulsar-broker) install -DskipTests ### Minimal build (This skips most of external connectors and tiered storage handlers) -``` +```bash mvn install -Pcore-modules,-main -DskipTests ``` @@ -188,21 +192,18 @@ Check https://pulsar.apache.org for documentation and examples. ## Build custom docker images -Docker images must be built with Java 8 for `branch-2.7` or previous branches because of -[issue 8445](https://github.com/apache/pulsar/issues/8445). -Java 11 is the recommended JDK version in `branch-2.8`, `branch-2.9` and `branch-2.10`. -Java 17 is the recommended JDK version in `master`. +* Docker images must be built with Java 8 for `branch-2.7` or previous branches because of [ISSUE-8445](https://github.com/apache/pulsar/issues/8445). +* Java 11 is the recommended JDK version in `branch-2.8`, `branch-2.9` and `branch-2.10`. +* Java 17 is the recommended JDK version in `master`. -This builds the docker images `apachepulsar/pulsar-all:latest` and `apachepulsar/pulsar:latest`. +The following command builds the docker images `apachepulsar/pulsar-all:latest` and `apachepulsar/pulsar:latest`: ```bash mvn clean install -DskipTests mvn package -Pdocker,-main -am -pl docker/pulsar-all -DskipTests ``` -After the images are built, they can be tagged and pushed to your custom repository. -Here's an example of a bash script that tags the docker images with the current version and git revision and -pushes them to `localhost:32000/apachepulsar`. +After the images are built, they can be tagged and pushed to your custom repository. Here's an example of a bash script that tags the docker images with the current version and git revision and pushes them to `localhost:32000/apachepulsar`. ```bash image_repo_and_project=localhost:32000/apachepulsar @@ -218,134 +219,20 @@ docker push ${image_repo_and_project}/pulsar:$tag ## Setting up your IDE -Apache Pulsar is using [lombok](https://projectlombok.org/) so you have to ensure your IDE setup with -required plugins. - -### IntelliJ - -#### Configure Project JDK to Java 17 JDK - -1. Open **Project Settings**. - - Click **File** -> **Project Structure** -> **Project Settings** -> **Project**. - -2. Select the JDK version. - - From the JDK version drop-down list, select **Download JDK...** or choose an existing recent Java 17 JDK version. - -3. In the download dialog, select version **17**. You can pick a version from many vendors. Unless you have a specific preference, choose **Eclipse Temurin (AdoptOpenJDK (Hotspot))**. - -#### Configure Java version for Maven in IntelliJ - -1. Open Maven Importing Settings dialog by going to - **Settings** -> **Build, Execution, Deployment** -> **Build Tools** -> **Maven** -> **Importing**. - -2. Choose **Use Project JDK** for **JDK for Importer** setting. This uses the Java 17 JDK for running Maven - when importing the project to IntelliJ. Some of the configuration in the Maven build is conditional based on - the JDK version. Incorrect configuration gets chosen when the "JDK for Importer" isn't the same as the "Project JDK". - -3. Validate that the JRE setting in **Maven** -> **Runner** dialog is set to **Use Project JDK**. - -#### Configure annotation processing in IntelliJ - -1. Open Annotation Processors Settings dialog box by going to - **Settings** -> **Build, Execution, Deployment** -> **Compiler** -> **Annotation Processors**. - -2. Select the following buttons: - - 1. **Enable annotation processing** - 2. **Obtain processors from project classpath** - 3. Store generated sources relative to: **Module content root** - -3. Set the generated source directories to be equal to the Maven directories: - - 1. Set "Production sources directory:" to "target/generated-sources/annotations". - 2. Set "Test sources directory:" to "target/generated-test-sources/test-annotations". - -4. Click **OK**. - -5. Install the lombok plugin in intelliJ. - -#### Configure code style - -1. Open Code Style Settings dialog box by going to **Settings** -> **Editor** -> **Code Style**. - -2. Click on the :gear: symbol -> **Import scheme** -> **IntelliJ IDEA code style XML** - -3. Pick the file `${pulsar_dir}/src/idea-code-style.xml` - -4. On the dialog box that opens, click **OK**. - -5. Ensure the scheme you just created is selected in **Scheme** dropdown then click **OK**. - -#### Configure Checkstyle - -1. Install the Checkstyle-IDEA plugin. - -2. Open Checkstyle Settings dialog box by going to **Settings** -> **Tools** -> **Checkstyle**. - -3. Set **Checkstyle version** to **8.37**. - -4. Set **Scan scope** to **Only Java sources (including tests)**. - -5. Click **+** button in the **Configuration** section to open a dialog to choose the checkfile file. - - 1. Enter a **Description**. For example, Pulsar. - 2. Select **Use a local checkstyle file**. - 3. Set **File** to **buildtools/src/main/resources/pulsar/checkstyle.xml**. - 4. Select **Store relative to project location**. - 5. Click **Next** -> **Next** -> **Finish**. - -6. Activate the configuration you just added by toggling the corresponding box. - -7. Click **OK**. - -#### Further configuration in IntelliJ - -- When working on the Pulsar core modules in IntelliJ, reduce the number of active projects in IntelliJ to speed up IDE actions and reduce unrelated IDE warnings. - - - In IntelliJ's Maven UI's tree view under "Profiles" - - Activate "core-modules" Maven profile - - De-activate "main" Maven profile - - Run the "Reload All Maven Projects" action from the Maven UI toolbar. You can also find the action by the name in the IntelliJ "Search Everywhere" window that gets activated by pressing the **Shift** key twice. - -- Run the "Generate Sources and Update Folders For All Projects" action from the Maven UI toolbar. You can also find the action by the name in the IntelliJ "Search Everywhere" window that gets activated by pressing the **Shift** key twice. Running the action takes about 10 minutes for all projects. This is faster when the "core-modules" profile is the only active profile. - -#### IntelliJ usage tips - -- In the case of compilation errors with missing Protobuf classes, ensure to run the "Generate Sources and Update Folders For All Projects" action. - -- All of the Pulsar source code doesn't compile properly in IntelliJ and there are compilation errors. - - Use the "core-modules" profile if working on the Pulsar core modules since the source code for those modules can be compiled in IntelliJ. - - Sometimes it might help to mark a specific project ignored in IntelliJ Maven UI by right-clicking the project name and select **Ignore Projects** from the menu. - - Currently, it is not always possible to run unit tests directly from the IDE because of the compilation issues. As a workaround, individual test classes can be run by using the `mvn test -Dtest=TestClassName` command. -- The above steps have all been performed, but a test still won't run. - - In this case, try the following steps: - 1. Close IntelliJ. - 2. Run `mvn clean install -DskipTests` on the command line. - 3. Reopen IntelliJ. - - If that still doesn't work: - 1. Verify Maven is using a supported version. Currently, the supported version of Maven is specified in the - section of the main pom.xml file. - 2. Try "restart and clear caches" in IntelliJ and repeat the above steps to reload projects and generate sources. - -### Eclipse - -Follow the instructions [here](https://howtodoinjava.com/automation/lombok-eclipse-installation-examples/) -to configure your Eclipse setup. +Read https://pulsar.apache.org/contribute/setup-ide for setting up IntelliJ IDEA or Eclipse for developing Pulsar. ## Documentation -> **Tip** +> **Note**: > -> For how to make contributions to Pulsar documentation, see [Pulsar Documentation Contribution Guide](https://docs.google.com/document/d/11DTnNPpvcPrebLkMAFcDEIFlD8ARD-k6F-LXoIwdD9Y/edit#). +> For how to make contributions to Pulsar documentation, see [Pulsar Documentation Contribution Guide](https://pulsar.apache.org/contribute/document-intro/). ## Contact ##### Mailing lists -| Name | Scope | | | | -| :-------------------------------------------------------- | :------------------------------ | :---------------------------------------------------- | :-------------------------------------------------------- | :----------------------------------------------------------------- | +| Name | Scope | Subscribe | Unsubscribe | Archives | +|:----------------------------------------------------------|:--------------------------------|:------------------------------------------------------|:----------------------------------------------------------|:-------------------------------------------------------------------| | [users@pulsar.apache.org](mailto:users@pulsar.apache.org) | User-related discussions | [Subscribe](mailto:users-subscribe@pulsar.apache.org) | [Unsubscribe](mailto:users-unsubscribe@pulsar.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/pulsar-users/) | | [dev@pulsar.apache.org](mailto:dev@pulsar.apache.org) | Development-related discussions | [Subscribe](mailto:dev-subscribe@pulsar.apache.org) | [Unsubscribe](mailto:dev-unsubscribe@pulsar.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/pulsar-dev/) | diff --git a/bin/bookkeeper b/bin/bookkeeper index c66cc42dd801d..fb516a98acdc2 100755 --- a/bin/bookkeeper +++ b/bin/bookkeeper @@ -182,11 +182,11 @@ fi OPTS="-cp $BOOKIE_CLASSPATH $OPTS" -OPTS="$OPTS $BOOKIE_MEM $BOOKIE_GC $BOOKIE_GC_LOG $BOOKIE_EXTRA_OPTS" - # Disable ipv6 as it can cause issues OPTS="$OPTS -Djava.net.preferIPv4Stack=true" +OPTS="$OPTS $BOOKIE_MEM $BOOKIE_GC $BOOKIE_GC_LOG $BOOKIE_EXTRA_OPTS" + # log directory & file BOOKIE_LOG_APPENDER=${BOOKIE_LOG_APPENDER:-"Console"} diff --git a/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/BouncyCastleLoader.java b/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/BouncyCastleLoader.java index 69002f1603962..a14ecaa517ab6 100644 --- a/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/BouncyCastleLoader.java +++ b/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/BouncyCastleLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/package-info.java b/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/package-info.java index b6308e37b4443..e4f6c2e2f1384 100644 --- a/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/package-info.java +++ b/bouncy-castle/bc/src/main/java/org/apache/pulsar/bcloader/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /** * Package for Bouncy Castle provider Loader. */ diff --git a/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerBase.java b/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerBase.java index b074b22580d67..330d4fbc06897 100644 --- a/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerBase.java +++ b/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerTest.java b/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerTest.java index fe5c0d1e9f187..624315ae0c9cd 100644 --- a/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerTest.java +++ b/bouncy-castle/bcfips-include-test/src/test/java/org/apache/pulsar/client/TlsProducerConsumerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/bouncy-castle/bcfips/pom.xml b/bouncy-castle/bcfips/pom.xml index 287ce656a657d..8ff2a38792e94 100644 --- a/bouncy-castle/bcfips/pom.xml +++ b/bouncy-castle/bcfips/pom.xml @@ -43,13 +43,13 @@ org.bouncycastle bc-fips - ${bouncycastlefips.version} + ${bouncycastle.bc-fips.version} org.bouncycastle bcpkix-fips - ${bouncycastlefips.version} + ${bouncycastle.bcpkix-fips.version} diff --git a/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/BouncyCastleFipsLoader.java b/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/BouncyCastleFipsLoader.java index 984df776d1e34..5e2f2fd9c2451 100644 --- a/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/BouncyCastleFipsLoader.java +++ b/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/BouncyCastleFipsLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,6 @@ package org.apache.pulsar.bcloader; import static org.apache.pulsar.common.util.SecurityUtility.BC_FIPS; - import java.security.Provider; import java.security.Security; import lombok.extern.slf4j.Slf4j; diff --git a/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/package-info.java b/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/package-info.java new file mode 100644 index 0000000000000..d610ff5642da4 --- /dev/null +++ b/bouncy-castle/bcfips/src/main/java/org/apache/pulsar/bcloader/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.bcloader; diff --git a/build/run_integration_group.sh b/build/run_integration_group.sh index ab69544308ff3..c107a2adb1e3d 100755 --- a/build/run_integration_group.sh +++ b/build/run_integration_group.sh @@ -25,6 +25,8 @@ set -o pipefail set -o errexit JAVA_MAJOR_VERSION="$(java -version 2>&1 |grep " version " | awk -F\" '{ print $2 }' | awk -F. '{ if ($1=="1") { print $2 } else { print $1 } }')" +# Used to shade run test on Java 8, because the latest TestNG requires Java 11 or higher. +TESTNG_VERSION="7.3.0" # lists all active maven modules with given parameters # parses the modules from the "mvn initialize" output @@ -95,6 +97,11 @@ test_group_shade_run() { if [[ $JAVA_MAJOR_VERSION -gt 8 && $JAVA_MAJOR_VERSION -lt 17 ]]; then additional_args="-Dmaven.compiler.source=$JAVA_MAJOR_VERSION -Dmaven.compiler.target=$JAVA_MAJOR_VERSION" fi + + if [[ $JAVA_MAJOR_VERSION -ge 8 && $JAVA_MAJOR_VERSION -lt 11 ]]; then + additional_args="$additional_args -Dtestng.version=$TESTNG_VERSION" + fi + mvn_run_integration_test --skip-build-deps --clean "$@" -Denforcer.skip=true -DShadeTests -DtestForkCount=1 -DtestReuseFork=false $additional_args } @@ -122,6 +129,8 @@ test_group_messaging() { mvn_run_integration_test --skip-build-deps "$@" -DintegrationTestSuiteFile=pulsar-proxy.xml -DintegrationTests # run integration WebSocket tests mvn_run_integration_test --skip-build-deps "$@" -DintegrationTestSuiteFile=pulsar-websocket.xml -DintegrationTests + # run integration TLS tests + mvn_run_integration_test "$@" -DintegrationTestSuiteFile=pulsar-tls.xml -DintegrationTests } test_group_plugin() { diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh index 6d8cafbee2c7f..c0b5d9781f544 100755 --- a/build/run_unit_group.sh +++ b/build/run_unit_group.sh @@ -24,7 +24,7 @@ set -e set -o pipefail set -o errexit -MVN_TEST_OPTIONS='mvn -Pcoverage -B -ntp -DskipSourceReleaseAssembly=true -DskipBuildDistribution=true -Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true -Drat.skip=true' +MVN_TEST_OPTIONS='mvn -B -ntp -DskipSourceReleaseAssembly=true -DskipBuildDistribution=true -Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true -Drat.skip=true' function mvn_test() { ( @@ -33,7 +33,11 @@ function mvn_test() { clean_arg="clean" shift fi - TARGET=verify + if echo "${FUNCNAME[@]}" | grep "flaky"; then + TARGET="verify" + else + TARGET="verify -Pcoverage" + fi if [[ "$1" == "--install" ]]; then TARGET="install" shift @@ -77,6 +81,10 @@ function test_group_broker_client_impl() { mvn_test -pl pulsar-broker -Dgroups='broker-impl' } +function test_group_client() { + mvn_test -pl pulsar-client +} + # prints summaries of failed tests to console # by using the targer/surefire-reports files # works only when testForkCount > 1 since that is when surefire will create reports for individual test classes @@ -134,18 +142,16 @@ function test_group_other() { -Dexclude='**/ManagedLedgerTest.java, **/OffloadersCacheTest.java **/PrimitiveSchemaTest.java, - BlobStoreManagedLedgerOffloaderTest.java' -DtestReuseFork=false + BlobStoreManagedLedgerOffloaderTest.java' mvn_test -pl managed-ledger -Dinclude='**/ManagedLedgerTest.java, **/OffloadersCacheTest.java' - mvn_test -pl pulsar-client -Dinclude='**/PrimitiveSchemaTest.java' - mvn_test -pl tiered-storage/jcloud -Dinclude='**/BlobStoreManagedLedgerOffloaderTest.java' echo "::endgroup::" local modules_with_quarantined_tests=$(git grep -l '@Test.*"quarantine"' | grep '/src/test/java/' | \ - awk -F '/src/test/java/' '{ print $1 }' | grep -v -E 'pulsar-broker|pulsar-proxy|pulsar-io|pulsar-sql' | sort | uniq | \ + awk -F '/src/test/java/' '{ print $1 }' | grep -v -E 'pulsar-broker|pulsar-proxy|pulsar-io|pulsar-sql|pulsar-client' | sort | uniq | \ perl -0777 -p -e 's/\n(\S)/,$1/g') if [ -n "${modules_with_quarantined_tests}" ]; then echo "::group::Running quarantined tests outside of pulsar-broker & pulsar-proxy (if any)" diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f3d116ab34899..2fd5c9aca9ea9 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -26,7 +26,6 @@ org.apache apache 23 - org.apache.pulsar @@ -41,8 +40,9 @@ 3.0.0-M3 2.18.0 1.7.32 - 7.3.0 + 7.6.1 3.11 + 4.1 3.4.0 8.37 3.1.2 @@ -151,7 +151,7 @@ com.mycila license-maven-plugin - 4.0.rc2 + ${license-maven-plugin.version} @@ -159,7 +159,7 @@ - JAVADOC_STYLE + SLASHSTAR_STYLE diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java index b139f90faf41e..38cd2a1747a63 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/BetweenTestClassesListenerAdapter.java b/buildtools/src/main/java/org/apache/pulsar/tests/BetweenTestClassesListenerAdapter.java index 7e803f29ef16a..8463e8519a0f1 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/BetweenTestClassesListenerAdapter.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/BetweenTestClassesListenerAdapter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/EnumValuesDataProvider.java b/buildtools/src/main/java/org/apache/pulsar/tests/EnumValuesDataProvider.java index 3c43baed98ac7..6192a062955f6 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/EnumValuesDataProvider.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/EnumValuesDataProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/FailFastNotifier.java b/buildtools/src/main/java/org/apache/pulsar/tests/FailFastNotifier.java index 0f001332a98d8..2040567f96c76 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/FailFastNotifier.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/FailFastNotifier.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalCleanupListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalCleanupListener.java index c40956a9e259e..2cd2f5792793b 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalCleanupListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalCleanupListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalStateCleaner.java b/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalStateCleaner.java index 05dbae115f177..ed23fe4f6980c 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalStateCleaner.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/FastThreadLocalStateCleaner.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java index ff590c05bbcf7..1796d457d0921 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoCleanupListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -32,16 +32,18 @@ */ public class MockitoCleanupListener extends BetweenTestClassesListenerAdapter { private static final Logger LOG = LoggerFactory.getLogger(MockitoCleanupListener.class); - private static final boolean - MOCKITO_CLEANUP_ENABLED = Boolean.parseBoolean(System.getProperty("testMockitoCleanup", "true")); + private static final boolean MOCKITO_CLEANUP_ENABLED = Boolean.parseBoolean( + System.getProperty("testMockitoCleanup", "true")); + + private static final String MOCKITO_CLEANUP_INFO = + "Cleaning up Mockito's ThreadSafeMockingProgress.MOCKING_PROGRESS_PROVIDER thread local state."; @Override protected void onBetweenTestClasses(Class endedTestClass, Class startedTestClass) { if (MOCKITO_CLEANUP_ENABLED) { try { if (MockitoThreadLocalStateCleaner.INSTANCE.isEnabled()) { - LOG.info( - "Cleaning up Mockito's ThreadSafeMockingProgress.MOCKING_PROGRESS_PROVIDER thread local state."); + LOG.info(MOCKITO_CLEANUP_INFO); MockitoThreadLocalStateCleaner.INSTANCE.cleanup(); } } finally { @@ -53,7 +55,7 @@ protected void onBetweenTestClasses(Class endedTestClass, Class startedTes /** * Mockito-inline can leak mocked objects, we need to clean up the inline mocks after every test. * See - * mockito docs. + * mockito docs. */ private void cleanupMockitoInline() { Mockito.framework().clearInlineMocks(); diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoThreadLocalStateCleaner.java b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoThreadLocalStateCleaner.java index 4fe4ea7e0e2d3..c8e269ac56afb 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/MockitoThreadLocalStateCleaner.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/MockitoThreadLocalStateCleaner.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/PulsarTestListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/PulsarTestListener.java index dfec5dcef959f..b3d70621843ca 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/PulsarTestListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/PulsarTestListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -45,9 +45,12 @@ public void onTestFailure(ITestResult result) { System.out.format("!!!!!!!!! FAILURE-- %s.%s(%s)-------\n", result.getTestClass(), result.getMethod().getMethodName(), Arrays.toString(result.getParameters())); } - if (result.getThrowable() instanceof ThreadTimeoutException) { - System.out.println("====== THREAD DUMPS ======"); - System.out.println(ThreadDumpUtil.buildThreadDiagnosticString()); + if (result.getThrowable() != null) { + result.getThrowable().printStackTrace(); + if (result.getThrowable() instanceof ThreadTimeoutException) { + System.out.println("====== THREAD DUMPS ======"); + System.out.println(ThreadDumpUtil.buildThreadDiagnosticString()); + } } } diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java b/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java index 696058ddc5224..e76a2bab9dc05 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java b/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java index a9bf4b49771cb..fd368bd01915f 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/ThreadDumpUtil.java b/buildtools/src/main/java/org/apache/pulsar/tests/ThreadDumpUtil.java index bf0d8bf41caf1..e20a02f95a992 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/ThreadDumpUtil.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/ThreadDumpUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLeakDetectorListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLeakDetectorListener.java index 163591cf82554..803d1c4980bc9 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLeakDetectorListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLeakDetectorListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLocalStateCleaner.java b/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLocalStateCleaner.java index 3183960df8ec4..1f77402a4b1a7 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLocalStateCleaner.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/ThreadLocalStateCleaner.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/package-info.java b/buildtools/src/main/java/org/apache/pulsar/tests/package-info.java index f1c6f5153c33c..ad0ca6f8cd186 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/package-info.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/main/resources/pulsar/checkstyle.xml b/buildtools/src/main/resources/pulsar/checkstyle.xml index d1e65416043b5..b5141cc5eb51a 100644 --- a/buildtools/src/main/resources/pulsar/checkstyle.xml +++ b/buildtools/src/main/resources/pulsar/checkstyle.xml @@ -137,7 +137,7 @@ page at http://checkstyle.sourceforge.net/config.html --> + value="autovalue.shaded, avro.shaded, bk-shade, com.google.api.client.repackaged, com.google.appengine.repackaged, org.apache.curator.shaded, org.testcontainers.shaded" /> diff --git a/buildtools/src/main/resources/pulsar/suppressions.xml b/buildtools/src/main/resources/pulsar/suppressions.xml index 49cfa48d3c562..7c78988db3e90 100644 --- a/buildtools/src/main/resources/pulsar/suppressions.xml +++ b/buildtools/src/main/resources/pulsar/suppressions.xml @@ -28,8 +28,9 @@ - + + diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/AnnotationListenerTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/AnnotationListenerTest.java index 5121d3d3414a2..5b7f05da2cdca 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/AnnotationListenerTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/AnnotationListenerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/DefaultTestRetriesTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/DefaultTestRetriesTest.java index dc5f9e23fd3d2..6b663d6e134c1 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/DefaultTestRetriesTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/DefaultTestRetriesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/EnumValuesDataProviderTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/EnumValuesDataProviderTest.java index 9eb24ccf4bfc3..2ab349bb90b4f 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/EnumValuesDataProviderTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/EnumValuesDataProviderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/FastThreadLocalStateCleanerTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/FastThreadLocalStateCleanerTest.java index 2fd8c4bbbe2c7..93af1d6478190 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/FastThreadLocalStateCleanerTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/FastThreadLocalStateCleanerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/RetryAnalyzerTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/RetryAnalyzerTest.java index 90f19e8053513..64d25fbc76c8b 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/RetryAnalyzerTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/RetryAnalyzerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportBeforeMethodRetryTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportBeforeMethodRetryTest.java index a447e09c9bf5d..fb85d1ceeaec2 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportBeforeMethodRetryTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportBeforeMethodRetryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportRetryTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportRetryTest.java index bffcd16b01ac0..0e2b25dc62be2 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportRetryTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportRetryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportSuccessTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportSuccessTest.java index 1621a68ed9cf5..d449f1ffb0aef 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportSuccessTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/TestRetrySupportSuccessTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/ThreadDumpUtilTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/ThreadDumpUtilTest.java index 494621b2dae5f..7a663ac286a4e 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/ThreadDumpUtilTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/ThreadDumpUtilTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/buildtools/src/test/java/org/apache/pulsar/tests/ThreadLocalStateCleanerTest.java b/buildtools/src/test/java/org/apache/pulsar/tests/ThreadLocalStateCleanerTest.java index 612dd7811638c..8dc20980cdb39 100644 --- a/buildtools/src/test/java/org/apache/pulsar/tests/ThreadLocalStateCleanerTest.java +++ b/buildtools/src/test/java/org/apache/pulsar/tests/ThreadLocalStateCleanerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/conf/bookkeeper.conf b/conf/bookkeeper.conf index 01adae7b2ca38..4083ba1d373f1 100644 --- a/conf/bookkeeper.conf +++ b/conf/bookkeeper.conf @@ -277,6 +277,17 @@ useV2WireProtocol=true # # ensemblePlacementPolicy=org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicy +# The DNS resolver class used for resolving the network location of each bookie. All bookkeeper clients +# should be configured with the same value to ensure that each bookkeeper client builds +# the same network topology in order to then place ensembles consistently. The setting is used +# when using either RackawareEnsemblePlacementPolicy and RegionAwareEnsemblePlacementPolicy. +# The setting in this file is used to configure the bookkeeper client used in the bookkeeper, which +# is used by the autorecovery process. +# Some available options: +# - org.apache.pulsar.zookeeper.ZkBookieRackAffinityMapping (Pulsar default) +# - org.apache.bookkeeper.net.ScriptBasedMapping (Bookkeeper default) +reppDnsResolverClass=org.apache.pulsar.zookeeper.ZkBookieRackAffinityMapping + ############################################################################# ## Netty server settings ############################################################################# diff --git a/conf/broker.conf b/conf/broker.conf index f5e4be9d6f390..04f38c958e1ad 100644 --- a/conf/broker.conf +++ b/conf/broker.conf @@ -1149,6 +1149,14 @@ managedLedgerOffloadDeletionLagMs=14400000 # (default is -1, which is disabled) managedLedgerOffloadAutoTriggerSizeThresholdBytes=-1 +# Read priority when ledgers exists in both bookkeeper and the second layer storage +# (tiered-storage-first/bookkeeper-first, default is tiered-storage-first) +managedLedgerDataReadPriority=tiered-storage-first + +# The number of seconds before triggering automatic offload to long term storage +# (default is -1, which is disabled) +managedLedgerOffloadThresholdInSeconds=-1 + # Max number of entries to append to a cursor ledger managedLedgerCursorMaxEntriesPerLedger=50000 @@ -1164,6 +1172,14 @@ managedLedgerCursorRolloverTimeInSeconds=14400 # crashes. managedLedgerMaxUnackedRangesToPersist=10000 +# Maximum amount of memory used hold data read from storage (or from the cache). +# This mechanism prevents the broker to have too many concurrent +# reads from storage and fall into Out of Memory errors in case +# of multiple concurrent reads to multiple concurrent consumers. +# Set 0 in order to disable the feature. +# +managedLedgerMaxReadsInFlightSizeInMB=0 + # Max number of "acknowledgment holes" that can be stored in MetadataStore. If number of unack message range is higher # than this limit then broker will persist unacked ranges into bookkeeper to avoid additional data overhead into # MetadataStore. diff --git a/deployment/terraform-ansible/deploy-pulsar.yaml b/deployment/terraform-ansible/deploy-pulsar.yaml index ae1243ad66e63..db2fd1257ca41 100644 --- a/deployment/terraform-ansible/deploy-pulsar.yaml +++ b/deployment/terraform-ansible/deploy-pulsar.yaml @@ -154,6 +154,7 @@ # - jdbc-mariadb # - jdbc-postgres # - jdbc-sqlite +# - http - kafka # - kafka-connect-adaptor # - kinesis diff --git a/distribution/io/src/assemble/io.xml b/distribution/io/src/assemble/io.xml index 7657b35ae0919..33ca4e79ba942 100644 --- a/distribution/io/src/assemble/io.xml +++ b/distribution/io/src/assemble/io.xml @@ -47,6 +47,7 @@ ${basedir}/../../pulsar-io/cassandra/target/pulsar-io-cassandra-${project.version}.nar ${basedir}/../../pulsar-io/twitter/target/pulsar-io-twitter-${project.version}.nar ${basedir}/../../pulsar-io/kafka/target/pulsar-io-kafka-${project.version}.nar + ${basedir}/../../pulsar-io/http/target/pulsar-io-http-${project.version}.nar ${basedir}/../../pulsar-io/kinesis/target/pulsar-io-kinesis-${project.version}.nar ${basedir}/../../pulsar-io/rabbitmq/target/pulsar-io-rabbitmq-${project.version}.nar ${basedir}/../../pulsar-io/nsq/target/pulsar-io-nsq-${project.version}.nar diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 786c19171928d..6d54074451fcf 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -248,13 +248,13 @@ The Apache Software License, Version 2.0 * Jackson - com.fasterxml.jackson.core-jackson-annotations-2.13.4.jar - com.fasterxml.jackson.core-jackson-core-2.13.4.jar - - com.fasterxml.jackson.core-jackson-databind-2.13.4.jar + - com.fasterxml.jackson.core-jackson-databind-2.13.4.2.jar - com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.13.4.jar - com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.13.4.jar - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.13.4.jar - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.13.4.jar - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.13.4.jar - * Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar + * Caffeine -- com.github.ben-manes.caffeine-caffeine-3.1.2.jar * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-2.0.1.jar * Bitbucket -- org.bitbucket.b_c-jose4j-0.7.6.jar @@ -311,6 +311,9 @@ The Apache Software License, Version 2.0 - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar - io.netty-netty-tcnative-classes-2.0.52.Final.jar + - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.15.Final.jar + - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.15.Final-linux-x86_64.jar + - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.15.Final-linux-aarch_64.jar * Prometheus client - io.prometheus.jmx-collector-0.16.1.jar - io.prometheus-simpleclient-0.16.0.jar @@ -335,31 +338,31 @@ The Apache Software License, Version 2.0 - org.apache.logging.log4j-log4j-web-2.18.0.jar * Java Native Access JNA -- net.java.dev.jna-jna-5.12.1.jar * BookKeeper - - org.apache.bookkeeper-bookkeeper-common-4.15.1.jar - - org.apache.bookkeeper-bookkeeper-common-allocator-4.15.1.jar - - org.apache.bookkeeper-bookkeeper-proto-4.15.1.jar - - org.apache.bookkeeper-bookkeeper-server-4.15.1.jar - - org.apache.bookkeeper-bookkeeper-tools-framework-4.15.1.jar - - org.apache.bookkeeper-circe-checksum-4.15.1.jar - - org.apache.bookkeeper-cpu-affinity-4.15.1.jar - - org.apache.bookkeeper-statelib-4.15.1.jar - - org.apache.bookkeeper-stream-storage-api-4.15.1.jar - - org.apache.bookkeeper-stream-storage-common-4.15.1.jar - - org.apache.bookkeeper-stream-storage-java-client-4.15.1.jar - - org.apache.bookkeeper-stream-storage-java-client-base-4.15.1.jar - - org.apache.bookkeeper-stream-storage-proto-4.15.1.jar - - org.apache.bookkeeper-stream-storage-server-4.15.1.jar - - org.apache.bookkeeper-stream-storage-service-api-4.15.1.jar - - org.apache.bookkeeper-stream-storage-service-impl-4.15.1.jar - - org.apache.bookkeeper.http-http-server-4.15.1.jar - - org.apache.bookkeeper.http-vertx-http-server-4.15.1.jar - - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.15.1.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.15.1.jar - - org.apache.distributedlog-distributedlog-common-4.15.1.jar - - org.apache.distributedlog-distributedlog-core-4.15.1-tests.jar - - org.apache.distributedlog-distributedlog-core-4.15.1.jar - - org.apache.distributedlog-distributedlog-protocol-4.15.1.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.15.1.jar + - org.apache.bookkeeper-bookkeeper-common-4.15.3.jar + - org.apache.bookkeeper-bookkeeper-common-allocator-4.15.3.jar + - org.apache.bookkeeper-bookkeeper-proto-4.15.3.jar + - org.apache.bookkeeper-bookkeeper-server-4.15.3.jar + - org.apache.bookkeeper-bookkeeper-tools-framework-4.15.3.jar + - org.apache.bookkeeper-circe-checksum-4.15.3.jar + - org.apache.bookkeeper-cpu-affinity-4.15.3.jar + - org.apache.bookkeeper-statelib-4.15.3.jar + - org.apache.bookkeeper-stream-storage-api-4.15.3.jar + - org.apache.bookkeeper-stream-storage-common-4.15.3.jar + - org.apache.bookkeeper-stream-storage-java-client-4.15.3.jar + - org.apache.bookkeeper-stream-storage-java-client-base-4.15.3.jar + - org.apache.bookkeeper-stream-storage-proto-4.15.3.jar + - org.apache.bookkeeper-stream-storage-server-4.15.3.jar + - org.apache.bookkeeper-stream-storage-service-api-4.15.3.jar + - org.apache.bookkeeper-stream-storage-service-impl-4.15.3.jar + - org.apache.bookkeeper.http-http-server-4.15.3.jar + - org.apache.bookkeeper.http-vertx-http-server-4.15.3.jar + - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.15.3.jar + - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.15.3.jar + - org.apache.distributedlog-distributedlog-common-4.15.3.jar + - org.apache.distributedlog-distributedlog-core-4.15.3-tests.jar + - org.apache.distributedlog-distributedlog-core-4.15.3.jar + - org.apache.distributedlog-distributedlog-protocol-4.15.3.jar + - org.apache.bookkeeper.stats-codahale-metrics-provider-4.15.3.jar * Apache HTTP Client - org.apache.httpcomponents-httpclient-4.5.13.jar - org.apache.httpcomponents-httpcore-4.4.15.jar diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml index 6d8c656f1dd41..8c7174c04c286 100644 --- a/docker/pulsar-all/pom.xml +++ b/docker/pulsar-all/pom.xml @@ -138,46 +138,7 @@ package build - - - - - ${docker.organization}/pulsar-all - - ${project.basedir} - - latest - ${project.version} - - - - - - - - push-latest - - push - - - - - ${docker.organization}/pulsar-all - - ${project.basedir} - - latest - - - - - - - - add-no-repo - package - - build + tag @@ -187,11 +148,12 @@ ${project.basedir} latest - ${project.version} + latest + ${docker.organization} diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 7ec8788b89c60..2194fc03cb233 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -98,6 +98,7 @@ ARG PULSAR_CLIENT_PYTHON_VERSION ENV PULSAR_CLIENT_PYTHON_VERSION ${PULSAR_CLIENT_PYTHON_VERSION} # This script is intentionally run as the root user to make the dependencies available for all UIDs. +RUN chmod +x /pulsar/bin/install-pulsar-client.sh RUN /pulsar/bin/install-pulsar-client.sh # The UID must be non-zero. Otherwise, it is arbitrary. No logic should rely on its specific value. diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml index f7d91b2120841..c620f591d223b 100644 --- a/docker/pulsar/pom.xml +++ b/docker/pulsar/pom.xml @@ -66,46 +66,7 @@ package build - - - - - ${docker.organization}/pulsar - - ${project.basedir} - - latest - ${project.version} - - - - - - - - push-latest - - push - - - - - ${docker.organization}/pulsar - - ${project.basedir} - - latest - - - - - - - - add-no-repo - package - - build + tag @@ -115,11 +76,12 @@ ${project.basedir} latest - ${project.version} + latest + ${docker.organization} diff --git a/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java b/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java index d2c1b0740a80b..98960b04f5e39 100644 --- a/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java +++ b/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/ShadedJCloudsUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,6 +19,8 @@ package org.apache.pulsar.jclouds; import com.google.inject.AbstractModule; +import java.util.ArrayList; +import java.util.List; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.jclouds.ContextBuilder; @@ -26,9 +28,6 @@ import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; -import java.util.ArrayList; -import java.util.List; - /** * This utility class helps in dealing with shaded dependencies (especially Guice). */ diff --git a/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/package-info.java b/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/package-info.java new file mode 100644 index 0000000000000..6e463663675b2 --- /dev/null +++ b/jclouds-shaded/src/main/java/org/apache/pulsar/jclouds/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.jclouds; diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/AsyncCallbacks.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/AsyncCallbacks.java index 395da52b2aff9..dcf2c225e8b35 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/AsyncCallbacks.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/AsyncCallbacks.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -24,6 +24,7 @@ import java.util.Optional; import org.apache.bookkeeper.common.annotation.InterfaceAudience; import org.apache.bookkeeper.common.annotation.InterfaceStability; +import org.apache.bookkeeper.mledger.impl.ReadOnlyManagedLedgerImpl; /** * Definition of all the callbacks used for the ManagedLedger asynchronous API. @@ -46,6 +47,12 @@ interface OpenReadOnlyCursorCallback { void openReadOnlyCursorFailed(ManagedLedgerException exception, Object ctx); } + interface OpenReadOnlyManagedLedgerCallback { + void openReadOnlyManagedLedgerComplete(ReadOnlyManagedLedgerImpl managedLedger, Object ctx); + + void openReadOnlyManagedLedgerFailed(ManagedLedgerException exception, Object ctx); + } + interface DeleteLedgerCallback { void deleteLedgerComplete(Object ctx); diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Entry.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Entry.java index 5d1ccf81fd934..428dcc9d97c76 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Entry.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Entry.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java index e9403f509776c..b60ae41670de7 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java index bb94cee6fde49..42f92359f9a94 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStats.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStats.java index c9330ff9e056c..4059d4be94aad 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStats.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStatsDisable.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStatsDisable.java index 862d466067e69..0fe0f453347bf 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStatsDisable.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderStatsDisable.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java index cf022d3552e64..0df07f60d76f4 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursorMXBean.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursorMXBean.java index 9abe50d8a3ea3..7402bd65f793e 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursorMXBean.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursorMXBean.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedger.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedger.java index 7fcbfdc8b476c..4ca56508891a1 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedger.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedger.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -221,8 +221,7 @@ void asyncAddEntry(byte[] data, int numberOfMessages, int offset, int length, Ad * @param name * the name associated with the ManagedCursor * @param initialPosition - * the cursor will be set at latest position or not when first created - * default is true + * if null, the cursor will be set at latest position when first created * @return the ManagedCursor * @throws ManagedLedgerException */ @@ -237,8 +236,7 @@ ManagedCursor openCursor(String name, InitialPosition initialPosition) throws In * @param name * the name associated with the ManagedCursor * @param initialPosition - * the cursor will be set at latest position or not when first created - * default is true + * if null, the cursor will be set at latest position when first created * @param properties * user defined properties that will be attached to the first position of the cursor, if the open * operation will trigger the creation of the cursor. @@ -324,8 +322,7 @@ ManagedCursor newNonDurableCursor(Position startPosition, String subscriptionNam * @param name * the name associated with the ManagedCursor * @param initialPosition - * the cursor will be set at lastest position or not when first created - * default is true + * if null, the cursor will be set at latest position when first created * @param callback * callback object * @param ctx @@ -340,8 +337,7 @@ ManagedCursor newNonDurableCursor(Position startPosition, String subscriptionNam * @param name * the name associated with the ManagedCursor * @param initialPosition - * the cursor will be set at lastest position or not when first created - * default is true + * if null, the cursor will be set at latest position when first created * @param cursorProperties * the properties for the Cursor * @param callback diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerConfig.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerConfig.java index 24228d8d6d238..6e88a8e650d58 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerConfig.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerConfig.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -62,7 +62,7 @@ public class ManagedLedgerConfig { private int ledgerRolloverTimeout = 4 * 3600; private double throttleMarkDelete = 0; private long retentionTimeMs = 0; - private long retentionSizeInMB = 0; + private int retentionSizeInMB = 0; private boolean autoSkipNonRecoverableData; private boolean lazyCursorRecovery = false; private long metadataOperationsTimeoutSeconds = 60; @@ -86,6 +86,10 @@ public class ManagedLedgerConfig { private int minimumBacklogEntriesForCaching = 1000; private int maxBacklogBetweenCursorsForCaching = 1000; + @Getter + @Setter + private String shadowSourceName; + public boolean isCreateIfMissing() { return createIfMissing; } @@ -392,7 +396,7 @@ public ManagedLedgerConfig setThrottleMarkDelete(double throttleMarkDelete) { /** * Set the retention time for the ManagedLedger. *

- * Retention time and retention size ({@link #setRetentionSizeInMB(long)}) are together used to retain the + * Retention time and retention size ({@link #setRetentionSizeInMB(int)}) are together used to retain the * ledger data when there are no cursors or when all the cursors have marked the data for deletion. * Data will be deleted in this case when both retention time and retention size settings don't prevent deleting * the data marked for deletion. @@ -434,7 +438,7 @@ public long getRetentionTimeMillis() { * @param retentionSizeInMB * quota for message retention */ - public ManagedLedgerConfig setRetentionSizeInMB(long retentionSizeInMB) { + public ManagedLedgerConfig setRetentionSizeInMB(int retentionSizeInMB) { this.retentionSizeInMB = retentionSizeInMB; return this; } @@ -443,7 +447,7 @@ public ManagedLedgerConfig setRetentionSizeInMB(long retentionSizeInMB) { * @return quota for message retention * */ - public long getRetentionSizeInMB() { + public int getRetentionSizeInMB() { return retentionSizeInMB; } diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java index fa6dc59d14753..1fa565d6ec788 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactory.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactory.java index 667d641ac9ae0..b1427bab80b22 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactory.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -117,6 +117,17 @@ ReadOnlyCursor openReadOnlyCursor(String managedLedgerName, Position startPositi void asyncOpenReadOnlyCursor(String managedLedgerName, Position startPosition, ManagedLedgerConfig config, OpenReadOnlyCursorCallback callback, Object ctx); + /** + * Asynchronous open a Read-only managedLedger. + * @param managedLedgerName the unique name that identifies the managed ledger + * @param callback + * @param config the managed ledger configuration. + * @param ctx opaque context + */ + void asyncOpenReadOnlyManagedLedger(String managedLedgerName, + AsyncCallbacks.OpenReadOnlyManagedLedgerCallback callback, + ManagedLedgerConfig config, Object ctx); + /** * Get the current metadata info for a managed ledger. * @@ -146,6 +157,16 @@ void asyncOpenReadOnlyCursor(String managedLedgerName, Position startPosition, M */ void delete(String name) throws InterruptedException, ManagedLedgerException; + /** + * Delete a managed ledger. If it's not open, it's metadata will get regardless deleted. + * + * @param name + * @throws InterruptedException + * @throws ManagedLedgerException + */ + void delete(String name, CompletableFuture mlConfigFuture) + throws InterruptedException, ManagedLedgerException; + /** * Delete a managed ledger. If it's not open, it's metadata will get regardless deleted. * @@ -155,6 +176,16 @@ void asyncOpenReadOnlyCursor(String managedLedgerName, Position startPosition, M */ void asyncDelete(String name, DeleteLedgerCallback callback, Object ctx); + /** + * Delete a managed ledger. If it's not open, it's metadata will get regardless deleted. + * + * @param name + * @throws InterruptedException + * @throws ManagedLedgerException + */ + void asyncDelete(String name, CompletableFuture mlConfigFuture, + DeleteLedgerCallback callback, Object ctx); + /** * Releases all the resources maintained by the ManagedLedgerFactory. * diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryConfig.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryConfig.java index 78314be45c390..5aa4e8374d73a 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryConfig.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryConfig.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -57,6 +57,11 @@ public class ManagedLedgerFactoryConfig { */ private boolean copyEntriesInCache = false; + /** + * Maximum number of (estimated) data in-flight reading from storage and the cache. + */ + private long managedLedgerMaxReadsInFlightSize = 0; + /** * Whether trace managed ledger task execution time. */ diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryMXBean.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryMXBean.java index f71583ab88661..35c26c5dfdb89 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryMXBean.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerFactoryMXBean.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java index e0c9982c04ea2..3e4e56187e5ee 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerMXBean.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerMXBean.java index 6eccd029cbaf5..94c2f61e00afe 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerMXBean.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerMXBean.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadata.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadata.java index 7bbf2e5fe0c7f..7498ff823f838 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadata.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadata.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadataConsumer.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadataConsumer.java index c4c30d1299e72..3706d513dc0b5 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadataConsumer.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerMetadataConsumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Position.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Position.java index c76e7b75ab581..ac5810bbf01e7 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Position.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/Position.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java index fe086f009808e..18d412f893152 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ScanOutcome.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ScanOutcome.java index c7a4cff474cb4..c679c40e85e91 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ScanOutcome.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ScanOutcome.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/WaitingEntryCallBack.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/WaitingEntryCallBack.java index fc1f3b4b5ec46..cc6dbf3239204 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/WaitingEntryCallBack.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/WaitingEntryCallBack.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryImpl.java index c387aa970adb6..6512399173f0a 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -44,6 +44,8 @@ protected EntryImpl newObject(Handle handle) { private long entryId; ByteBuf data; + private Runnable onDeallocate; + public static EntryImpl create(LedgerEntry ledgerEntry) { EntryImpl entry = RECYCLER.get(); entry.timestamp = System.nanoTime(); @@ -102,6 +104,22 @@ private EntryImpl(Recycler.Handle recyclerHandle) { this.recyclerHandle = recyclerHandle; } + public void onDeallocate(Runnable r) { + if (this.onDeallocate == null) { + this.onDeallocate = r; + } else { + // this is not expected to happen + Runnable previous = this.onDeallocate; + this.onDeallocate = () -> { + try { + previous.run(); + } finally { + r.run(); + } + }; + } + } + public long getTimestamp() { return timestamp; } @@ -167,6 +185,13 @@ public ReferenceCounted touch(Object hint) { @Override protected void deallocate() { // This method is called whenever the ref-count of the EntryImpl reaches 0, so that now we can recycle it + if (onDeallocate != null) { + try { + onDeallocate.run(); + } finally { + onDeallocate = null; + } + } data.release(); data = null; timestamp = -1; diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerMetadataUtils.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerMetadataUtils.java index b32b81b234922..399811e4b3b17 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerMetadataUtils.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerMetadataUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerOffloaderStatsImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerOffloaderStatsImpl.java index 72382b1ac4574..be2895bf81867 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerOffloaderStatsImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/LedgerOffloaderStatsImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainer.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainer.java index 293ce8d2fcbc2..f9c7a6d2efe0e 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainer.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java index f9cb6a9ec6e37..5755f528c6ace 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -566,7 +566,7 @@ protected void recoverFromLedger(final ManagedCursorInfo info, final VoidCallbac if (positionInfo.getIndividualDeletedMessagesCount() > 0) { recoverIndividualDeletedMessages(positionInfo.getIndividualDeletedMessagesList()); } - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null + if (config.isDeletionAtBatchIndexLevelEnabled() && positionInfo.getBatchedEntryDeletionIndexInfoCount() > 0) { recoverBatchDeletedIndexes(positionInfo.getBatchedEntryDeletionIndexInfoList()); } @@ -1183,29 +1183,33 @@ public Position getFirstPosition() { return firstLedgerId == null ? null : new PositionImpl(firstLedgerId, 0); } - protected void internalResetCursor(PositionImpl position, AsyncCallbacks.ResetCursorCallback resetCursorCallback) { - if (position.equals(PositionImpl.EARLIEST)) { - position = ledger.getFirstPosition(); - } else if (position.equals(PositionImpl.LATEST)) { - position = ledger.getLastPosition().getNext(); + protected void internalResetCursor(PositionImpl proposedReadPosition, + AsyncCallbacks.ResetCursorCallback resetCursorCallback) { + final PositionImpl newReadPosition; + if (proposedReadPosition.equals(PositionImpl.EARLIEST)) { + newReadPosition = ledger.getFirstPosition(); + } else if (proposedReadPosition.equals(PositionImpl.LATEST)) { + newReadPosition = ledger.getLastPosition().getNext(); + } else { + newReadPosition = proposedReadPosition; } - log.info("[{}] Initiate reset position to {} on cursor {}", ledger.getName(), position, name); + log.info("[{}] Initiate reset readPosition to {} on cursor {}", ledger.getName(), newReadPosition, name); synchronized (pendingMarkDeleteOps) { if (!RESET_CURSOR_IN_PROGRESS_UPDATER.compareAndSet(this, FALSE, TRUE)) { - log.error("[{}] reset requested - position [{}], previous reset in progress - cursor {}", - ledger.getName(), position, name); + log.error("[{}] reset requested - readPosition [{}], previous reset in progress - cursor {}", + ledger.getName(), newReadPosition, name); resetCursorCallback.resetFailed( new ManagedLedgerException.ConcurrentFindCursorPositionException("reset already in progress"), - position); + newReadPosition); return; } } final AsyncCallbacks.ResetCursorCallback callback = resetCursorCallback; - final PositionImpl newPosition = position; + final PositionImpl newMarkDeletePosition = ledger.getPreviousPosition(newReadPosition); VoidCallback finalCallback = new VoidCallback() { @Override @@ -1214,8 +1218,6 @@ public void operationComplete() { // modify mark delete and read position since we are able to persist new position for cursor lock.writeLock().lock(); try { - PositionImpl newMarkDeletePosition = ledger.getPreviousPosition(newPosition); - if (markDeletePosition.compareTo(newMarkDeletePosition) >= 0) { MSG_CONSUMED_COUNTER_UPDATER.addAndGet(cursorImpl(), -getNumberOfEntries( Range.closedOpen(newMarkDeletePosition, markDeletePosition))); @@ -1227,37 +1229,37 @@ public void operationComplete() { lastMarkDeleteEntry = new MarkDeleteEntry(newMarkDeletePosition, isCompactionCursor() ? getProperties() : Collections.emptyMap(), null, null); individualDeletedMessages.clear(); - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + if (config.isDeletionAtBatchIndexLevelEnabled()) { batchDeletedIndexes.values().forEach(BitSetRecyclable::recycle); batchDeletedIndexes.clear(); - long[] resetWords = newPosition.ackSet; + long[] resetWords = newReadPosition.ackSet; if (resetWords != null) { BitSetRecyclable ackSet = BitSetRecyclable.create().resetWords(resetWords); - batchDeletedIndexes.put(newPosition, ackSet); + batchDeletedIndexes.put(newReadPosition, ackSet); } } PositionImpl oldReadPosition = readPosition; - if (oldReadPosition.compareTo(newPosition) >= 0) { - log.info("[{}] reset position to {} before current read position {} on cursor {}", - ledger.getName(), newPosition, oldReadPosition, name); + if (oldReadPosition.compareTo(newReadPosition) >= 0) { + log.info("[{}] reset readPosition to {} before current read readPosition {} on cursor {}", + ledger.getName(), newReadPosition, oldReadPosition, name); } else { - log.info("[{}] reset position to {} skipping from current read position {} on cursor {}", - ledger.getName(), newPosition, oldReadPosition, name); + log.info("[{}] reset readPosition to {} skipping from current read readPosition {} on " + + "cursor {}", ledger.getName(), newReadPosition, oldReadPosition, name); } - readPosition = newPosition; - ledger.onCursorReadPositionUpdated(ManagedCursorImpl.this, newPosition); + readPosition = newReadPosition; + ledger.onCursorReadPositionUpdated(ManagedCursorImpl.this, newReadPosition); } finally { lock.writeLock().unlock(); } synchronized (pendingMarkDeleteOps) { pendingMarkDeleteOps.clear(); if (!RESET_CURSOR_IN_PROGRESS_UPDATER.compareAndSet(ManagedCursorImpl.this, TRUE, FALSE)) { - log.error("[{}] expected reset position [{}], but another reset in progress on cursor {}", - ledger.getName(), newPosition, name); + log.error("[{}] expected reset readPosition [{}], but another reset in progress on cursor {}", + ledger.getName(), newReadPosition, name); } } - callback.resetComplete(newPosition); + callback.resetComplete(newReadPosition); updateLastActive(); } @@ -1265,20 +1267,20 @@ public void operationComplete() { public void operationFailed(ManagedLedgerException exception) { synchronized (pendingMarkDeleteOps) { if (!RESET_CURSOR_IN_PROGRESS_UPDATER.compareAndSet(ManagedCursorImpl.this, TRUE, FALSE)) { - log.error("[{}] expected reset position [{}], but another reset in progress on cursor {}", - ledger.getName(), newPosition, name); + log.error("[{}] expected reset readPosition [{}], but another reset in progress on cursor {}", + ledger.getName(), newReadPosition, name); } } callback.resetFailed(new ManagedLedgerException.InvalidCursorPositionException( - "unable to persist position for cursor reset " + newPosition.toString()), newPosition); + "unable to persist readPosition for cursor reset " + newReadPosition), newReadPosition); } }; persistentMarkDeletePosition = null; inProgressMarkDeletePersistPosition = null; - lastMarkDeleteEntry = new MarkDeleteEntry(newPosition, getProperties(), null, null); - internalAsyncMarkDelete(newPosition, isCompactionCursor() ? getProperties() : Collections.emptyMap(), + lastMarkDeleteEntry = new MarkDeleteEntry(newMarkDeletePosition, getProperties(), null, null); + internalAsyncMarkDelete(newMarkDeletePosition, isCompactionCursor() ? getProperties() : Collections.emptyMap(), new MarkDeleteCallback() { @Override public void markDeleteComplete(Object ctx) { @@ -1298,7 +1300,7 @@ public void asyncResetCursor(Position newPos, boolean forceReset, AsyncCallbacks final PositionImpl newPosition = (PositionImpl) newPos; // order trim and reset operations on a ledger - ledger.getExecutor().executeOrdered(ledger.getName(), safeRun(() -> { + ledger.getExecutor().execute(safeRun(() -> { PositionImpl actualPosition = newPosition; if (!ledger.isValidPosition(actualPosition) @@ -1866,9 +1868,29 @@ public void asyncMarkDelete(final Position position, Map propertie PositionImpl newPosition = (PositionImpl) position; - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + if (config.isDeletionAtBatchIndexLevelEnabled()) { if (newPosition.ackSet != null) { - batchDeletedIndexes.put(newPosition, BitSetRecyclable.create().resetWords(newPosition.ackSet)); + AtomicReference bitSetRecyclable = new AtomicReference<>(); + BitSetRecyclable givenBitSet = BitSetRecyclable.create().resetWords(newPosition.ackSet); + // In order to prevent the batch index recorded in batchDeletedIndexes from rolling back, + // only update batchDeletedIndexes when the submitted batch index is greater + // than the recorded index. + batchDeletedIndexes.compute(newPosition, + (k, v) -> { + if (v == null) { + return givenBitSet; + } + if (givenBitSet.nextSetBit(0) > v.nextSetBit(0)) { + bitSetRecyclable.set(v); + return givenBitSet; + } else { + bitSetRecyclable.set(givenBitSet); + return v; + } + }); + if (bitSetRecyclable.get() != null) { + bitSetRecyclable.get().recycle(); + } newPosition = ledger.getPreviousPosition(newPosition); } Map subMap = batchDeletedIndexes.subMap(PositionImpl.EARLIEST, newPosition); @@ -1975,7 +1997,7 @@ void internalMarkDelete(final MarkDeleteEntry mdEntry) { + "is later.", mdEntry.newPosition, persistentMarkDeletePosition); } // run with executor to prevent deadlock - ledger.getExecutor().executeOrdered(ledger.getName(), safeRun(() -> mdEntry.triggerComplete())); + ledger.getExecutor().execute(safeRun(() -> mdEntry.triggerComplete())); return; } @@ -1994,7 +2016,7 @@ void internalMarkDelete(final MarkDeleteEntry mdEntry) { + "in progress {} is later.", mdEntry.newPosition, inProgressLatest); } // run with executor to prevent deadlock - ledger.getExecutor().executeOrdered(ledger.getName(), safeRun(() -> mdEntry.triggerComplete())); + ledger.getExecutor().execute(safeRun(() -> mdEntry.triggerComplete())); return; } @@ -2029,7 +2051,7 @@ public void operationComplete() { try { individualDeletedMessages.removeAtMost(mdEntry.newPosition.getLedgerId(), mdEntry.newPosition.getEntryId()); - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + if (config.isDeletionAtBatchIndexLevelEnabled()) { Map subMap = batchDeletedIndexes.subMap(PositionImpl.EARLIEST, false, PositionImpl.get(mdEntry.newPosition.getLedgerId(), mdEntry.newPosition.getEntryId()), true); @@ -2158,7 +2180,7 @@ public void asyncDelete(Iterable positions, AsyncCallbacks.DeleteCallb if (individualDeletedMessages.contains(position.getLedgerId(), position.getEntryId()) || position.compareTo(markDeletePosition) <= 0) { - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + if (config.isDeletionAtBatchIndexLevelEnabled()) { BitSetRecyclable bitSetRecyclable = batchDeletedIndexes.remove(position); if (bitSetRecyclable != null) { bitSetRecyclable.recycle(); @@ -2170,7 +2192,7 @@ public void asyncDelete(Iterable positions, AsyncCallbacks.DeleteCallb continue; } if (position.ackSet == null) { - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + if (config.isDeletionAtBatchIndexLevelEnabled()) { BitSetRecyclable bitSetRecyclable = batchDeletedIndexes.remove(position); if (bitSetRecyclable != null) { bitSetRecyclable.recycle(); @@ -2187,7 +2209,7 @@ public void asyncDelete(Iterable positions, AsyncCallbacks.DeleteCallb log.debug("[{}] [{}] Individually deleted messages: {}", ledger.getName(), name, individualDeletedMessages); } - } else if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + } else if (config.isDeletionAtBatchIndexLevelEnabled()) { BitSetRecyclable givenBitSet = BitSetRecyclable.create().resetWords(position.ackSet); BitSetRecyclable bitSet = batchDeletedIndexes.computeIfAbsent(position, (v) -> givenBitSet); if (givenBitSet != bitSet) { @@ -2601,8 +2623,8 @@ public void operationFailed(MetaStoreException e) { @Override public void asyncClose(final AsyncCallbacks.CloseCallback callback, final Object ctx) { - State oldState = STATE_UPDATER.getAndSet(this, State.Closing); - if (oldState == State.Closed || oldState == State.Closing) { + boolean alreadyClosing = !trySetStateToClosing(); + if (alreadyClosing) { log.info("[{}] [{}] State is already closed", ledger.getName(), name); callback.closeComplete(ctx); return; @@ -2685,6 +2707,28 @@ public void operationFailed(ManagedLedgerException exception) { }); } + /** + * Try set {@link #state} to {@link State#Closing}. + * @return false if the {@link #state} already is {@link State#Closing} or {@link State#Closed}. + */ + private boolean trySetStateToClosing() { + final AtomicBoolean notClosing = new AtomicBoolean(false); + STATE_UPDATER.updateAndGet(this, state -> { + switch (state){ + case Closing: + case Closed: { + notClosing.set(false); + return state; + } + default: { + notClosing.set(true); + return State.Closing; + } + } + }); + return notClosing.get(); + } + private void flushPendingMarkDeletes() { if (!pendingMarkDeleteOps.isEmpty()) { internalFlushPendingMarkDeletes(); @@ -2842,8 +2886,7 @@ private List buildIndividualDeletedMessageRanges() { private List buildBatchEntryDeletionIndexInfoList() { lock.readLock().lock(); try { - if (!config.isDeletionAtBatchIndexLevelEnabled() || batchDeletedIndexes == null - || batchDeletedIndexes.isEmpty()) { + if (!config.isDeletionAtBatchIndexLevelEnabled() || batchDeletedIndexes.isEmpty()) { return Collections.emptyList(); } MLDataFormats.NestedPositionInfo.Builder nestedPositionBuilder = MLDataFormats.NestedPositionInfo @@ -3284,8 +3327,14 @@ public Range getLastIndividualDeletedRange() { @Override public void trimDeletedEntries(List entries) { - entries.removeIf(entry -> ((PositionImpl) entry.getPosition()).compareTo(markDeletePosition) <= 0 - || individualDeletedMessages.contains(entry.getLedgerId(), entry.getEntryId())); + entries.removeIf(entry -> { + boolean isDeleted = ((PositionImpl) entry.getPosition()).compareTo(markDeletePosition) <= 0 + || individualDeletedMessages.contains(entry.getLedgerId(), entry.getEntryId()); + if (isDeleted) { + entry.release(); + } + return isDeleted; + }); } private ManagedCursorImpl cursorImpl() { @@ -3294,7 +3343,7 @@ private ManagedCursorImpl cursorImpl() { @Override public long[] getDeletedBatchIndexesAsLongArray(PositionImpl position) { - if (config.isDeletionAtBatchIndexLevelEnabled() && batchDeletedIndexes != null) { + if (config.isDeletionAtBatchIndexLevelEnabled()) { BitSetRecyclable bitSet = batchDeletedIndexes.get(position); return bitSet == null ? null : bitSet.toLongArray(); } else { diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorMXBeanImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorMXBeanImpl.java index fd9dcc1e17f1c..48465e6294b0e 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorMXBeanImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorMXBeanImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java index e0af1cc632612..9f3fe9bb0c4a7 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -26,6 +26,7 @@ import io.netty.util.concurrent.DefaultThreadFactory; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -71,6 +72,7 @@ import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback; import org.apache.bookkeeper.mledger.impl.cache.EntryCacheManager; import org.apache.bookkeeper.mledger.impl.cache.RangeEntryCacheManagerImpl; +import org.apache.bookkeeper.mledger.offload.OffloadUtils; import org.apache.bookkeeper.mledger.proto.MLDataFormats; import org.apache.bookkeeper.mledger.proto.MLDataFormats.LongProperty; import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo; @@ -78,6 +80,7 @@ import org.apache.bookkeeper.mledger.util.Futures; import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.stats.StatsLogger; +import org.apache.commons.lang3.tuple.Pair; import org.apache.pulsar.common.policies.data.EnsemblePlacementPolicyConfig; import org.apache.pulsar.common.util.DateFormatter; import org.apache.pulsar.common.util.FutureUtil; @@ -338,7 +341,7 @@ public void asyncOpen(final String name, final ManagedLedgerConfig config, final if (existingFuture.isDone()) { try { ManagedLedgerImpl l = existingFuture.get(); - if (l.getState() == State.Fenced || l.getState() == State.Closed) { + if (l.getState().isFenced() || l.getState() == State.Closed) { // Managed ledger is in unusable state. Recreate it. log.warn("[{}] Attempted to open ledger in {} state. Removing from the map to recreate it", name, l.getState()); @@ -420,7 +423,29 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) { }); } + @Override + public void asyncOpenReadOnlyManagedLedger(String managedLedgerName, + AsyncCallbacks.OpenReadOnlyManagedLedgerCallback callback, + ManagedLedgerConfig config, Object ctx) { + if (closed) { + callback.openReadOnlyManagedLedgerFailed( + new ManagedLedgerException.ManagedLedgerFactoryClosedException(), ctx); + } + ReadOnlyManagedLedgerImpl roManagedLedger = new ReadOnlyManagedLedgerImpl(this, + bookkeeperFactory + .get(new EnsemblePlacementPolicyConfig(config.getBookKeeperEnsemblePlacementPolicyClassName(), + config.getBookKeeperEnsemblePlacementPolicyProperties())), + store, config, scheduledExecutor, managedLedgerName); + roManagedLedger.initialize().thenRun(() -> { + log.info("[{}] Successfully initialize Read-only managed ledger", managedLedgerName); + callback.openReadOnlyManagedLedgerComplete(roManagedLedger, ctx); + }).exceptionally(e -> { + log.error("[{}] Failed to initialize Read-only managed ledger", managedLedgerName, e); + callback.openReadOnlyManagedLedgerFailed((ManagedLedgerException) e.getCause(), ctx); + return null; + }); + } @Override public ReadOnlyCursor openReadOnlyCursor(String managedLedgerName, Position startPosition, @@ -462,28 +487,20 @@ public void asyncOpenReadOnlyCursor(String managedLedgerName, Position startPosi return; } checkArgument(startPosition instanceof PositionImpl); - ReadOnlyManagedLedgerImpl roManagedLedger = new ReadOnlyManagedLedgerImpl(this, - bookkeeperFactory - .get(new EnsemblePlacementPolicyConfig(config.getBookKeeperEnsemblePlacementPolicyClassName(), - config.getBookKeeperEnsemblePlacementPolicyProperties())), - store, config, scheduledExecutor, managedLedgerName); - - roManagedLedger.initializeAndCreateCursor((PositionImpl) startPosition) - .thenAccept(roCursor -> callback.openReadOnlyCursorComplete(roCursor, ctx)) - .exceptionally(ex -> { - Throwable t = ex; - if (t instanceof CompletionException) { - t = ex.getCause(); + AsyncCallbacks.OpenReadOnlyManagedLedgerCallback openReadOnlyManagedLedgerCallback = + new AsyncCallbacks.OpenReadOnlyManagedLedgerCallback() { + @Override + public void openReadOnlyManagedLedgerComplete(ReadOnlyManagedLedgerImpl readOnlyManagedLedger, Object ctx) { + callback.openReadOnlyCursorComplete(readOnlyManagedLedger. + createReadOnlyCursor((PositionImpl) startPosition), ctx); } - if (t instanceof ManagedLedgerException) { - callback.openReadOnlyCursorFailed((ManagedLedgerException) t, ctx); - } else { - callback.openReadOnlyCursorFailed(new ManagedLedgerException(t), ctx); + @Override + public void openReadOnlyManagedLedgerFailed(ManagedLedgerException exception, Object ctx) { + callback.openReadOnlyCursorFailed(exception, ctx); } - - return null; - }); + }; + asyncOpenReadOnlyManagedLedger(managedLedgerName, openReadOnlyManagedLedgerCallback, config, null); } void close(ManagedLedger ledger) { @@ -804,12 +821,18 @@ public void operationFailed(MetaStoreException e) { @Override public void delete(String name) throws InterruptedException, ManagedLedgerException { + delete(name, CompletableFuture.completedFuture(null)); + } + + @Override + public void delete(String name, CompletableFuture mlConfigFuture) + throws InterruptedException, ManagedLedgerException { class Result { ManagedLedgerException e = null; } final Result r = new Result(); final CountDownLatch latch = new CountDownLatch(1); - asyncDelete(name, new DeleteLedgerCallback() { + asyncDelete(name, mlConfigFuture, new DeleteLedgerCallback() { @Override public void deleteLedgerComplete(Object ctx) { latch.countDown(); @@ -831,10 +854,16 @@ public void deleteLedgerFailed(ManagedLedgerException exception, Object ctx) { @Override public void asyncDelete(String name, DeleteLedgerCallback callback, Object ctx) { + asyncDelete(name, CompletableFuture.completedFuture(null), callback, ctx); + } + + @Override + public void asyncDelete(String name, CompletableFuture mlConfigFuture, + DeleteLedgerCallback callback, Object ctx) { CompletableFuture future = ledgers.get(name); if (future == null) { // Managed ledger does not exist and we're not currently trying to open it - deleteManagedLedger(name, callback, ctx); + deleteManagedLedger(name, mlConfigFuture, callback, ctx); } else { future.thenAccept(ml -> { // If it's open, delete in the normal way @@ -849,7 +878,8 @@ public void asyncDelete(String name, DeleteLedgerCallback callback, Object ctx) /** * Delete all managed ledger resources and metadata. */ - void deleteManagedLedger(String managedLedgerName, DeleteLedgerCallback callback, Object ctx) { + void deleteManagedLedger(String managedLedgerName, CompletableFuture mlConfigFuture, + DeleteLedgerCallback callback, Object ctx) { // Read the managed ledger metadata from store asyncGetManagedLedgerInfo(managedLedgerName, new ManagedLedgerInfoCallback() { @Override @@ -861,7 +891,7 @@ public void getInfoComplete(ManagedLedgerInfo info, Object ctx) { .map(e -> deleteCursor(bkc, managedLedgerName, e.getKey(), e.getValue())) .collect(Collectors.toList()); Futures.waitForAll(futures).thenRun(() -> { - deleteManagedLedgerData(bkc, managedLedgerName, info, callback, ctx); + deleteManagedLedgerData(bkc, managedLedgerName, info, mlConfigFuture, callback, ctx); }).exceptionally(ex -> { callback.deleteLedgerFailed(new ManagedLedgerException(ex), ctx); return null; @@ -876,22 +906,80 @@ public void getInfoFailed(ManagedLedgerException exception, Object ctx) { } private void deleteManagedLedgerData(BookKeeper bkc, String managedLedgerName, ManagedLedgerInfo info, - DeleteLedgerCallback callback, Object ctx) { + CompletableFuture mlConfigFuture, + DeleteLedgerCallback callback, Object ctx) { + final CompletableFuture> + ledgerInfosFuture = new CompletableFuture<>(); + store.getManagedLedgerInfo(managedLedgerName, false, null, + new MetaStoreCallback<>() { + @Override + public void operationComplete(MLDataFormats.ManagedLedgerInfo mlInfo, Stat stat) { + Map infos = new HashMap<>(); + for (MLDataFormats.ManagedLedgerInfo.LedgerInfo ls : mlInfo.getLedgerInfoList()) { + infos.put(ls.getLedgerId(), ls); + } + ledgerInfosFuture.complete(infos); + } + + @Override + public void operationFailed(MetaStoreException e) { + log.error("Failed to get managed ledger info for {}", managedLedgerName, e); + ledgerInfosFuture.completeExceptionally(e); + } + }); + Futures.waitForAll(info.ledgers.stream() - .filter(li -> !li.isOffloaded) - .map(li -> bkc.newDeleteLedgerOp().withLedgerId(li.ledgerId).execute() - .handle((result, ex) -> { - if (ex != null) { - int rc = BKException.getExceptionCode(ex); - if (rc == BKException.Code.NoSuchLedgerExistsOnMetadataServerException - || rc == BKException.Code.NoSuchLedgerExistsException) { - log.info("Ledger {} does not exist, ignoring", li.ledgerId); - return null; - } - throw new CompletionException(ex); + .map(li -> { + final CompletableFuture res; + if (li.isOffloaded) { + res = mlConfigFuture + .thenCombine(ledgerInfosFuture, Pair::of) + .thenCompose(pair -> { + ManagedLedgerConfig mlConfig = pair.getLeft(); + Map ledgerInfos = pair.getRight(); + + if (mlConfig == null || ledgerInfos == null) { + return CompletableFuture.completedFuture(null); + } + + MLDataFormats.ManagedLedgerInfo.LedgerInfo ls = ledgerInfos.get(li.ledgerId); + + if (ls.getOffloadContext().hasUidMsb()) { + MLDataFormats.ManagedLedgerInfo.LedgerInfo.Builder newInfoBuilder = ls.toBuilder(); + newInfoBuilder.getOffloadContextBuilder().setBookkeeperDeleted(true); + String driverName = OffloadUtils.getOffloadDriverName(ls, + mlConfig.getLedgerOffloader().getOffloadDriverName()); + Map driverMetadata = OffloadUtils.getOffloadDriverMetadata(ls, + mlConfig.getLedgerOffloader().getOffloadDriverMetadata()); + OffloadUtils.setOffloadDriverMetadata(newInfoBuilder, driverName, driverMetadata); + + UUID uuid = new UUID(ls.getOffloadContext().getUidMsb(), + ls.getOffloadContext().getUidLsb()); + return OffloadUtils.cleanupOffloaded(li.ledgerId, uuid, mlConfig, + OffloadUtils.getOffloadDriverMetadata(ls, + mlConfig.getLedgerOffloader().getOffloadDriverMetadata()), + "Deletion", managedLedgerName, scheduledExecutor); } - return result; - })) + + return CompletableFuture.completedFuture(null); + }); + } else { + res = CompletableFuture.completedFuture(null); + } + return res.thenCompose(__ -> bkc.newDeleteLedgerOp().withLedgerId(li.ledgerId).execute() + .handle((result, ex) -> { + if (ex != null) { + int rc = BKException.getExceptionCode(ex); + if (rc == BKException.Code.NoSuchLedgerExistsOnMetadataServerException + || rc == BKException.Code.NoSuchLedgerExistsException) { + log.info("Ledger {} does not exist, ignoring", li.ledgerId); + return null; + } + throw new CompletionException(ex); + } + return result; + })); + }) .collect(Collectors.toList())) .thenRun(() -> { // Delete the metadata diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryMBeanImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryMBeanImpl.java index a5f0c67e68ae0..cf3d7142d617e 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryMBeanImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryMBeanImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java index d77790830511b..58fcff877ca6c 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -56,6 +56,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -78,7 +79,6 @@ import org.apache.bookkeeper.client.LedgerHandle; import org.apache.bookkeeper.client.api.ReadHandle; import org.apache.bookkeeper.common.util.Backoff; -import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.bookkeeper.common.util.Retries; import org.apache.bookkeeper.mledger.AsyncCallbacks; @@ -132,6 +132,7 @@ import org.apache.pulsar.common.policies.data.EnsemblePlacementPolicyConfig; import org.apache.pulsar.common.policies.data.ManagedLedgerInternalStats; import org.apache.pulsar.common.policies.data.OffloadPolicies; +import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl; import org.apache.pulsar.common.policies.data.OffloadedReadPriority; import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats; import org.apache.pulsar.common.protocol.Commands; @@ -151,7 +152,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { protected final BookKeeper bookKeeper; protected final String name; private final Map ledgerMetadata; - private final BookKeeper.DigestType digestType; + protected final BookKeeper.DigestType digestType; protected ManagedLedgerConfig config; protected Map propertiesMap; @@ -163,7 +164,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { .concurrencyLevel(1) // number of sections .build(); protected final NavigableMap ledgers = new ConcurrentSkipListMap<>(); - private volatile Stat ledgersStat; + protected volatile Stat ledgersStat; // contains all cursors, where durable cursors are ordered by mark delete position private final ManagedCursorContainer cursors = new ManagedCursorContainer(); @@ -173,7 +174,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { private final ManagedCursorContainer activeCursors = new ManagedCursorContainer(); - // Ever increasing counter of entries added + // Ever-increasing counter of entries added @VisibleForTesting static final AtomicLongFieldUpdater ENTRIES_ADDED_COUNTER_UPDATER = AtomicLongFieldUpdater .newUpdater(ManagedLedgerImpl.class, "entriesAddedCounter"); @@ -214,10 +215,10 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { private final CallbackMutex offloadMutex = new CallbackMutex(); private static final CompletableFuture NULL_OFFLOAD_PROMISE = CompletableFuture .completedFuture(PositionImpl.LATEST); - private volatile LedgerHandle currentLedger; - private long currentLedgerEntries = 0; - private long currentLedgerSize = 0; - private volatile long lastLedgerCreatedTimestamp = 0; + protected volatile LedgerHandle currentLedger; + protected long currentLedgerEntries = 0; + protected long currentLedgerSize = 0; + protected volatile long lastLedgerCreatedTimestamp = 0; private volatile long lastLedgerCreationFailureTimestamp = 0; private long lastLedgerCreationInitiationTimestamp = 0; @@ -235,9 +236,9 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { volatile PositionImpl lastConfirmedEntry; - private ManagedLedgerInterceptor managedLedgerInterceptor; + protected ManagedLedgerInterceptor managedLedgerInterceptor; - private volatile long lastAddEntryTimeMs = 0; + protected volatile long lastAddEntryTimeMs = 0; private long inactiveLedgerRollOverTimeMs = 0; protected static final int DEFAULT_LEDGER_DELETE_RETRIES = 3; @@ -252,14 +253,31 @@ public enum State { // operation CreatingLedger, // Creating a new ledger Closed, // ManagedLedger has been closed - Fenced, // A managed ledger is fenced when there is some concurrent + Fenced { + @Override + public boolean isFenced() { + return true; + } + }, // A managed ledger is fenced when there is some concurrent // access from a different session/machine. In this state the // managed ledger will throw exception for all operations, since // the new instance will take over + FencedForDeletion { + @Override + public boolean isFenced() { + return true; + } + }, // A managed ledger is fenced for deletion + // which allows truncate/delete operation to proceed but the rest + // of teh rules from the Fenced state apply. Terminated, // Managed ledger was terminated and no more entries // are allowed to be added. Reads are allowed - WriteFailed // The state that is transitioned to when a BK write failure happens + WriteFailed; // The state that is transitioned to when a BK write failure happens // After handling the BK write failure, managed ledger will get signalled to create a new ledger + + public boolean isFenced() { + return false; + } } // define boundaries for position based seeks and searches @@ -267,7 +285,7 @@ public enum PositionBound { startIncluded, startExcluded } - private static final AtomicReferenceFieldUpdater STATE_UPDATER = + protected static final AtomicReferenceFieldUpdater STATE_UPDATER = AtomicReferenceFieldUpdater.newUpdater(ManagedLedgerImpl.class, State.class, "state"); protected volatile State state = null; private volatile boolean migrated = false; @@ -276,7 +294,7 @@ public enum PositionBound { private final OrderedScheduler scheduledExecutor; @Getter - private final OrderedExecutor executor; + protected final Executor executor; @Getter private final ManagedLedgerFactoryImpl factory; @@ -299,7 +317,7 @@ public enum PositionBound { .newUpdater(ManagedLedgerImpl.class, ReadEntryCallbackWrapper.class, "lastReadCallback"); /** - * Queue of pending entries to be added to the managed ledger. Typically entries are queued when a new ledger is. + * Queue of pending entries to be added to the managed ledger. Typically, entries are queued when a new ledger is. * created asynchronously and hence there is no ready ledger to write into. */ final ConcurrentLinkedQueue pendingAddEntries = new ConcurrentLinkedQueue<>(); @@ -327,7 +345,7 @@ public ManagedLedgerImpl(ManagedLedgerFactoryImpl factory, BookKeeper bookKeeper this.ledgerMetadata = LedgerMetadataUtils.buildBaseManagedLedgerMetadata(name); this.digestType = BookKeeper.DigestType.fromApiDigestType(config.getDigestType()); this.scheduledExecutor = scheduledExecutor; - this.executor = bookKeeper.getMainWorkerPool(); + this.executor = bookKeeper.getMainWorkerPool().chooseThread(name); TOTAL_SIZE_UPDATER.set(this, 0); NUMBER_OF_ENTRIES_UPDATER.set(this, 0); ENTRIES_ADDED_COUNTER_UPDATER.set(this, 0); @@ -390,7 +408,7 @@ public void operationComplete(ManagedLedgerInfo mlInfo, Stat stat) { if (!ledgers.isEmpty()) { final long id = ledgers.lastKey(); OpenCallback opencb = (rc, lh, ctx1) -> { - executor.executeOrdered(name, safeRun(() -> { + executor.execute(safeRun(() -> { mbean.endDataLedgerOpenOp(); if (log.isDebugEnabled()) { log.debug("[{}] Opened ledger {}: {}", name, id, BKException.getMessage(rc)); @@ -447,7 +465,11 @@ public void operationFailed(MetaStoreException e) { scheduleTimeoutTask(); } - private synchronized void initializeBookKeeper(final ManagedLedgerInitializeLedgerCallback callback) { + protected boolean isLedgersReadonly() { + return false; + } + + protected synchronized void initializeBookKeeper(final ManagedLedgerInitializeLedgerCallback callback) { if (log.isDebugEnabled()) { log.debug("[{}] initializing bookkeeper; ledgers {}", name, ledgers); } @@ -499,7 +521,7 @@ public void operationFailed(MetaStoreException e) { return; } - executor.executeOrdered(name, safeRun(() -> { + executor.execute(safeRun(() -> { mbean.endDataLedgerCreateOp(); if (rc != BKException.Code.OK) { callback.initializeFailed(createManagedLedgerException(rc)); @@ -532,7 +554,7 @@ public void operationFailed(MetaStoreException e) { }, ledgerMetadata); } - private void initializeCursors(final ManagedLedgerInitializeLedgerCallback callback) { + protected void initializeCursors(final ManagedLedgerInitializeLedgerCallback callback) { if (log.isDebugEnabled()) { log.debug("[{}] initializing cursors", name); } @@ -751,7 +773,7 @@ public void asyncAddEntry(ByteBuf buffer, AddEntryCallback callback, Object ctx) buffer.retain(); // Jump to specific thread to avoid contention from writers writing from different threads - executor.executeOrdered(name, safeRun(() -> { + executor.execute(safeRun(() -> { OpAddEntry addOperation = OpAddEntry.createNoRetainBuffer(this, buffer, callback, ctx); internalAsyncAddEntry(addOperation); })); @@ -767,18 +789,18 @@ public void asyncAddEntry(ByteBuf buffer, int numberOfMessages, AddEntryCallback buffer.retain(); // Jump to specific thread to avoid contention from writers writing from different threads - executor.executeOrdered(name, safeRun(() -> { + executor.execute(safeRun(() -> { OpAddEntry addOperation = OpAddEntry.createNoRetainBuffer(this, buffer, numberOfMessages, callback, ctx); internalAsyncAddEntry(addOperation); })); } - private synchronized void internalAsyncAddEntry(OpAddEntry addOperation) { + protected synchronized void internalAsyncAddEntry(OpAddEntry addOperation) { if (!beforeAddEntry(addOperation)) { return; } final State state = STATE_UPDATER.get(this); - if (state == State.Fenced) { + if (state.isFenced()) { addOperation.failed(new ManagedLedgerFencedException()); return; } else if (state == State.Terminated) { @@ -843,7 +865,7 @@ private synchronized void internalAsyncAddEntry(OpAddEntry addOperation) { lastAddEntryTimeMs = System.currentTimeMillis(); } - private boolean beforeAddEntry(OpAddEntry addOperation) { + protected boolean beforeAddEntry(OpAddEntry addOperation) { // if no interceptor, just return true to make sure addOperation will be initiate() if (managedLedgerInterceptor == null) { return true; @@ -972,8 +994,9 @@ public void operationComplete() { log.info("[{}] Opened new cursor: {}", name, cursor); cursor.setActive(); // Update the ack position (ignoring entries that were written while the cursor was being created) - cursor.initializeCursorPosition(initialPosition == InitialPosition.Latest ? getLastPositionAndCounter() - : getFirstPositionAndCounter()); + cursor.initializeCursorPosition(InitialPosition.Earliest == initialPosition + ? getFirstPositionAndCounter() + : getLastPositionAndCounter()); synchronized (ManagedLedgerImpl.this) { addCursor(cursor); @@ -1297,7 +1320,7 @@ public void terminateFailed(ManagedLedgerException exception, Object ctx) { @Override public synchronized void asyncTerminate(TerminateCallback callback, Object ctx) { - if (state == State.Fenced) { + if (state.isFenced()) { callback.terminateFailed(new ManagedLedgerFencedException(), ctx); return; } else if (state == State.Terminated) { @@ -1427,7 +1450,7 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) { @Override public synchronized void asyncClose(final CloseCallback callback, final Object ctx) { State state = STATE_UPDATER.get(this); - if (state == State.Fenced) { + if (state.isFenced()) { cancelScheduledTasks(); factory.close(this); callback.closeFailed(new ManagedLedgerFencedException(), ctx); @@ -1590,7 +1613,7 @@ public void operationFailed(MetaStoreException e) { } } - private void handleBadVersion(Throwable e) { + protected void handleBadVersion(Throwable e) { if (e instanceof BadVersionException) { setFenced(); } @@ -1630,7 +1653,7 @@ void createNewOpAddEntryForNewLedger() { } while (existsOp != null && --pendingSize > 0); } - private synchronized void updateLedgersIdsComplete() { + protected synchronized void updateLedgersIdsComplete() { STATE_UPDATER.set(this, State.LedgerOpened); updateLastLedgerCreatedTimeAndScheduleRolloverTask(); @@ -1812,7 +1835,7 @@ void clearPendingAddEntries(ManagedLedgerException e) { void asyncReadEntries(OpReadEntry opReadEntry) { final State state = STATE_UPDATER.get(this); - if (state == State.Fenced || state == State.Closed) { + if (state.isFenced() || state == State.Closed) { opReadEntry.readEntriesFailed(new ManagedLedgerFencedException(), opReadEntry.ctx); return; } @@ -1829,7 +1852,7 @@ void asyncReadEntries(OpReadEntry opReadEntry) { } else { LedgerInfo ledgerInfo = ledgers.get(ledgerId); if (ledgerInfo == null || ledgerInfo.getEntries() == 0) { - // Cursor is pointing to a empty ledger, there's no need to try opening it. Skip this ledger and + // Cursor is pointing to an empty ledger, there's no need to try opening it. Skip this ledger and // move to the next one opReadEntry.updateReadPosition(new PositionImpl(opReadEntry.readPosition.getLedgerId() + 1, 0)); opReadEntry.checkReadCompletion(); @@ -1921,7 +1944,7 @@ CompletableFuture getLedgerHandle(long ledgerId) { } promise.complete(res); } - }, executor.chooseThread(name)); + }, executor); return promise; }); } @@ -2355,7 +2378,7 @@ public void maybeUpdateCursorBeforeTrimmingConsumedLedger() { log.warn("Cursor: {} does not exist in the managed-ledger.", cursor); } - if (!lastAckedPosition.equals((PositionImpl) cursor.getMarkDeletedPosition())) { + if (!lastAckedPosition.equals(cursor.getMarkDeletedPosition())) { try { log.info("Reset cursor:{} to {} since ledger consumed completely", cursor, lastAckedPosition); onCursorMarkDeletePositionUpdated((ManagedCursorImpl) cursor, lastAckedPosition); @@ -2374,11 +2397,11 @@ private void trimConsumedLedgersInBackground() { @Override public void trimConsumedLedgersInBackground(CompletableFuture promise) { - executor.executeOrdered(name, safeRun(() -> internalTrimConsumedLedgers(promise))); + executor.execute(safeRun(() -> internalTrimConsumedLedgers(promise))); } public void trimConsumedLedgersInBackground(boolean isTruncate, CompletableFuture promise) { - executor.executeOrdered(name, safeRun(() -> internalTrimLedgers(isTruncate, promise))); + executor.execute(safeRun(() -> internalTrimLedgers(isTruncate, promise))); } private void scheduleDeferredTrimming(boolean isTruncate, CompletableFuture promise) { @@ -2387,72 +2410,99 @@ private void scheduleDeferredTrimming(boolean isTruncate, CompletableFuture p } private void maybeOffloadInBackground(CompletableFuture promise) { - if (config.getLedgerOffloader() != null - && config.getLedgerOffloader() != NullLedgerOffloader.INSTANCE - && config.getLedgerOffloader().getOffloadPolicies() != null - && config.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes() != null - && config.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes() >= 0) { - executor.executeOrdered(name, safeRun(() -> maybeOffload(promise))); + if (config.getLedgerOffloader() == null || config.getLedgerOffloader() == NullLedgerOffloader.INSTANCE + || config.getLedgerOffloader().getOffloadPolicies() == null) { + return; + } + + final OffloadPoliciesImpl policies = config.getLedgerOffloader().getOffloadPolicies(); + final long offloadThresholdInBytes = + Optional.ofNullable(policies.getManagedLedgerOffloadThresholdInBytes()).orElse(-1L); + final long offloadThresholdInSeconds = + Optional.ofNullable(policies.getManagedLedgerOffloadThresholdInSeconds()).orElse(-1L); + if (offloadThresholdInBytes >= 0 || offloadThresholdInSeconds >= 0) { + executor.execute(safeRun(() -> maybeOffload(offloadThresholdInBytes, offloadThresholdInSeconds, promise))); } } - private void maybeOffload(CompletableFuture finalPromise) { + private void maybeOffload(long offloadThresholdInBytes, long offloadThresholdInSeconds, + CompletableFuture finalPromise) { + if (config.getLedgerOffloader() == null || config.getLedgerOffloader() == NullLedgerOffloader.INSTANCE + || config.getLedgerOffloader().getOffloadPolicies() == null) { + String msg = String.format("[%s] Nothing to offload due to offloader or offloadPolicies is NULL", name); + finalPromise.completeExceptionally(new IllegalArgumentException(msg)); + return; + } + + if (offloadThresholdInBytes < 0 && offloadThresholdInSeconds < 0) { + String msg = String.format("[%s] Nothing to offload due to [managedLedgerOffloadThresholdInBytes] and " + + "[managedLedgerOffloadThresholdInSeconds] less than 0.", name); + finalPromise.completeExceptionally(new IllegalArgumentException(msg)); + return; + } + if (!offloadMutex.tryLock()) { scheduledExecutor.schedule(safeRun(() -> maybeOffloadInBackground(finalPromise)), - 100, TimeUnit.MILLISECONDS); - } else { - CompletableFuture unlockingPromise = new CompletableFuture<>(); - unlockingPromise.whenComplete((res, ex) -> { - offloadMutex.unlock(); - if (ex != null) { - finalPromise.completeExceptionally(ex); - } else { - finalPromise.complete(res); - } - }); + 100, TimeUnit.MILLISECONDS); + return; + } - if (config.getLedgerOffloader() != null - && config.getLedgerOffloader() != NullLedgerOffloader.INSTANCE - && config.getLedgerOffloader().getOffloadPolicies() != null - && config.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes() - != null) { - long threshold = config.getLedgerOffloader().getOffloadPolicies() - .getManagedLedgerOffloadThresholdInBytes(); - - long sizeSummed = 0; - long alreadyOffloadedSize = 0; - long toOffloadSize = 0; - - ConcurrentLinkedDeque toOffload = new ConcurrentLinkedDeque<>(); - - // go through ledger list from newest to oldest and build a list to offload in oldest to newest order - for (Map.Entry e : ledgers.descendingMap().entrySet()) { - long size = e.getValue().getSize(); - sizeSummed += size; - boolean alreadyOffloaded = e.getValue().hasOffloadContext() - && e.getValue().getOffloadContext().getComplete(); - if (alreadyOffloaded) { - alreadyOffloadedSize += size; - } else if (sizeSummed > threshold) { - toOffloadSize += size; - toOffload.addFirst(e.getValue()); - } - } + CompletableFuture unlockingPromise = new CompletableFuture<>(); + unlockingPromise.whenComplete((res, ex) -> { + offloadMutex.unlock(); + if (ex != null) { + finalPromise.completeExceptionally(ex); + } else { + finalPromise.complete(res); + } + }); - if (toOffload.size() > 0) { - log.info("[{}] Going to automatically offload ledgers {}" - + ", total size = {}, already offloaded = {}, to offload = {}", - name, toOffload.stream().map(LedgerInfo::getLedgerId).collect(Collectors.toList()), - sizeSummed, alreadyOffloadedSize, toOffloadSize); - offloadLoop(unlockingPromise, toOffload, PositionImpl.LATEST, Optional.empty()); - } else { - // offloadLoop will complete immediately with an empty list to offload - log.debug("[{}] Nothing to offload, total size = {}, already offloaded = {}, threshold = {}", - name, sizeSummed, alreadyOffloadedSize, threshold); - unlockingPromise.complete(PositionImpl.LATEST); + long sizeSummed = 0; + long toOffloadSize = 0; + long alreadyOffloadedSize = 0; + ConcurrentLinkedDeque toOffload = new ConcurrentLinkedDeque<>(); + final long offloadTimeThresholdMillis = TimeUnit.SECONDS.toMillis(offloadThresholdInSeconds); + + for (Map.Entry e : ledgers.descendingMap().entrySet()) { + final LedgerInfo info = e.getValue(); + // Skip current active ledger, an active ledger can't be offloaded. + // Can't `info.getLedgerId() == currentLedger.getId()` here, trigger offloading is before create ledger. + if (info.getTimestamp() == 0L) { + continue; + } + + final long size = info.getSize(); + final long timestamp = info.getTimestamp(); + final long now = System.currentTimeMillis(); + sizeSummed += size; + + final boolean alreadyOffloaded = info.hasOffloadContext() && info.getOffloadContext().getComplete(); + if (alreadyOffloaded) { + alreadyOffloadedSize += size; + } else { + if ((offloadThresholdInBytes >= 0 && sizeSummed > offloadThresholdInBytes) + || (offloadTimeThresholdMillis >= 0 && now - timestamp >= offloadTimeThresholdMillis)) { + toOffloadSize += size; + toOffload.addFirst(info); } } } + + if (toOffload.size() > 0) { + log.info("[{}] Going to automatically offload ledgers {}" + + ", total size = {}, already offloaded = {}, to offload = {}", + name, toOffload.stream().map(LedgerInfo::getLedgerId).collect(Collectors.toList()), + sizeSummed, alreadyOffloadedSize, toOffloadSize); + offloadLoop(unlockingPromise, toOffload, PositionImpl.LATEST, Optional.empty()); + } else { + // offloadLoop will complete immediately with an empty list to offload + log.debug("[{}] Nothing to offload, total size = {}, already offloaded = {}, " + + "threshold = [managedLedgerOffloadThresholdInBytes:{}, " + + "managedLedgerOffloadThresholdInSeconds:{}]", + name, sizeSummed, alreadyOffloadedSize, offloadThresholdInBytes, + TimeUnit.MILLISECONDS.toSeconds(offloadTimeThresholdMillis)); + unlockingPromise.complete(PositionImpl.LATEST); + } } private boolean hasLedgerRetentionExpired(long ledgerTimestamp) { @@ -2485,7 +2535,7 @@ void internalTrimConsumedLedgers(CompletableFuture promise) { void internalTrimLedgers(boolean isTruncate, CompletableFuture promise) { if (!factory.isMetadataServiceAvailable()) { // Defer trimming of ledger if we cannot connect to metadata service - promise.complete(null); + promise.completeExceptionally(new MetaStoreException("Metadata service is not available")); return; } @@ -2495,8 +2545,8 @@ void internalTrimLedgers(boolean isTruncate, CompletableFuture promise) { return; } - List ledgersToDelete = new ArrayList(); - List offloadedLedgersToDelete = new ArrayList(); + List ledgersToDelete = new ArrayList<>(); + List offloadedLedgersToDelete = new ArrayList<>(); Optional optionalOffloadPolicies = Optional.ofNullable(config.getLedgerOffloader() != null && config.getLedgerOffloader() != NullLedgerOffloader.INSTANCE ? config.getLedgerOffloader().getOffloadPolicies() @@ -2513,6 +2563,7 @@ void internalTrimLedgers(boolean isTruncate, CompletableFuture promise) { promise.completeExceptionally(new ManagedLedgerAlreadyClosedException("Can't trim closed ledger")); return; } + // Allow for FencedForDeletion if (currentState == State.Fenced) { log.debug("[{}] Ignoring trimming request since the managed ledger was already fenced", name); trimmerMutex.unlock(); @@ -2623,23 +2674,8 @@ void internalTrimLedgers(boolean isTruncate, CompletableFuture promise) { return; } - PositionImpl currentLastConfirmedEntry = lastConfirmedEntry; - // Update metadata - for (LedgerInfo ls : ledgersToDelete) { - if (currentLastConfirmedEntry != null && ls.getLedgerId() == currentLastConfirmedEntry.getLedgerId()) { - // this info is relevant because the lastMessageId won't be available anymore - log.info("[{}] Ledger {} contains the current last confirmed entry {}, and it is going to be " - + "deleted", name, ls.getLedgerId(), currentLastConfirmedEntry); - } - - invalidateReadHandle(ls.getLedgerId()); - - ledgers.remove(ls.getLedgerId()); - NUMBER_OF_ENTRIES_UPDATER.addAndGet(this, -ls.getEntries()); - TOTAL_SIZE_UPDATER.addAndGet(this, -ls.getSize()); + doDeleteLedgers(ledgersToDelete); - entryCache.invalidateAllEntries(ls.getLedgerId()); - } for (LedgerInfo ls : offloadedLedgersToDelete) { LedgerInfo.Builder newInfoBuilder = ls.toBuilder(); newInfoBuilder.getOffloadContextBuilder().setBookkeeperDeleted(true); @@ -2689,6 +2725,26 @@ public void operationFailed(MetaStoreException e) { } } + protected void doDeleteLedgers(List ledgersToDelete) { + PositionImpl currentLastConfirmedEntry = lastConfirmedEntry; + // Update metadata + for (LedgerInfo ls : ledgersToDelete) { + if (currentLastConfirmedEntry != null && ls.getLedgerId() == currentLastConfirmedEntry.getLedgerId()) { + // this info is relevant because the lastMessageId won't be available anymore + log.info("[{}] Ledger {} contains the current last confirmed entry {}, and it is going to be " + + "deleted", name, ls.getLedgerId(), currentLastConfirmedEntry); + } + + invalidateReadHandle(ls.getLedgerId()); + + ledgers.remove(ls.getLedgerId()); + NUMBER_OF_ENTRIES_UPDATER.addAndGet(this, -ls.getEntries()); + TOTAL_SIZE_UPDATER.addAndGet(this, -ls.getSize()); + + entryCache.invalidateAllEntries(ls.getLedgerId()); + } + } + /** * Non-durable cursors have to be moved forward when data is trimmed since they are not retain that data. * This is to make sure that the `consumedEntries` counter is correctly updated with the number of skipped @@ -2768,11 +2824,30 @@ public void deleteLedgerFailed(ManagedLedgerException e, Object ctx) { @Override public void asyncDelete(final DeleteLedgerCallback callback, final Object ctx) { + // Delete the managed ledger without closing, since we are not interested in gracefully closing cursors and // ledgers - setFenced(); + setFencedForDeletion(); cancelScheduledTasks(); + // Truncate to ensure the offloaded data is not orphaned. + // Also ensures the BK ledgers are deleted and not just scheduled for deletion + CompletableFuture truncateFuture = asyncTruncate(); + truncateFuture.whenComplete((ignore, exc) -> { + if (exc != null) { + log.error("[{}] Error truncating ledger for deletion", name, exc); + callback.deleteLedgerFailed(exc instanceof ManagedLedgerException + ? (ManagedLedgerException) exc : new ManagedLedgerException(exc), + ctx); + } else { + asyncDeleteInternal(callback, ctx); + } + }); + + } + + private void asyncDeleteInternal(final DeleteLedgerCallback callback, final Object ctx) { + List cursors = Lists.newArrayList(this.cursors); if (cursors.isEmpty()) { // No cursors to delete, proceed with next step @@ -2830,10 +2905,9 @@ private void asyncDeleteLedger(long ledgerId, LedgerInfo info) { if (info.getOffloadContext().hasUidMsb()) { UUID uuid = new UUID(info.getOffloadContext().getUidMsb(), info.getOffloadContext().getUidLsb()); - cleanupOffloaded(ledgerId, uuid, - OffloadUtils.getOffloadDriverName(info, config.getLedgerOffloader().getOffloadDriverName()), + OffloadUtils.cleanupOffloaded(ledgerId, uuid, config, OffloadUtils.getOffloadDriverMetadata(info, config.getLedgerOffloader().getOffloadDriverMetadata()), - "Trimming"); + "Trimming", name, scheduledExecutor); } } @@ -2888,7 +2962,7 @@ private void deleteAllLedgers(DeleteLedgerCallback callback, Object ctx) { default: // Handle error log.warn("[{}] Failed to delete ledger {} -- {}", name, ls.getLedgerId(), - BKException.getMessage(rc)); + BKException.getMessage(rc) + " code " + rc); int toDelete = ledgersToDelete.get(); if (toDelete != -1 && ledgersToDelete.compareAndSet(toDelete, -1)) { // Trigger callback only once @@ -2988,7 +3062,7 @@ public void asyncOffloadPrefix(Position pos, OffloadCallback callback, Object ct long current = ledgers.lastKey(); // the first ledger which will not be offloaded. Defaults to current, - // in the case that the whole headmap is offloaded. Otherwise it will + // in the case that the whole headmap is offloaded. Otherwise, it will // be set as we iterate through the headmap values long firstLedgerRetained = current; for (LedgerInfo ls : ledgers.headMap(current).values()) { @@ -3039,7 +3113,7 @@ private void offloadLoop(CompletableFuture promise, Queue promise, Queue prepareLedgerInfoForOffloaded(long ledgerId, UUI oldInfo.getOffloadContext().getUidLsb()); log.info("[{}] Found previous offload attempt for ledger {}, uuid {}" + ", cleaning up", name, ledgerId, uuid); - cleanupOffloaded( + OffloadUtils.cleanupOffloaded( ledgerId, oldUuid, - OffloadUtils.getOffloadDriverName(oldInfo, - config.getLedgerOffloader().getOffloadDriverName()), + config, OffloadUtils.getOffloadDriverMetadata(oldInfo, config.getLedgerOffloader().getOffloadDriverMetadata()), - "Previous failed offload"); + "Previous failed offload", + name, + scheduledExecutor); } LedgerInfo.Builder builder = oldInfo.toBuilder(); builder.getOffloadContextBuilder() @@ -3276,28 +3350,6 @@ private CompletableFuture completeLedgerInfoForOffloaded(long ledgerId, UU }); } - private void cleanupOffloaded(long ledgerId, UUID uuid, String offloadDriverName, /* - * TODO: use driver name to - * identify offloader - */ - Map offloadDriverMetadata, String cleanupReason) { - log.info("[{}] Cleanup offload for ledgerId {} uuid {} because of the reason {}.", - name, ledgerId, uuid.toString(), cleanupReason); - Map metadataMap = new HashMap(); - metadataMap.putAll(offloadDriverMetadata); - metadataMap.put("ManagedLedgerName", name); - - Retries.run(Backoff.exponentialJittered(TimeUnit.SECONDS.toMillis(1), TimeUnit.SECONDS.toHours(1)).limit(10), - Retries.NonFatalPredicate, - () -> config.getLedgerOffloader().deleteOffloaded(ledgerId, uuid, metadataMap), - scheduledExecutor, name).whenComplete((ignored, exception) -> { - if (exception != null) { - log.warn("[{}] Error cleaning up offload for {}, (cleanup reason: {})", - name, ledgerId, cleanupReason, exception); - } - }); - } - /** * Get the number of entries between a contiguous range of two positions. * @@ -3349,7 +3401,7 @@ long getNumberOfEntries(Range range) { * @param n * number of entries to skip ahead * @param startRange - * specifies whether or not to include the start position in calculating the distance + * specifies whether to include the start position in calculating the distance * @return the new position that is n entries ahead */ public PositionImpl getPositionAfterN(final PositionImpl startPosition, long n, PositionBound startRange) { @@ -3473,10 +3525,10 @@ public boolean isValidPosition(PositionImpl position) { if (ls == null) { if (position.getLedgerId() < last.getLedgerId()) { - // Pointing to a non existing ledger that is older than the current ledger is invalid + // Pointing to a non-existing ledger that is older than the current ledger is invalid return false; } else { - // Pointing to a non existing ledger is only legitimate if the ledger was empty + // Pointing to a non-existing ledger is only legitimate if the ledger was empty return position.getEntryId() == 0; } } @@ -3652,7 +3704,7 @@ public NavigableMap getLedgersInfo() { return ledgers; } - private ManagedLedgerInfo getManagedLedgerInfo() { + protected ManagedLedgerInfo getManagedLedgerInfo() { return buildManagedLedgerInfo(ledgers); } @@ -3688,7 +3740,7 @@ private ManagedLedgerInfo buildManagedLedgerInfo(ManagedLedgerInfo.Builder mlInf * @throws ManagedLedgerException */ private void checkFenced() throws ManagedLedgerException { - if (STATE_UPDATER.get(this) == State.Fenced) { + if (STATE_UPDATER.get(this).isFenced()) { log.error("[{}] Attempted to use a fenced managed ledger", name); throw new ManagedLedgerFencedException(); } @@ -3705,6 +3757,11 @@ synchronized void setFenced() { STATE_UPDATER.set(this, State.Fenced); } + synchronized void setFencedForDeletion() { + log.info("{} Moving to FencedForDeletion state", name); + STATE_UPDATER.set(this, State.FencedForDeletion); + } + MetaStore getStore() { return store; } @@ -3814,7 +3871,7 @@ public static ManagedLedgerException createManagedLedgerException(int bkErrorCod return new NonRecoverableLedgerException(BKException.getMessage(bkErrorCode)); } } else { - return new ManagedLedgerException(BKException.getMessage(bkErrorCode)); + return new ManagedLedgerException(BKException.getMessage(bkErrorCode) + " error code: " + bkErrorCode); } } @@ -3928,7 +3985,7 @@ private void scheduleTimeoutTask() { private void checkTimeouts() { final State state = STATE_UPDATER.get(this); if (state == State.Closed - || state == State.Fenced) { + || state.isFenced()) { return; } checkAddTimeout(); @@ -4235,7 +4292,7 @@ public CompletableFuture> getEnsemblesAsync(long ledgerId) { }); } - private void updateLastLedgerCreatedTimeAndScheduleRolloverTask() { + protected void updateLastLedgerCreatedTimeAndScheduleRolloverTask() { this.lastLedgerCreatedTimestamp = clock.millis(); if (config.getMaximumRolloverTimeMs() > 0) { if (checkLedgerRollTask != null && !checkLedgerRollTask.isDone()) { diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java index 42e79167f9271..dad101c9b72d1 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java index e0362205c6d9e..a271d439e0609 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java index 3d60066782af2..21e12d81a727d 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -43,6 +43,10 @@ interface MetaStoreCallback { void operationFailed(MetaStoreException e); } + interface UpdateCallback { + void onUpdate(T result, Stat stat); + } + /** * Get the metadata used by the ManagedLedger. * @@ -71,6 +75,19 @@ default void getManagedLedgerInfo(String ledgerName, boolean createIfMissing, void getManagedLedgerInfo(String ledgerName, boolean createIfMissing, Map properties, MetaStoreCallback callback); + /** + * Watch the metadata used by the ManagedLedger. + * @param ledgerName + * @param callback + */ + void watchManagedLedgerInfo(String ledgerName, UpdateCallback callback); + + /** + * Unwatch the metadata changes for ledgerName. + * @param ledgerName + */ + void unwatchManagedLedgerInfo(String ledgerName); + /** * * @param ledgerName diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java index 2949902ac353f..bcb73553324dd 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -30,7 +30,9 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.RejectedExecutionException; +import java.util.function.Consumer; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.bookkeeper.mledger.ManagedLedgerException; @@ -47,10 +49,12 @@ import org.apache.pulsar.common.compression.CompressionCodecProvider; import org.apache.pulsar.metadata.api.MetadataStore; import org.apache.pulsar.metadata.api.MetadataStoreException; +import org.apache.pulsar.metadata.api.Notification; +import org.apache.pulsar.metadata.api.NotificationType; import org.apache.pulsar.metadata.api.Stat; @Slf4j -public class MetaStoreImpl implements MetaStore { +public class MetaStoreImpl implements MetaStore, Consumer { private static final String BASE_NODE = "/managed-ledgers"; private static final String PREFIX = BASE_NODE + "/"; @@ -62,11 +66,17 @@ public class MetaStoreImpl implements MetaStore { private final CompressionType ledgerInfoCompressionType; private final CompressionType cursorInfoCompressionType; + private final Map> managedLedgerInfoUpdateCallbackMap; + public MetaStoreImpl(MetadataStore store, OrderedExecutor executor) { this.store = store; this.executor = executor; this.ledgerInfoCompressionType = CompressionType.NONE; this.cursorInfoCompressionType = CompressionType.NONE; + managedLedgerInfoUpdateCallbackMap = new ConcurrentHashMap<>(); + if (store != null) { + store.registerListener(this); + } } public MetaStoreImpl(MetadataStore store, OrderedExecutor executor, String ledgerInfoCompressionType, @@ -75,6 +85,10 @@ public MetaStoreImpl(MetadataStore store, OrderedExecutor executor, String ledge this.executor = executor; this.ledgerInfoCompressionType = parseCompressionType(ledgerInfoCompressionType); this.cursorInfoCompressionType = parseCompressionType(cursorInfoCompressionType); + managedLedgerInfoUpdateCallbackMap = new ConcurrentHashMap<>(); + if (store != null) { + store.registerListener(this); + } } private CompressionType parseCompressionType(String value) { @@ -327,6 +341,43 @@ public CompletableFuture asyncExists(String path) { return store.exists(PREFIX + path); } + @Override + public void watchManagedLedgerInfo(String ledgerName, UpdateCallback callback) { + managedLedgerInfoUpdateCallbackMap.put(PREFIX + ledgerName, callback); + } + + @Override + public void unwatchManagedLedgerInfo(String ledgerName) { + managedLedgerInfoUpdateCallbackMap.remove(PREFIX + ledgerName); + } + + @Override + public void accept(Notification notification) { + if (!notification.getPath().startsWith(PREFIX) || notification.getType() != NotificationType.Modified) { + return; + } + UpdateCallback callback = managedLedgerInfoUpdateCallbackMap.get(notification.getPath()); + if (callback == null) { + return; + } + String ledgerName = notification.getPath().substring(PREFIX.length()); + store.get(notification.getPath()).thenAcceptAsync(optResult -> { + if (optResult.isPresent()) { + ManagedLedgerInfo info; + try { + info = parseManagedLedgerInfo(optResult.get().getValue()); + info = updateMLInfoTimestamp(info); + callback.onUpdate(info, optResult.get().getStat()); + } catch (InvalidProtocolBufferException e) { + log.error("[{}] Error when parseManagedLedgerInfo", ledgerName, e); + } + } + }, executor.chooseThread(ledgerName)).exceptionally(ex -> { + log.error("[{}] Error when read ManagedLedgerInfo", ledgerName, ex); + return null; + }); + } + // // update timestamp if missing or 0 // 3 cases - timestamp does not exist for ledgers serialized before diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java index 918cc22978b25..5ac8260c7920c 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java index 981bb55c2eb5b..0e5e7cf4b5b55 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OffloadSegmentInfoImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OffloadSegmentInfoImpl.java index 8716d5a4dd5f8..dd6353a36e874 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OffloadSegmentInfoImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OffloadSegmentInfoImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java index c25fa4f4d5163..14135b037920a 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -33,6 +33,7 @@ import org.apache.bookkeeper.client.LedgerHandle; import org.apache.bookkeeper.mledger.AsyncCallbacks.AddEntryCallback; import org.apache.bookkeeper.mledger.ManagedLedgerException; +import org.apache.bookkeeper.mledger.Position; import org.apache.bookkeeper.mledger.intercept.ManagedLedgerInterceptor; import org.apache.bookkeeper.mledger.util.SafeRun; import org.apache.bookkeeper.util.SafeRunnable; @@ -143,6 +144,17 @@ public void initiate() { } } + public void initiateShadowWrite() { + if (STATE_UPDATER.compareAndSet(OpAddEntry.this, State.OPEN, State.INITIATED)) { + addOpCount = ManagedLedgerImpl.ADD_OP_COUNT_UPDATER.incrementAndGet(ml); + lastInitTime = System.nanoTime(); + //Use entryId in PublishContext and call addComplete directly. + this.addComplete(BKException.Code.OK, ledger, ((Position) ctx).getEntryId(), addOpCount); + } else { + log.warn("[{}] initiate with unexpected state {}, expect OPEN state.", ml.getName(), state); + } + } + public void failed(ManagedLedgerException e) { AddEntryCallback cb = callbackUpdater.getAndSet(this, null); if (cb != null) { @@ -157,7 +169,6 @@ public void failed(ManagedLedgerException e) { @Override public void addComplete(int rc, final LedgerHandle lh, long entryId, Object ctx) { - if (!STATE_UPDATER.compareAndSet(OpAddEntry.this, State.INITIATED, State.COMPLETED)) { log.warn("[{}] The add op is terminal legacy callback for entry {}-{} adding.", ml.getName(), lh.getId(), entryId); @@ -165,11 +176,14 @@ public void addComplete(int rc, final LedgerHandle lh, long entryId, Object ctx) return; } - if (ledger.getId() != lh.getId()) { - log.warn("[{}] ledgerId {} doesn't match with acked ledgerId {}", ml.getName(), ledger.getId(), lh.getId()); + if (ledger != null && lh != null) { + if (ledger.getId() != lh.getId()) { + log.warn("[{}] ledgerId {} doesn't match with acked ledgerId {}", ml.getName(), ledger.getId(), + lh.getId()); + } + checkArgument(ledger.getId() == lh.getId(), "ledgerId %s doesn't match with acked ledgerId %s", + ledger.getId(), lh.getId()); } - checkArgument(ledger.getId() == lh.getId(), "ledgerId %s doesn't match with acked ledgerId %s", ledger.getId(), - lh.getId()); if (!checkAndCompleteOp(ctx)) { // means callback might have been completed by different thread (timeout task thread).. so do nothing @@ -179,14 +193,14 @@ public void addComplete(int rc, final LedgerHandle lh, long entryId, Object ctx) this.entryId = entryId; if (log.isDebugEnabled()) { log.debug("[{}] [{}] write-complete: ledger-id={} entry-id={} size={} rc={}", this, ml.getName(), - lh.getId(), entryId, dataLength, rc); + lh == null ? -1 : lh.getId(), entryId, dataLength, rc); } if (rc != BKException.Code.OK) { handleAddFailure(lh); } else { // Trigger addComplete callback in a thread hashed on the managed ledger name - ml.getExecutor().executeOrdered(ml.getName(), this); + ml.getExecutor().execute(this); } } @@ -208,23 +222,27 @@ public void safeRun() { ManagedLedgerImpl.NUMBER_OF_ENTRIES_UPDATER.incrementAndGet(ml); ManagedLedgerImpl.TOTAL_SIZE_UPDATER.addAndGet(ml, dataLength); + + long ledgerId = ledger != null ? ledger.getId() : ((Position) ctx).getLedgerId(); if (ml.hasActiveCursors()) { // Avoid caching entries if no cursor has been created - EntryImpl entry = EntryImpl.create(ledger.getId(), entryId, data); + EntryImpl entry = EntryImpl.create(ledgerId, entryId, data); // EntryCache.insert: duplicates entry by allocating new entry and data. so, recycle entry after calling // insert ml.entryCache.insert(entry); entry.release(); } - PositionImpl lastEntry = PositionImpl.get(ledger.getId(), entryId); + PositionImpl lastEntry = PositionImpl.get(ledgerId, entryId); ManagedLedgerImpl.ENTRIES_ADDED_COUNTER_UPDATER.incrementAndGet(ml); ml.lastConfirmedEntry = lastEntry; if (closeWhenDone) { - log.info("[{}] Closing ledger {} for being full", ml.getName(), ledger.getId()); + log.info("[{}] Closing ledger {} for being full", ml.getName(), ledgerId); // `data` will be released in `closeComplete` - ledger.asyncClose(this, ctx); + if (ledger != null) { + ledger.asyncClose(this, ctx); + } } else { updateLatency(); AddEntryCallback cb = callbackUpdater.getAndSet(this, null); @@ -304,7 +322,7 @@ void handleAddFailure(final LedgerHandle lh) { ManagedLedgerImpl finalMl = this.ml; finalMl.mbean.recordAddEntryError(); - finalMl.getExecutor().executeOrdered(finalMl.getName(), SafeRun.safeRun(() -> { + finalMl.getExecutor().execute(SafeRun.safeRun(() -> { // Force the creation of a new ledger. Doing it in a background thread to avoid acquiring ML lock // from a BK callback. finalMl.ledgerClosed(lh); diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java index df925871db6df..900af9322c791 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpReadEntry.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpReadEntry.java index b90527834398a..86290d8bc8f5f 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpReadEntry.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpReadEntry.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -156,7 +156,7 @@ void checkReadCompletion() { cursor.readOperationCompleted(); } finally { - cursor.ledger.getExecutor().executeOrdered(cursor.ledger.getName(), safeRun(() -> { + cursor.ledger.getExecutor().execute(safeRun(() -> { callback.readEntriesComplete(entries, ctx); recycle(); })); @@ -168,10 +168,6 @@ public int getNumberOfEntriesToRead() { return count - entries.size(); } - public boolean isSlowestReader() { - return cursor.ledger.getSlowestConsumer() == cursor; - } - private final Handle recyclerHandle; private OpReadEntry(Handle recyclerHandle) { diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java index 9e56711b38667..9f1cd310f92e8 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImpl.java index 267c886e9ff2b..ee179b5d059c8 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclable.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclable.java index d2114ac7eb200..eb2b33e858d63 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclable.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclable.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java index e39572698461e..274c625e7459e 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorImpl.java index 8c20e0d560ee7..9102339b2904e 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java index 214c3afe1bcdb..944674f6862c2 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -45,8 +45,8 @@ public ReadOnlyManagedLedgerImpl(ManagedLedgerFactoryImpl factory, BookKeeper bo super(factory, bookKeeper, store, config, scheduledExecutor, name); } - CompletableFuture initializeAndCreateCursor(PositionImpl startPosition) { - CompletableFuture future = new CompletableFuture<>(); + CompletableFuture initialize() { + CompletableFuture future = new CompletableFuture<>(); // Fetch the list of existing ledgers in the managed ledger store.getManagedLedgerInfo(name, false, new MetaStoreCallback() { @@ -72,7 +72,7 @@ public void operationComplete(ManagedLedgerInfo mlInfo, Stat stat) { .setTimestamp(clock.millis()).build(); ledgers.put(lastLedgerId, info); - future.complete(createReadOnlyCursor(startPosition)); + future.complete(null); }).exceptionally(ex -> { if (ex instanceof CompletionException && ex.getCause() instanceof IllegalArgumentException) { @@ -80,7 +80,7 @@ public void operationComplete(ManagedLedgerInfo mlInfo, Stat stat) { LedgerInfo info = LedgerInfo.newBuilder().setLedgerId(lastLedgerId) .setEntries(0).setSize(0).setTimestamp(clock.millis()).build(); ledgers.put(lastLedgerId, info); - future.complete(createReadOnlyCursor(startPosition)); + future.complete(null); } else { future.completeExceptionally(new ManagedLedgerException(ex)); } @@ -93,7 +93,7 @@ public void operationComplete(ManagedLedgerInfo mlInfo, Stat stat) { LedgerInfo info = LedgerInfo.newBuilder().setLedgerId(lastLedgerId).setEntries(0) .setSize(0).setTimestamp(clock.millis()).build(); ledgers.put(lastLedgerId, info); - future.complete(createReadOnlyCursor(startPosition)); + future.complete(null); } else { future.completeExceptionally(new ManagedLedgerException(ex)); } @@ -101,7 +101,7 @@ public void operationComplete(ManagedLedgerInfo mlInfo, Stat stat) { }); } else { // The read-only managed ledger is ready to use - future.complete(createReadOnlyCursor(startPosition)); + future.complete(null); } } @@ -118,7 +118,7 @@ public void operationFailed(MetaStoreException e) { return future; } - private ReadOnlyCursor createReadOnlyCursor(PositionImpl startPosition) { + ReadOnlyCursor createReadOnlyCursor(PositionImpl startPosition) { if (ledgers.isEmpty()) { lastConfirmedEntry = PositionImpl.EARLIEST; } else if (ledgers.lastEntry().getValue().getEntries() > 0) { diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImpl.java index 346780a228349..39e7b6b42ec0b 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,43 +16,390 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.bookkeeper.mledger.impl; +import static org.apache.bookkeeper.mledger.util.Errors.isNoSuchLedgerExistsException; +import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; import java.util.function.Supplier; import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.client.AsyncCallback; +import org.apache.bookkeeper.client.BKException; import org.apache.bookkeeper.client.BookKeeper; import org.apache.bookkeeper.common.util.OrderedScheduler; +import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.ManagedLedgerConfig; -import org.apache.pulsar.common.naming.TopicName; +import org.apache.bookkeeper.mledger.ManagedLedgerException; +import org.apache.bookkeeper.mledger.Position; +import org.apache.bookkeeper.mledger.proto.MLDataFormats; +import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; +import org.apache.pulsar.metadata.api.Stat; /** - * Working in progress until PIP-180 is finished. - * Currently, it works nothing different with ManagedLedgerImpl. + * Detailed design can be found in PIP-180. */ @Slf4j public class ShadowManagedLedgerImpl extends ManagedLedgerImpl { - - private final TopicName shadowSource; private final String sourceMLName; + private volatile Stat sourceLedgersStat; public ShadowManagedLedgerImpl(ManagedLedgerFactoryImpl factory, BookKeeper bookKeeper, MetaStore store, ManagedLedgerConfig config, OrderedScheduler scheduledExecutor, String name, final Supplier mlOwnershipChecker) { super(factory, bookKeeper, store, config, scheduledExecutor, name, mlOwnershipChecker); - this.shadowSource = TopicName.get(config.getShadowSource()); - this.sourceMLName = shadowSource.getPersistenceNamingEncoding(); + this.sourceMLName = config.getShadowSourceName(); } + /** + * ShadowManagedLedger init steps: + * 1. this.initialize : read source managedLedgerInfo + * 2. super.initialize : read its own read source managedLedgerInfo + * 3. this.initializeBookKeeper + * 4. super.initializeCursors + */ @Override synchronized void initialize(ManagedLedgerInitializeLedgerCallback callback, Object ctx) { - // TODO: ShadowManagedLedger has different initialize process from normal ManagedLedger, - // which is complicated and will be implemented in the next PRs. - super.initialize(callback, ctx); + log.info("Opening shadow managed ledger {} with source={}", name, sourceMLName); + executor.execute(safeRun(() -> doInitialize(callback, ctx))); } - public TopicName getShadowSource() { - return shadowSource; + private void doInitialize(ManagedLedgerInitializeLedgerCallback callback, Object ctx) { + // Fetch the list of existing ledgers in the source managed ledger + store.watchManagedLedgerInfo(sourceMLName, (managedLedgerInfo, stat) -> + executor.execute(safeRun(() -> processSourceManagedLedgerInfo(managedLedgerInfo, stat))) + ); + store.getManagedLedgerInfo(sourceMLName, false, null, new MetaStore.MetaStoreCallback<>() { + @Override + public void operationComplete(MLDataFormats.ManagedLedgerInfo mlInfo, Stat stat) { + if (log.isDebugEnabled()) { + log.debug("[{}][{}] Source ML info:{}", name, sourceMLName, mlInfo); + } + if (sourceLedgersStat != null && sourceLedgersStat.getVersion() >= stat.getVersion()) { + log.warn("Newer version of mlInfo is already processed. Previous stat={}, current stat={}", + sourceLedgersStat, stat); + return; + } + sourceLedgersStat = stat; + if (mlInfo.getLedgerInfoCount() == 0) { + // Small chance here, since shadow topic is created after source topic exists. + log.warn("[{}] Source topic ledger list is empty! source={},mlInfo={},stat={}", name, sourceMLName, + mlInfo, stat); + ShadowManagedLedgerImpl.super.initialize(callback, ctx); + return; + } + + if (mlInfo.hasTerminatedPosition()) { + lastConfirmedEntry = new PositionImpl(mlInfo.getTerminatedPosition()); + log.info("[{}][{}] Recovering managed ledger terminated at {}", name, sourceMLName, + lastConfirmedEntry); + } + + for (LedgerInfo ls : mlInfo.getLedgerInfoList()) { + ledgers.put(ls.getLedgerId(), ls); + } + + final long lastLedgerId = ledgers.lastKey(); + mbean.startDataLedgerOpenOp(); + AsyncCallback.OpenCallback opencb = (rc, lh, ctx1) -> executor.execute(safeRun(() -> { + mbean.endDataLedgerOpenOp(); + if (log.isDebugEnabled()) { + log.debug("[{}] Opened source ledger {}", name, lastLedgerId); + } + if (rc == BKException.Code.OK) { + LedgerInfo info = + LedgerInfo.newBuilder() + .setLedgerId(lastLedgerId) + .setEntries(lh.getLastAddConfirmed() + 1) + .setSize(lh.getLength()) + .setTimestamp(clock.millis()).build(); + ledgers.put(lastLedgerId, info); + + //Always consider the last ledger is opened in source. + STATE_UPDATER.set(ShadowManagedLedgerImpl.this, State.LedgerOpened); + currentLedger = lh; + + if (managedLedgerInterceptor != null) { + managedLedgerInterceptor.onManagedLedgerLastLedgerInitialize(name, lh) + .thenRun(() -> ShadowManagedLedgerImpl.super.initialize(callback, ctx)) + .exceptionally(ex -> { + callback.initializeFailed( + new ManagedLedgerException.ManagedLedgerInterceptException( + ex.getCause())); + return null; + }); + } else { + ShadowManagedLedgerImpl.super.initialize(callback, ctx); + } + } else if (isNoSuchLedgerExistsException(rc)) { + log.warn("[{}] Source ledger not found: {}", name, lastLedgerId); + ledgers.remove(lastLedgerId); + ShadowManagedLedgerImpl.super.initialize(callback, ctx); + } else { + log.error("[{}] Failed to open source ledger {}: {}", name, lastLedgerId, + BKException.getMessage(rc)); + callback.initializeFailed(createManagedLedgerException(rc)); + } + })); + //open ledger in readonly mode. + bookKeeper.asyncOpenLedgerNoRecovery(lastLedgerId, digestType, config.getPassword(), opencb, null); + + } + + @Override + public void operationFailed(ManagedLedgerException.MetaStoreException e) { + if (e instanceof ManagedLedgerException.MetadataNotFoundException) { + callback.initializeFailed(new ManagedLedgerException.ManagedLedgerNotFoundException(e)); + } else { + callback.initializeFailed(new ManagedLedgerException(e)); + } + } + }); + } + + @Override + protected boolean isLedgersReadonly() { + return true; + } + + @Override + protected synchronized void initializeBookKeeper(ManagedLedgerInitializeLedgerCallback callback) { + if (log.isDebugEnabled()) { + log.debug("[{}] initializing bookkeeper for shadowManagedLedger; ledgers {}", name, ledgers); + } + + // Calculate total entries and size + Iterator iterator = ledgers.values().iterator(); + while (iterator.hasNext()) { + LedgerInfo li = iterator.next(); + if (li.getEntries() > 0) { + NUMBER_OF_ENTRIES_UPDATER.addAndGet(this, li.getEntries()); + TOTAL_SIZE_UPDATER.addAndGet(this, li.getSize()); + } else if (li.getLedgerId() != currentLedger.getId()) { + //do not remove the last empty ledger. + iterator.remove(); + } + } + + initLastConfirmedEntry(); + // Save it back to ensure all nodes exist and properties are persisted. + store.asyncUpdateLedgerIds(name, getManagedLedgerInfo(), ledgersStat, new MetaStore.MetaStoreCallback<>() { + @Override + public void operationComplete(Void result, Stat stat) { + ledgersStat = stat; + initializeCursors(callback); + } + + @Override + public void operationFailed(ManagedLedgerException.MetaStoreException e) { + handleBadVersion(e); + callback.initializeFailed(new ManagedLedgerException(e)); + } + }); + } + + private void initLastConfirmedEntry() { + if (currentLedger == null) { + return; + } + lastConfirmedEntry = new PositionImpl(currentLedger.getId(), currentLedger.getLastAddConfirmed()); + // bypass empty ledgers, find last ledger with Message if possible. + while (lastConfirmedEntry.getEntryId() == -1) { + Map.Entry formerLedger = ledgers.lowerEntry(lastConfirmedEntry.getLedgerId()); + if (formerLedger != null) { + LedgerInfo ledgerInfo = formerLedger.getValue(); + lastConfirmedEntry = PositionImpl.get(ledgerInfo.getLedgerId(), ledgerInfo.getEntries() - 1); + } else { + break; + } + } + } + + @Override + protected synchronized void internalAsyncAddEntry(OpAddEntry addOperation) { + if (!beforeAddEntry(addOperation)) { + return; + } + if (state != State.LedgerOpened) { + addOperation.failed(new ManagedLedgerException("Managed ledger is not opened")); + return; + } + + if (addOperation.getCtx() == null || !(addOperation.getCtx() instanceof Position position)) { + addOperation.failed(new ManagedLedgerException("Illegal addOperation context object.")); + return; + } + + if (log.isDebugEnabled()) { + log.debug("[{}] Add entry into shadow ledger lh={} entries={}, pos=({},{})", + name, currentLedger.getId(), currentLedgerEntries, position.getLedgerId(), position.getEntryId()); + } + pendingAddEntries.add(addOperation); + if (position.getLedgerId() <= currentLedger.getId()) { + // Write into lastLedger + if (position.getLedgerId() == currentLedger.getId()) { + addOperation.setLedger(currentLedger); + } + currentLedgerEntries = position.getEntryId(); + currentLedgerSize += addOperation.data.readableBytes(); + addOperation.initiateShadowWrite(); + } // for addOperation with ledgerId > currentLedger, will be processed in `updateLedgersIdsComplete` + lastAddEntryTimeMs = System.currentTimeMillis(); + } + + /** + * terminate is not allowed on shadow topic. + * @param callback + * @param ctx + */ + @Override + public synchronized void asyncTerminate(AsyncCallbacks.TerminateCallback callback, Object ctx) { + callback.terminateFailed(new ManagedLedgerException("Terminate is not allowed on shadow topic."), ctx); + } + + /** + * Handle source ManagedLedgerInfo updates. + * Update types: + * 1. new ledgers. + * 2. old ledgers deleted. + * 3. old ledger offload info updated (including ledger deleted from bookie by offloader) + */ + private synchronized void processSourceManagedLedgerInfo(MLDataFormats.ManagedLedgerInfo mlInfo, Stat stat) { + + if (log.isDebugEnabled()) { + log.debug("[{}][{}] new SourceManagedLedgerInfo:{}, prevStat={},stat={}", name, sourceMLName, mlInfo, + sourceLedgersStat, stat); + } + if (sourceLedgersStat != null && sourceLedgersStat.getVersion() >= stat.getVersion()) { + log.warn("Newer version of mlInfo is already processed. Previous stat={}, current stat={}", + sourceLedgersStat, stat); + return; + } + sourceLedgersStat = stat; + + if (mlInfo.hasTerminatedPosition()) { + lastConfirmedEntry = new PositionImpl(mlInfo.getTerminatedPosition()); + log.info("[{}][{}] Process managed ledger terminated at {}", name, sourceMLName, lastConfirmedEntry); + } + + TreeMap newLedgerInfos = new TreeMap<>(); + for (LedgerInfo ls : mlInfo.getLedgerInfoList()) { + newLedgerInfos.put(ls.getLedgerId(), ls); + } + + for (Map.Entry ledgerInfoEntry : newLedgerInfos.entrySet()) { + Long ledgerId = ledgerInfoEntry.getKey(); + LedgerInfo ledgerInfo = ledgerInfoEntry.getValue(); + if (ledgerInfo.getEntries() > 0) { + LedgerInfo oldLedgerInfo = ledgers.put(ledgerId, ledgerInfo); + if (oldLedgerInfo == null) { + log.info("[{}]Read new ledger info from source,ledgerId={}", name, ledgerId); + } else { + if (!oldLedgerInfo.equals(ledgerInfo)) { + log.info("[{}] Old ledger info updated in source,ledgerId={}", name, ledgerId); + // ledger deleted from bookkeeper by offloader. + if (ledgerInfo.hasOffloadContext() + && ledgerInfo.getOffloadContext().getBookkeeperDeleted() + && (!oldLedgerInfo.hasOffloadContext() || !oldLedgerInfo.getOffloadContext() + .getBookkeeperDeleted())) { + log.info("[{}] Old ledger removed from bookkeeper by offloader in source,ledgerId={}", name, + ledgerId); + invalidateReadHandle(ledgerId); + } + } + } + } + } + Long lastLedgerId = newLedgerInfos.lastKey(); + // open the last ledger. + if (lastLedgerId != null && !(currentLedger != null && currentLedger.getId() == lastLedgerId)) { + ledgers.put(lastLedgerId, newLedgerInfos.get(lastLedgerId)); + mbean.startDataLedgerOpenOp(); + //open ledger in readonly mode. + bookKeeper.asyncOpenLedgerNoRecovery(lastLedgerId, digestType, config.getPassword(), + (rc, lh, ctx1) -> executor.execute(safeRun(() -> { + mbean.endDataLedgerOpenOp(); + if (log.isDebugEnabled()) { + log.debug("[{}] Opened new source ledger {}", name, lastLedgerId); + } + if (rc == BKException.Code.OK) { + LedgerInfo info = LedgerInfo.newBuilder() + .setLedgerId(lastLedgerId) + .setEntries(lh.getLastAddConfirmed() + 1) + .setSize(lh.getLength()) + .setTimestamp(clock.millis()).build(); + ledgers.put(lastLedgerId, info); + currentLedger = lh; + currentLedgerEntries = 0; + currentLedgerSize = 0; + initLastConfirmedEntry(); + updateLedgersIdsComplete(); + maybeUpdateCursorBeforeTrimmingConsumedLedger(); + } else if (isNoSuchLedgerExistsException(rc)) { + log.warn("[{}] Source ledger not found: {}", name, lastLedgerId); + ledgers.remove(lastLedgerId); + } else { + log.error("[{}] Failed to open source ledger {}: {}", name, lastLedgerId, + BKException.getMessage(rc)); + } + })), null); + } + + //handle old ledgers deleted. + List ledgersToDelete = new ArrayList<>(ledgers.headMap(newLedgerInfos.firstKey(), false).values()); + if (!ledgersToDelete.isEmpty()) { + log.info("[{}]ledgers deleted in source, size={}", name, ledgersToDelete.size()); + try { + advanceCursorsIfNecessary(ledgersToDelete); + } catch (ManagedLedgerException.LedgerNotExistException e) { + log.info("[{}] First non deleted Ledger is not found, advanceCursors fails", name); + } + doDeleteLedgers(ledgersToDelete); + } + } + + + @Override + public synchronized void asyncClose(AsyncCallbacks.CloseCallback callback, Object ctx) { + store.unwatchManagedLedgerInfo(sourceMLName); + super.asyncClose(callback, ctx); + } + + @Override + protected synchronized void updateLedgersIdsComplete() { + STATE_UPDATER.set(this, State.LedgerOpened); + updateLastLedgerCreatedTimeAndScheduleRolloverTask(); + + if (log.isDebugEnabled()) { + log.debug("[{}] Resending {} pending messages", name, pendingAddEntries.size()); + } + + createNewOpAddEntryForNewLedger(); + + // Process all the pending addEntry requests + for (OpAddEntry op : pendingAddEntries) { + Position position = (Position) op.getCtx(); + if (position.getLedgerId() <= currentLedger.getId()) { + if (position.getLedgerId() == currentLedger.getId()) { + op.setLedger(currentLedger); + } else { + op.setLedger(null); + } + currentLedgerEntries = position.getEntryId(); + currentLedgerSize += op.data.readableBytes(); + op.initiateShadowWrite(); + } else { + break; + } + } + } + + @Override + protected void updateLastLedgerCreatedTimeAndScheduleRolloverTask() { + this.lastLedgerCreatedTimestamp = clock.millis(); } } diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCache.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCache.java index 640a7eeefcebb..a67756ddeeae9 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCache.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCache.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDefaultEvictionPolicy.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDefaultEvictionPolicy.java index 38f2c943d5913..bc67aeced1d5a 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDefaultEvictionPolicy.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDefaultEvictionPolicy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java index c581a0fed6f18..1c5563b38b120 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -97,7 +97,7 @@ public void asyncReadEntry(ReadHandle lh, long firstEntry, long lastEntry, boole ml.getMbean().addReadEntriesSample(entries.size(), totalSize); callback.readEntriesComplete(entries, ctx); - }, ml.getExecutor().chooseThread(ml.getName())).exceptionally(exception -> { + }, ml.getExecutor()).exceptionally(exception -> { callback.readEntriesFailed(createManagedLedgerException(exception), ctx); return null; }); @@ -130,7 +130,7 @@ public void asyncReadEntry(ReadHandle lh, PositionImpl position, AsyncCallbacks. } finally { ledgerEntries.close(); } - }, ml.getExecutor().chooseThread(ml.getName())); + }, ml.getExecutor()); } @Override diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheEvictionPolicy.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheEvictionPolicy.java index 8c55ce7cf7f41..41284825fa76f 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheEvictionPolicy.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheEvictionPolicy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheManager.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheManager.java index 12cbb023f8691..f68989039e51b 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheManager.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiter.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiter.java new file mode 100644 index 0000000000000..b946dc09a0c71 --- /dev/null +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiter.java @@ -0,0 +1,137 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.bookkeeper.mledger.impl.cache; + +import com.google.common.annotations.VisibleForTesting; +import io.prometheus.client.Gauge; +import lombok.AllArgsConstructor; +import lombok.ToString; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class InflightReadsLimiter { + + private static final Gauge PULSAR_ML_READS_BUFFER_SIZE = Gauge + .build() + .name("pulsar_ml_reads_inflight_bytes") + .help("Estimated number of bytes retained by data read from storage or cache") + .register(); + + private static final Gauge PULSAR_ML_READS_AVAILABLE_BUFFER_SIZE = Gauge + .build() + .name("pulsar_ml_reads_available_inflight_bytes") + .help("Available space for inflight data read from storage or cache") + .register(); + + private final long maxReadsInFlightSize; + private long remainingBytes; + + public InflightReadsLimiter(long maxReadsInFlightSize) { + if (maxReadsInFlightSize <= 0) { + // set it to -1 in order to show in the metrics that the metric is not available + PULSAR_ML_READS_BUFFER_SIZE.set(-1); + PULSAR_ML_READS_AVAILABLE_BUFFER_SIZE.set(-1); + } + this.maxReadsInFlightSize = maxReadsInFlightSize; + this.remainingBytes = maxReadsInFlightSize; + } + + @VisibleForTesting + public synchronized long getRemainingBytes() { + return remainingBytes; + } + + @AllArgsConstructor + @ToString + static class Handle { + final long acquiredPermits; + final boolean success; + final int trials; + + final long creationTime; + } + + private static final Handle DISABLED = new Handle(0, true, 0, -1); + + Handle acquire(long permits, Handle current) { + if (maxReadsInFlightSize <= 0) { + // feature is disabled + return DISABLED; + } + synchronized (this) { + try { + if (current == null) { + if (remainingBytes == 0) { + return new Handle(0, false, 1, System.currentTimeMillis()); + } + if (remainingBytes >= permits) { + remainingBytes -= permits; + return new Handle(permits, true, 1, System.currentTimeMillis()); + } else { + long possible = remainingBytes; + remainingBytes = 0; + return new Handle(possible, false, 1, System.currentTimeMillis()); + } + } else { + if (current.trials >= 4 && current.acquiredPermits > 0) { + remainingBytes += current.acquiredPermits; + return new Handle(0, false, 1, current.creationTime); + } + if (remainingBytes == 0) { + return new Handle(current.acquiredPermits, false, current.trials + 1, + current.creationTime); + } + long needed = permits - current.acquiredPermits; + if (remainingBytes >= needed) { + remainingBytes -= needed; + return new Handle(permits, true, current.trials + 1, current.creationTime); + } else { + long possible = remainingBytes; + remainingBytes = 0; + return new Handle(current.acquiredPermits + possible, false, + current.trials + 1, current.creationTime); + } + } + } finally { + updateMetrics(); + } + } + } + + void release(Handle handle) { + if (handle == DISABLED) { + return; + } + synchronized (this) { + remainingBytes += handle.acquiredPermits; + updateMetrics(); + } + } + + private synchronized void updateMetrics() { + PULSAR_ML_READS_BUFFER_SIZE.set(maxReadsInFlightSize - remainingBytes); + PULSAR_ML_READS_AVAILABLE_BUFFER_SIZE.set(remainingBytes); + } + + public boolean isDisabled() { + return maxReadsInFlightSize <= 0; + } + + +} diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManager.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManager.java index 30216871e76cf..8b2f3e25f1cbb 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManager.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import lombok.AllArgsConstructor; import lombok.Value; +import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.api.ReadHandle; import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.Entry; @@ -37,6 +38,7 @@ /** * PendingReadsManager tries to prevent sending duplicate reads to BK. */ +@Slf4j public class PendingReadsManager { private static final Counter COUNT_ENTRIES_READ_FROM_BK = Counter @@ -290,8 +292,7 @@ public void attach(CompletableFuture> handle) { } } } - }, rangeEntryCache.getManagedLedger().getExecutor() - .chooseThread(rangeEntryCache.getManagedLedger().getName())).exceptionally(exception -> { + }, rangeEntryCache.getManagedLedger().getExecutor()).exceptionally(exception -> { synchronized (PendingRead.this) { for (ReadEntriesCallbackWithContext callback : callbacks) { ManagedLedgerException mlException = createManagedLedgerException(exception); @@ -315,8 +316,6 @@ synchronized boolean addListener(AsyncCallbacks.ReadEntriesCallback callback, void readEntries(ReadHandle lh, long firstEntry, long lastEntry, boolean shouldCacheEntry, final AsyncCallbacks.ReadEntriesCallback callback, Object ctx) { - - final PendingReadKey key = new PendingReadKey(firstEntry, lastEntry); Map pendingReadsForLedger = @@ -442,6 +441,7 @@ public void readEntriesFailed(ManagedLedgerException exception, Object ctx) { } } + void clear() { cachedPendingReads.clear(); } diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java index 163728e0f0429..28a2f00cf683c 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -29,11 +29,15 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.bookkeeper.client.api.BKException; import org.apache.bookkeeper.client.api.LedgerEntry; import org.apache.bookkeeper.client.api.ReadHandle; +import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.AsyncCallbacks.ReadEntriesCallback; import org.apache.bookkeeper.mledger.AsyncCallbacks.ReadEntryCallback; +import org.apache.bookkeeper.mledger.Entry; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.mledger.ManagedLedgerException; import org.apache.bookkeeper.mledger.impl.EntryImpl; import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; @@ -49,6 +53,11 @@ */ public class RangeEntryCacheImpl implements EntryCache { + /** + * Overhead per-entry to take into account the envelope. + */ + private static final long BOOKKEEPER_READ_OVERHEAD_PER_ENTRY = 64; + private final RangeEntryCacheManagerImpl manager; final ManagedLedgerImpl ml; private ManagedLedgerInterceptor interceptor; @@ -56,14 +65,18 @@ public class RangeEntryCacheImpl implements EntryCache { private final boolean copyEntries; private final PendingReadsManager pendingReadsManager; + private volatile long estimatedEntrySize = 10 * 1024; + + private final long readEntryTimeoutMillis; private static final double MB = 1024 * 1024; public RangeEntryCacheImpl(RangeEntryCacheManagerImpl manager, ManagedLedgerImpl ml, boolean copyEntries) { this.manager = manager; - this.pendingReadsManager = new PendingReadsManager(this); this.ml = ml; + this.pendingReadsManager = new PendingReadsManager(this); this.interceptor = ml.getManagedLedgerInterceptor(); + this.readEntryTimeoutMillis = getManagedLedgerConfig().getReadEntryTimeoutSeconds(); this.entries = new RangeCache<>(EntryImpl::getLength, EntryImpl::getTimestamp); this.copyEntries = copyEntries; @@ -77,11 +90,21 @@ ManagedLedgerImpl getManagedLedger() { return ml; } + @VisibleForTesting + ManagedLedgerConfig getManagedLedgerConfig() { + return ml.getConfig(); + } + @Override public String getName() { return ml.getName(); } + @VisibleForTesting + InflightReadsLimiter getPendingReadsLimiter() { + return manager.getInflightReadsLimiter(); + } + public static final PooledByteBufAllocator ALLOCATOR = new PooledByteBufAllocator(true, // preferDirect 0, // nHeapArenas, PooledByteBufAllocator.defaultNumDirectArena(), // nDirectArena @@ -244,7 +267,7 @@ private void asyncReadEntry0(ReadHandle lh, PositionImpl position, final ReadEnt } finally { ledgerEntries.close(); } - }, ml.getExecutor().chooseThread(ml.getName())).exceptionally(exception -> { + }, ml.getExecutor()).exceptionally(exception -> { ml.invalidateLedgerHandle(lh); pendingReadsManager.invalidateLedger(lh.getId()); callback.readEntryFailed(createManagedLedgerException(exception), ctx); @@ -271,6 +294,19 @@ public void asyncReadEntry(ReadHandle lh, long firstEntry, long lastEntry, boole @SuppressWarnings({ "unchecked", "rawtypes" }) void asyncReadEntry0(ReadHandle lh, long firstEntry, long lastEntry, boolean shouldCacheEntry, final ReadEntriesCallback callback, Object ctx) { + asyncReadEntry0WithLimits(lh, firstEntry, lastEntry, shouldCacheEntry, callback, ctx, null); + } + + void asyncReadEntry0WithLimits(ReadHandle lh, long firstEntry, long lastEntry, boolean shouldCacheEntry, + final ReadEntriesCallback originalCallback, Object ctx, InflightReadsLimiter.Handle handle) { + + final AsyncCallbacks.ReadEntriesCallback callback = + handlePendingReadsLimits(lh, firstEntry, lastEntry, shouldCacheEntry, + originalCallback, ctx, handle); + if (callback == null) { + return; + } + final long ledgerId = lh.getId(); final int entriesToRead = (int) (lastEntry - firstEntry) + 1; final PositionImpl firstPosition = PositionImpl.get(lh.getId(), firstEntry); @@ -313,6 +349,73 @@ void asyncReadEntry0(ReadHandle lh, long firstEntry, long lastEntry, boolean sho } } + private AsyncCallbacks.ReadEntriesCallback handlePendingReadsLimits(ReadHandle lh, + long firstEntry, long lastEntry, + boolean shouldCacheEntry, + AsyncCallbacks.ReadEntriesCallback originalCallback, + Object ctx, InflightReadsLimiter.Handle handle) { + InflightReadsLimiter pendingReadsLimiter = getPendingReadsLimiter(); + if (pendingReadsLimiter.isDisabled()) { + return originalCallback; + } + long estimatedReadSize = (1 + lastEntry - firstEntry) + * (estimatedEntrySize + BOOKKEEPER_READ_OVERHEAD_PER_ENTRY); + final AsyncCallbacks.ReadEntriesCallback callback; + InflightReadsLimiter.Handle newHandle = pendingReadsLimiter.acquire(estimatedReadSize, handle); + if (!newHandle.success) { + long now = System.currentTimeMillis(); + if (now - newHandle.creationTime > readEntryTimeoutMillis) { + String message = "Time-out elapsed while acquiring enough permits " + + "on the memory limiter to read from ledger " + + lh.getId() + + ", " + getName() + + ", estimated read size " + estimatedReadSize + " bytes" + + " for " + (1 + lastEntry - firstEntry) + + " entries (check managedLedgerMaxReadsInFlightSizeInMB)"; + log.error(message); + pendingReadsLimiter.release(newHandle); + originalCallback.readEntriesFailed( + new ManagedLedgerException.TooManyRequestsException(message), ctx); + return null; + } + ml.getExecutor().execute(() -> { + asyncReadEntry0WithLimits(lh, firstEntry, lastEntry, shouldCacheEntry, + originalCallback, ctx, newHandle); + }); + return null; + } else { + callback = new AsyncCallbacks.ReadEntriesCallback() { + + @Override + public void readEntriesComplete(List entries, Object ctx) { + if (!entries.isEmpty()) { + long size = entries.get(0).getLength(); + estimatedEntrySize = size; + + AtomicInteger remainingCount = new AtomicInteger(entries.size()); + for (Entry entry : entries) { + ((EntryImpl) entry).onDeallocate(() -> { + if (remainingCount.decrementAndGet() <= 0) { + pendingReadsLimiter.release(newHandle); + } + }); + } + } else { + pendingReadsLimiter.release(newHandle); + } + originalCallback.readEntriesComplete(entries, ctx); + } + + @Override + public void readEntriesFailed(ManagedLedgerException exception, Object ctx) { + pendingReadsLimiter.release(newHandle); + originalCallback.readEntriesFailed(exception, ctx); + } + }; + } + return callback; + } + /** * Reads the entries from Storage. * @param lh the handle diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheManagerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheManagerImpl.java index 657740c39ec9e..080c70b5873cd 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheManagerImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheManagerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -51,14 +51,16 @@ public class RangeEntryCacheManagerImpl implements EntryCacheManager { private final ManagedLedgerFactoryImpl mlFactory; protected final ManagedLedgerFactoryMBeanImpl mlFactoryMBean; + private final InflightReadsLimiter inflightReadsLimiter; protected static final double MB = 1024 * 1024; - private static final double evictionTriggerThresholdPercent = 0.98; public RangeEntryCacheManagerImpl(ManagedLedgerFactoryImpl factory) { this.maxSize = factory.getConfig().getMaxCacheSize(); + this.inflightReadsLimiter = new InflightReadsLimiter( + factory.getConfig().getManagedLedgerMaxReadsInFlightSize()); this.evictionTriggerThreshold = (long) (maxSize * evictionTriggerThresholdPercent); this.cacheEvictionWatermark = factory.getConfig().getCacheEvictionWatermark(); this.evictionPolicy = new EntryCacheDefaultEvictionPolicy(); @@ -195,5 +197,9 @@ public static EntryImpl create(LedgerEntry ledgerEntry, ManagedLedgerInterceptor return returnEntry; } + public InflightReadsLimiter getInflightReadsLimiter() { + return inflightReadsLimiter; + } + private static final Logger log = LoggerFactory.getLogger(RangeEntryCacheManagerImpl.class); } diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/package-info.java index 898d250aa7f54..025f24506fb2c 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/package-info.java index 9699362cb3496..f01c447e53afe 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/ManagedLedgerInterceptor.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/ManagedLedgerInterceptor.java index cb5ba0cbfee90..412655594c770 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/ManagedLedgerInterceptor.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/ManagedLedgerInterceptor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/package-info.java index 58ef67b706fb9..bc6a495ba3561 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/intercept/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java index 767a0c78b6d8a..550626f76c000 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -24,12 +24,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; import org.apache.bookkeeper.client.LedgerMetadataBuilder; import org.apache.bookkeeper.client.api.DigestType; import org.apache.bookkeeper.client.api.LedgerMetadata; +import org.apache.bookkeeper.common.util.Backoff; +import org.apache.bookkeeper.common.util.Retries; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.mledger.proto.MLDataFormats.KeyValue; import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo; import org.apache.bookkeeper.mledger.proto.MLDataFormats.OffloadContext; @@ -181,4 +187,26 @@ public static LedgerMetadata parseLedgerMetadata(long id, byte[] bytes) throws I return builder.build(); } + + public static CompletableFuture cleanupOffloaded(long ledgerId, UUID uuid, ManagedLedgerConfig mlConfig, + Map offloadDriverMetadata, String cleanupReason, + String name, org.apache.bookkeeper.common.util.OrderedScheduler executor) { + log.info("[{}] Cleanup offload for ledgerId {} uuid {} because of the reason {}.", + name, ledgerId, uuid.toString(), cleanupReason); + Map metadataMap = new HashMap(); + metadataMap.putAll(offloadDriverMetadata); + metadataMap.put("ManagedLedgerName", name); + + return Retries.run(Backoff.exponentialJittered(TimeUnit.SECONDS.toMillis(1), + TimeUnit.SECONDS.toHours(1)).limit(10), + Retries.NonFatalPredicate, + () -> mlConfig.getLedgerOffloader().deleteOffloaded(ledgerId, uuid, metadataMap), + executor, name).whenComplete((ignored, exception) -> { + if (exception != null) { + log.warn("[{}] Error cleaning up offload for {}, (cleanup reason: {})", + name, ledgerId, cleanupReason, exception); + } + }); + } + } diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderDefinition.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderDefinition.java index 414b7c8d0d5ce..5d2aaec9464a6 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderDefinition.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderDefinition.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java index 29689eb0b30e9..7119943f92fb8 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloaderUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/Offloaders.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/Offloaders.java index caf8d5e8780ab..6910439e09131 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/Offloaders.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/Offloaders.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadersCache.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadersCache.java index 307b7a5c286af..9f2f5860d4ebd 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadersCache.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadersCache.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/package-info.java index 1be0b86c8b860..926737e03e5c8 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/package-info.java index 975a9581e41c0..f5c62d796b6f1 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java index 88af63ddcc8d3..ae319b44679ac 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/package-info.java index 1e9054901a1e5..8ba9c7781f4f0 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java index e5f07c2c7b8d6..b815d92eed3a1 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Errors.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Errors.java index f56dc11bbda0c..91a03bc625b38 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Errors.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Errors.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Futures.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Futures.java index 0b09118af7c91..dc1d1eb6c9ac5 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Futures.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/Futures.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -71,14 +71,15 @@ public static CompletableFuture waitForAll(List> f } public static CompletableFuture executeWithRetry(Supplier> op, - Class needRetryExceptionClass) { + Class needRetryExceptionClass, + int maxRetryTimes) { CompletableFuture resultFuture = new CompletableFuture<>(); op.get().whenComplete((res, ex) -> { if (ex == null) { resultFuture.complete(res); } else { - if (needRetryExceptionClass.isAssignableFrom(ex.getClass())) { - executeWithRetry(op, needRetryExceptionClass).whenComplete((res2, ex2) -> { + if (needRetryExceptionClass.isAssignableFrom(ex.getClass()) && maxRetryTimes > 0) { + executeWithRetry(op, needRetryExceptionClass, maxRetryTimes - 1).whenComplete((res2, ex2) -> { if (ex2 == null) { resultFuture.complete(res2); } else { diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtil.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtil.java index a73b51410b296..336c3a69e45c1 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtil.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java index 98ae6659b785a..7599e2cc1874f 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/SafeRun.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/SafeRun.java index fef9574640bb1..570cb7ae735ab 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/SafeRun.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/SafeRun.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java index 02021c5187e8c..60c0a7f6c9d22 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/package-info.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/package-info.java index e905eaeebe080..53f529a91dd81 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/package-info.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/SimpleBookKeeperTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/SimpleBookKeeperTest.java index d0a92f0ab9edd..0086500d08907 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/SimpleBookKeeperTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/SimpleBookKeeperTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheManagerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheManagerTest.java index 982acfdedd2f1..1b02cd674c567 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheManagerTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheManagerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -34,10 +34,10 @@ import lombok.Cleanup; import org.apache.bookkeeper.client.api.ReadHandle; -import org.apache.bookkeeper.common.util.OrderedScheduler; import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.Entry; import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.mledger.ManagedLedgerException; import org.apache.bookkeeper.mledger.ManagedLedgerFactoryConfig; import org.apache.bookkeeper.mledger.impl.cache.EntryCache; @@ -54,18 +54,18 @@ public class EntryCacheManagerTest extends MockedBookKeeperTestCase { @Override protected void setUpTestCase() throws Exception { - OrderedScheduler executor = OrderedScheduler.newSchedulerBuilder().numThreads(1).build(); - ml1 = mock(ManagedLedgerImpl.class); when(ml1.getScheduledExecutor()).thenReturn(executor); when(ml1.getName()).thenReturn("cache1"); when(ml1.getMbean()).thenReturn(new ManagedLedgerMBeanImpl(ml1)); - when(ml1.getExecutor()).thenReturn(super.executor); + when(ml1.getExecutor()).thenReturn(executor); when(ml1.getFactory()).thenReturn(factory); + when(ml1.getConfig()).thenReturn(new ManagedLedgerConfig()); ml2 = mock(ManagedLedgerImpl.class); when(ml2.getScheduledExecutor()).thenReturn(executor); when(ml2.getName()).thenReturn("cache2"); + when(ml2.getConfig()).thenReturn(new ManagedLedgerConfig()); } @Test diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheTest.java index c1ee5a1083a8b..c8338798f271b 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -41,6 +41,7 @@ import org.apache.bookkeeper.client.impl.LedgerEntryImpl; import org.apache.bookkeeper.mledger.AsyncCallbacks.ReadEntriesCallback; import org.apache.bookkeeper.mledger.Entry; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.mledger.ManagedLedgerException; import org.apache.bookkeeper.mledger.impl.cache.EntryCache; import org.apache.bookkeeper.mledger.impl.cache.EntryCacheManager; @@ -58,6 +59,7 @@ protected void setUpTestCase() throws Exception { when(ml.getName()).thenReturn("name"); when(ml.getExecutor()).thenReturn(executor); when(ml.getMbean()).thenReturn(new ManagedLedgerMBeanImpl(ml)); + when(ml.getConfig()).thenReturn(new ManagedLedgerConfig()); } @Test(timeOut = 5000) diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorConcurrencyTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorConcurrencyTest.java index b590d222f3bce..3fa0234e13a55 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorConcurrencyTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorConcurrencyTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java index dfb65d59c78bd..54ebc4c293a94 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorIndividualDeletedMessagesTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorIndividualDeletedMessagesTest.java index b3d3f1117e6a7..aa0d04783d991 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorIndividualDeletedMessagesTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorIndividualDeletedMessagesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorInfoMetadataTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorInfoMetadataTest.java index b821cbc04031c..08d8fd939a01d 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorInfoMetadataTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorInfoMetadataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java index bdc5bdb4a5f54..0a3afcb2a61c3 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorPropertiesTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorPropertiesTest.java index c9082344d23a8..2ef8f3eae327c 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorPropertiesTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorPropertiesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -247,13 +247,13 @@ public void testUpdateCursorPropertiesConcurrent() throws Exception { map.put("c", "3"); futures.add(executeWithRetry(() -> c1.setCursorProperties(map), - ManagedLedgerException.BadVersionException.class)); + ManagedLedgerException.BadVersionException.class, 3)); futures.add(executeWithRetry(() -> c1.putCursorProperty("a", "2"), - ManagedLedgerException.BadVersionException.class)); + ManagedLedgerException.BadVersionException.class, 3)); futures.add(executeWithRetry(() -> c1.removeCursorProperty("c"), - ManagedLedgerException.BadVersionException.class)); + ManagedLedgerException.BadVersionException.class, 3)); for (CompletableFuture future : futures) { future.get(); diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java index 89af1eab61a17..fa3d6ec6c9035 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -92,7 +92,9 @@ import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo; import org.apache.bookkeeper.mledger.proto.MLDataFormats.PositionInfo; import org.apache.bookkeeper.test.MockedBookKeeperTestCase; +import org.apache.pulsar.common.api.proto.CommandSubscribe; import org.apache.pulsar.common.api.proto.IntRange; +import org.apache.pulsar.common.util.collections.BitSetRecyclable; import org.apache.pulsar.common.util.collections.LongPairRangeSet; import org.apache.pulsar.metadata.api.MetadataStoreException; import org.apache.pulsar.metadata.api.Stat; @@ -141,6 +143,36 @@ public void testCloseCursor() throws Exception { ledger.close(); } + @Test + public void testRepeatCloseCursor() throws Exception { + ManagedLedgerConfig config = new ManagedLedgerConfig(); + config.setMaxUnackedRangesToPersistInMetadataStore(0); + config.setThrottleMarkDelete(0); + ManagedLedger ledger = factory.open("my_test_ledger", config); + final ManagedCursorImpl cursor = (ManagedCursorImpl) ledger.openCursor("c1"); + cursor.close(); + cursor.close(); + assertEquals(cursor.getState(), ManagedCursorImpl.State.Closed.toString()); + // cleanup, "ledger.close" will trigger another "cursor.close" + ledger.close(); + assertEquals(cursor.getState(), ManagedCursorImpl.State.Closed.toString()); + } + + @Test + public void testOpenCursorWithNullInitialPosition() throws Exception { + ManagedLedgerConfig config = new ManagedLedgerConfig(); + ManagedLedger ledger = factory.open("testOpenCursorWithNullInitialPosition", config); + // Write some data. + ledger.addEntry(new byte[]{1}); + ledger.addEntry(new byte[]{2}); + ledger.addEntry(new byte[]{3}); + ledger.addEntry(new byte[]{4}); + ledger.addEntry(new byte[]{5}); + + ManagedCursorImpl cursor = (ManagedCursorImpl) ledger.openCursor("c_testOpenCursorWithNullInitialPosition", null); + assertEquals(cursor.getMarkDeletedPosition(), ledger.getLastConfirmedEntry()); + } + private static void closeCursorLedger(ManagedCursorImpl managedCursor) { Awaitility.await().until(managedCursor::closeCursorLedger); } @@ -665,7 +697,7 @@ void testResetCursor1() throws Exception { } assertTrue(moveStatus.get()); PositionImpl earliestPos = new PositionImpl(actualEarliest.getLedgerId(), -1); - assertEquals(earliestPos, cursor.getReadPosition()); + assertEquals(cursor.getReadPosition(), earliestPos); moveStatus.set(false); // reset to one after last entry in a ledger should point to the first entry in the next ledger @@ -2643,6 +2675,11 @@ void testTrimDeletedEntries() throws ManagedLedgerException, InterruptedExceptio assertEquals(entries.size(), 1); assertEquals(entries.get(0).getPosition(), PositionImpl.get(markDeletedPosition.getLedgerId(), markDeletedPosition.getEntryId() + 7)); + + assertEquals(entry1.refCnt(), 0); + assertEquals(entry2.refCnt(), 0); + assertEquals(entry3.refCnt(), 0); + assertEquals(entry4.refCnt(), 0); } @Test(timeOut = 20000) @@ -3272,6 +3309,126 @@ public void operationFailed(ManagedLedgerException exception) { }); } + @Test(timeOut = 20000) + public void testRecoverCursorAfterResetToLatestForNewEntry() throws Exception { + ManagedLedger ml = factory.open("testRecoverCursorAfterResetToLatestForNewEntry"); + ManagedCursorImpl c = (ManagedCursorImpl) ml.openCursor("sub", CommandSubscribe.InitialPosition.Latest); + + // A new cursor starts out with these values. The rest of the test assumes this, so we assert it here. + assertEquals(c.getMarkDeletedPosition().getEntryId(), -1); + assertEquals(c.getReadPosition().getEntryId(), 0); + assertEquals(ml.getLastConfirmedEntry().getEntryId(), -1); + + c.resetCursor(PositionImpl.LATEST); + + // A reset cursor starts out with these values. The rest of the test assumes this, so we assert it here. + assertEquals(c.getMarkDeletedPosition().getEntryId(), -1); + assertEquals(c.getReadPosition().getEntryId(), 0); + assertEquals(ml.getLastConfirmedEntry().getEntryId(), -1); + + final Position markDeleteBeforeRecover = c.getMarkDeletedPosition(); + final Position readPositionBeforeRecover = c.getReadPosition(); + + // Trigger the lastConfirmedEntry to move forward + ml.addEntry(new byte[1]); + + ManagedCursorInfo info = ManagedCursorInfo.newBuilder() + .setCursorsLedgerId(c.getCursorLedger()) + .setMarkDeleteLedgerId(markDeleteBeforeRecover.getLedgerId()) + .setMarkDeleteEntryId(markDeleteBeforeRecover.getEntryId()) + .setLastActive(0L) + .build(); + + CountDownLatch latch = new CountDownLatch(1); + AtomicBoolean failed = new AtomicBoolean(false); + c.recoverFromLedger(info, new VoidCallback() { + @Override + public void operationComplete() { + latch.countDown(); + } + + @Override + public void operationFailed(ManagedLedgerException exception) { + failed.set(true); + latch.countDown(); + } + }); + + latch.await(); + if (failed.get()) { + fail("Cursor recovery should not fail"); + } + assertEquals(c.getMarkDeletedPosition(), markDeleteBeforeRecover); + assertEquals(c.getReadPosition(), readPositionBeforeRecover); + assertEquals(c.getNumberOfEntries(), 1L); + } + + @Test(timeOut = 20000) + public void testRecoverCursorAfterResetToLatestForMultipleEntries() throws Exception { + ManagedLedger ml = factory.open("testRecoverCursorAfterResetToLatestForMultipleEntries"); + ManagedCursorImpl c = (ManagedCursorImpl) ml.openCursor("sub", CommandSubscribe.InitialPosition.Latest); + + // A new cursor starts out with these values. The rest of the test assumes this, so we assert it here. + assertEquals(c.getMarkDeletedPosition().getEntryId(), -1); + assertEquals(c.getReadPosition().getEntryId(), 0); + assertEquals(ml.getLastConfirmedEntry().getEntryId(), -1); + + c.resetCursor(PositionImpl.LATEST); + + // A reset cursor starts out with these values. The rest of the test assumes this, so we assert it here. + assertEquals(c.getMarkDeletedPosition().getEntryId(), -1); + assertEquals(c.getReadPosition().getEntryId(), 0); + assertEquals(ml.getLastConfirmedEntry().getEntryId(), -1); + + // Trigger the lastConfirmedEntry to move forward + ml.addEntry(new byte[1]); + ml.addEntry(new byte[1]); + ml.addEntry(new byte[1]); + ml.addEntry(new byte[1]); + + c.resetCursor(PositionImpl.LATEST); + + assertEquals(c.getMarkDeletedPosition().getEntryId(), 3); + assertEquals(c.getReadPosition().getEntryId(), 4); + assertEquals(ml.getLastConfirmedEntry().getEntryId(), 3); + + // Publish messages to move the lastConfirmedEntry field forward + ml.addEntry(new byte[1]); + ml.addEntry(new byte[1]); + + final Position markDeleteBeforeRecover = c.getMarkDeletedPosition(); + final Position readPositionBeforeRecover = c.getReadPosition(); + + ManagedCursorInfo info = ManagedCursorInfo.newBuilder() + .setCursorsLedgerId(c.getCursorLedger()) + .setMarkDeleteLedgerId(markDeleteBeforeRecover.getLedgerId()) + .setMarkDeleteEntryId(markDeleteBeforeRecover.getEntryId()) + .setLastActive(0L) + .build(); + + CountDownLatch latch = new CountDownLatch(1); + AtomicBoolean failed = new AtomicBoolean(false); + c.recoverFromLedger(info, new VoidCallback() { + @Override + public void operationComplete() { + latch.countDown(); + } + + @Override + public void operationFailed(ManagedLedgerException exception) { + failed.set(true); + latch.countDown(); + } + }); + + latch.await(); + if (failed.get()) { + fail("Cursor recovery should not fail"); + } + assertEquals(c.getMarkDeletedPosition(), markDeleteBeforeRecover); + assertEquals(c.getReadPosition(), readPositionBeforeRecover); + assertEquals(c.getNumberOfEntries(), 2L); + } @Test void testAlwaysInactive() throws Exception { ManagedLedger ml = factory.open("testAlwaysInactive"); @@ -3337,6 +3494,37 @@ public void deleteMessagesCheckhMarkDelete() throws Exception { assertEquals(c1.getReadPosition(), positions[markDelete + 1]); } + @Test + public void testBatchIndexMarkdelete() throws ManagedLedgerException, InterruptedException { + ManagedLedger ledger = factory.open("test_batch_index_delete"); + ManagedCursor cursor = ledger.openCursor("c1"); + + final int totalEntries = 100; + final Position[] positions = new Position[totalEntries]; + for (int i = 0; i < totalEntries; i++) { + // add entry + positions[i] = ledger.addEntry(("entry-" + i).getBytes(Encoding)); + } + assertEquals(cursor.getNumberOfEntries(), totalEntries); + markDeleteBatchIndex(cursor, positions[0], 10, 3); + List deletedIndexes = getAckedIndexRange(cursor.getDeletedBatchIndexesAsLongArray((PositionImpl) positions[0]), 10); + Assert.assertEquals(1, deletedIndexes.size()); + Assert.assertEquals(0, deletedIndexes.get(0).getStart()); + Assert.assertEquals(3, deletedIndexes.get(0).getEnd()); + + markDeleteBatchIndex(cursor, positions[0], 10, 4); + deletedIndexes = getAckedIndexRange(cursor.getDeletedBatchIndexesAsLongArray((PositionImpl) positions[0]), 10); + Assert.assertEquals(1, deletedIndexes.size()); + Assert.assertEquals(0, deletedIndexes.get(0).getStart()); + Assert.assertEquals(4, deletedIndexes.get(0).getEnd()); + + markDeleteBatchIndex(cursor, positions[0], 10, 2); + deletedIndexes = getAckedIndexRange(cursor.getDeletedBatchIndexesAsLongArray((PositionImpl) positions[0]), 10); + Assert.assertEquals(1, deletedIndexes.size()); + Assert.assertEquals(0, deletedIndexes.get(0).getStart()); + Assert.assertEquals(4, deletedIndexes.get(0).getEnd()); + } + @Test public void testBatchIndexDelete() throws ManagedLedgerException, InterruptedException { ManagedLedger ledger = factory.open("test_batch_index_delete"); @@ -3468,6 +3656,31 @@ public void deleteFailed(ManagedLedgerException exception, Object ctx) { pos.ackSet = null; } + private void markDeleteBatchIndex(ManagedCursor cursor, Position position, int batchSize, int batchIndex + ) throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + PositionImpl pos = (PositionImpl) position; + BitSetRecyclable bitSet = new BitSetRecyclable(); + bitSet.set(0, batchSize); + bitSet.clear(0, batchIndex + 1); + + pos.ackSet = bitSet.toLongArray(); + + cursor.asyncMarkDelete(pos, new MarkDeleteCallback() { + @Override + public void markDeleteFailed(ManagedLedgerException exception, Object ctx) { + latch.countDown(); + } + + @Override + public void markDeleteComplete(Object ctx) { + latch.countDown(); + } + }, null); + latch.await(); + pos.ackSet = null; + } + private List getAckedIndexRange(long[] bitSetLongArray, int batchSize) { if (bitSetLongArray == null) { return null; diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java index 5c42e7f46bda5..0281c8cdd88e3 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -334,8 +334,8 @@ public void deleteFailed(ManagedLedgerException exception, Object ctx) { counter.await(); - cursor.close(); - ledger.close(); + // cleanup. + closeManagedLedgerWithRetry(ledger); // Add information to determine the problem. if (gotException.get() != null){ diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java index 5a52c29d544a6..eac22d2469b17 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryChangeLedgerPathTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryChangeLedgerPathTest.java index ba27777d6d50f..67c75bf907dca 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryChangeLedgerPathTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryChangeLedgerPathTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryShutdownTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryShutdownTest.java index cce68540f06af..c223490f1c798 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryShutdownTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryShutdownTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryTest.java index f307bfa72a579..d49d9ab3e2b6b 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerInfoMetadataTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerInfoMetadataTest.java index 91bc7f143a4ae..7ddf6541c9a39 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerInfoMetadataTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerInfoMetadataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanTest.java index 89c69a08db40c..2505db6ec55d7 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerSingleBookieTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerSingleBookieTest.java index 305ae15109d2a..c982a5eefb34f 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerSingleBookieTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerSingleBookieTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTerminationTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTerminationTest.java index 85755db46c5ab..2150e80b29593 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTerminationTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTerminationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java index a1fa9b1f64057..29e30a958bd02 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -3011,7 +3011,8 @@ public void readEntryFailed(ManagedLedgerException exception, Object ctx) { ledger.asyncCreateLedger(bk, config, null, (rc, lh, ctx) -> {}, Collections.emptyMap()); retryStrategically((test) -> responseException1.get() != null, 5, 1000); assertNotNull(responseException1.get()); - assertEquals(responseException1.get().getMessage(), BKException.getMessage(BKException.Code.TimeoutException)); + assertTrue(responseException1.get().getMessage() + .startsWith(BKException.getMessage(BKException.Code.TimeoutException))); // (2) test read-timeout for: ManagedLedger.asyncReadEntry(..) AtomicReference responseException2 = new AtomicReference<>(); @@ -3036,13 +3037,14 @@ public void readEntriesFailed(ManagedLedgerException exception, Object ctx) { return responseException2.get() != null; }, 5, 1000); assertNotNull(responseException2.get()); - assertEquals(responseException2.get().getMessage(), BKException.getMessage(BKException.Code.TimeoutException)); + assertTrue(responseException2.get().getMessage() + .startsWith(BKException.getMessage(BKException.Code.TimeoutException))); ledger.close(); } /** - * It verifies that if bk-client doesn't complete the add-entry in given time out then broker is resilient enought + * It verifies that if bk-client doesn't complete the add-entry in given time out then broker is resilient enough * to create new ledger and add entry successfully. * * @@ -3624,10 +3626,13 @@ public void testDoNotGetOffloadPoliciesMultipleTimesWhenTrimLedgers() throws Exc LedgerOffloader ledgerOffloader = mock(NullLedgerOffloader.class); OffloadPoliciesImpl offloadPolicies = mock(OffloadPoliciesImpl.class); when(ledgerOffloader.getOffloadPolicies()).thenReturn(offloadPolicies); + when(ledgerOffloader.getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes()).thenReturn(-1L); + when(ledgerOffloader.getOffloadPolicies().getManagedLedgerOffloadThresholdInSeconds()).thenReturn(-1L); when(ledgerOffloader.getOffloadDriverName()).thenReturn("s3"); config.setLedgerOffloader(ledgerOffloader); - ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open( - "testDoNotGetOffloadPoliciesMultipleTimesWhenTrimLedgers", config); + ManagedLedgerImpl ledger = spy((ManagedLedgerImpl)factory.open( + "testDoNotGetOffloadPoliciesMultipleTimesWhenTrimLedgers", config)); + doNothing().when(ledger).trimConsumedLedgersInBackground(any(CompletableFuture.class)); // Retain the data. ledger.openCursor("test-cursor"); diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java index 8d546c74431f4..40ecbde3c0899 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java index f73ebf122b7cf..e56d4488a3d5c 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java index e36835f2efbfc..56da315553ea4 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -82,6 +82,7 @@ Set deletedOffloads() { OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_BYTES, + OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_SECONDS, OffloadPoliciesImpl.DEFAULT_OFFLOAD_DELETION_LAG_IN_MILLIS, OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY); diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java index f49ce9961fd65..cd224e33e2734 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -202,12 +202,13 @@ static class MockLedgerOffloader implements LedgerOffloader { ConcurrentHashMap offloads = new ConcurrentHashMap(); - OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl.create("S3", "", "", "", + OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl .create("S3", "", "", "", null, null, null, null, OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_BYTES, + OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_SECONDS, OffloadPoliciesImpl.DEFAULT_OFFLOAD_DELETION_LAG_IN_MILLIS, OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY); diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java index ae0e53456e2d7..2cdb14fb71e41 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -26,6 +26,7 @@ import static org.testng.Assert.fail; import java.lang.reflect.Field; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; @@ -34,10 +35,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BooleanSupplier; import java.util.stream.Collectors; + +import com.google.common.collect.Sets; import org.apache.bookkeeper.client.BKException; import org.apache.bookkeeper.client.api.ReadHandle; +import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.AsyncCallbacks.OffloadCallback; import org.apache.bookkeeper.mledger.LedgerOffloader; import org.apache.bookkeeper.mledger.ManagedCursor; @@ -53,6 +58,8 @@ import org.apache.pulsar.metadata.impl.FaultInjectionMetadataStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.testng.Assert; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; public class OffloadPrefixTest extends MockedBookKeeperTestCase { @@ -679,6 +686,63 @@ public void testOffloadDelete() throws Exception { assertEventuallyTrue(() -> offloader.deletedOffloads().contains(firstLedger)); } + @Test + public void testOffloadDeleteClosedLedger() throws Exception { + MockLedgerOffloader offloader = new MockLedgerOffloader(); + ManagedLedgerConfig config = new ManagedLedgerConfig(); + config.setMaxEntriesPerLedger(10); + config.setMinimumRolloverTime(0, TimeUnit.SECONDS); + config.setRetentionTime(0, TimeUnit.MINUTES); + offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(100L); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(100L); + config.setLedgerOffloader(offloader); + ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger", config); + ManagedCursor cursor = ledger.openCursor("foobar"); + + for (int i = 0; i < 15; i++) { + String content = "entry-" + i; + ledger.addEntry(content.getBytes()); + } + + assertEquals(ledger.getLedgersInfoAsList().size(), 2); + ledger.offloadPrefix(ledger.getLastConfirmedEntry()); + assertEquals(ledger.getLedgersInfoAsList().size(), 2); + + assertEquals(ledger.getLedgersInfoAsList().stream() + .filter(e -> e.getOffloadContext().getComplete()).count(), 1); + assertTrue(ledger.getLedgersInfoAsList().get(0).getOffloadContext().getComplete()); + + Set offloadedledgers = Sets.newHashSet(offloader.offloadedLedgers()); + assertTrue(offloadedledgers.size() > 0); + + Set bkLedgersInMLedger = Sets.newHashSet(ledger.getLedgersInfo().keySet()); + assertTrue(bkLedgersInMLedger.size() > 0); + + factory.close(ledger); + ledger.close(); + + AtomicInteger success = new AtomicInteger(0); + factory.asyncDelete("my_test_ledger", CompletableFuture.completedFuture(config), + new AsyncCallbacks.DeleteLedgerCallback() { + @Override + public void deleteLedgerComplete(Object ctx) { + success.set(1); + } + + @Override + public void deleteLedgerFailed(ManagedLedgerException exception, Object ctx) { + success.set(-1); + } + }, null); + assertEventuallyTrue(() -> success.get() == 1); + Set deletedledgers = offloader.deletedOffloads(); + assertEquals(offloadedledgers, deletedledgers); + + for (long ledgerId: bkLedgersInMLedger) { + assertFalse(bkc.getLedgers().contains(ledgerId)); + } + } + @Test public void testOffloadDeleteIncomplete() throws Exception { Set> deleted = ConcurrentHashMap.newKeySet(); @@ -787,17 +851,31 @@ private static byte[] buildEntry(int size, String pattern) { return entry; } - @Test - public void testAutoTriggerOffload() throws Exception { + @DataProvider(name = "testAutoTriggerOffload") + public Object[][] testAutoTriggerOffloadProvider() { + return new Object[][]{ + {null, 0L}, + {100L, null}, + {-1L, null}, + {null, null}, + {-1L, -1L}, + {1L, 1L}, + {100L, Long.MAX_VALUE} + }; + } + + @Test(dataProvider = "testAutoTriggerOffload") + public void testAutoTriggerOffload(Long sizeThreshold, Long timeThreshold) throws Exception { MockLedgerOffloader offloader = new MockLedgerOffloader(); ManagedLedgerConfig config = new ManagedLedgerConfig(); config.setMaxEntriesPerLedger(10); config.setRetentionTime(10, TimeUnit.MINUTES); config.setRetentionSizeInMB(10); - offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(100L); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(sizeThreshold); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInSeconds(timeThreshold); config.setLedgerOffloader(offloader); - ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger", config); + ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger" + UUID.randomUUID(), config); // Ledger will roll twice, offload will run on first ledger after second closed for (int i = 0; i < 25; i++) { @@ -806,14 +884,50 @@ public void testAutoTriggerOffload() throws Exception { assertEquals(ledger.getLedgersInfoAsList().size(), 3); - // offload should eventually be triggered - assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 1); - assertEquals(offloader.offloadedLedgers(), - Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId())); + if (sizeThreshold == null && timeThreshold != null && timeThreshold == 0L) { + // All the inactive ledgers will be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 2); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), Set.of(allLedgerIds.get(0), allLedgerIds.get(1))); + } else if (sizeThreshold != null && sizeThreshold == 100L && timeThreshold == null) { + // The last 2 ledgers won't be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 1); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), Set.of(allLedgerIds.get(0))); + } else if (sizeThreshold != null && sizeThreshold == -1L && timeThreshold == null) { + // Offloading is disabled, no ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 0); + assertEquals(offloader.offloadedLedgers().size(), 0); + } else if (sizeThreshold == null && timeThreshold == null) { + // Offloading is disabled, no ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 0); + assertEquals(offloader.offloadedLedgers().size(), 0); + } else if (sizeThreshold != null && sizeThreshold == 1L && timeThreshold != null && timeThreshold == 1L) { + // All the inactive ledgers will be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 2); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), Set.of(allLedgerIds.get(0), allLedgerIds.get(1))); + } else if (sizeThreshold != null && sizeThreshold == 100L + && timeThreshold != null && timeThreshold == Long.MAX_VALUE) { + // The last 2 ledgers won't be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 1); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), Set.of(allLedgerIds.get(0))); + } } - @Test - public void manualTriggerWhileAutoInProgress() throws Exception { + @DataProvider(name = "manualTriggerWhileAutoInProgress") + public Object[][] manualTriggerWhileAutoInProgressProvider() { + return new Object[][]{ + {null, 0L}, + {100L, null}, + {1L, 1L}, + {0L, 0L} + }; + } + + @Test(dataProvider = "manualTriggerWhileAutoInProgress") + public void manualTriggerWhileAutoInProgress(Long sizeThreshold, Long timeThreshold) throws Exception { CompletableFuture slowOffload = new CompletableFuture<>(); CountDownLatch offloadRunning = new CountDownLatch(1); MockLedgerOffloader offloader = new MockLedgerOffloader() { @@ -830,7 +944,8 @@ public CompletableFuture offload(ReadHandle ledger, config.setMaxEntriesPerLedger(10); config.setRetentionTime(10, TimeUnit.MINUTES); config.setRetentionSizeInMB(10); - offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(100L); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(sizeThreshold); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInSeconds(timeThreshold); config.setLedgerOffloader(offloader); ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger", config); @@ -855,12 +970,43 @@ public CompletableFuture offload(ReadHandle ledger, slowOffload.complete(null); - // eventually all over threshold will be offloaded - assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); - assertEquals(offloader.offloadedLedgers(), - Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), - ledger.getLedgersInfoAsList().get(1).getLedgerId(), - ledger.getLedgersInfoAsList().get(2).getLedgerId())); + Assert.assertEquals(5, ledger.getLedgersInfoAsList().size()); + + if (null == sizeThreshold && timeThreshold != null && timeThreshold.equals(0L)) { + // All the inactive ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 4); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId(), + ledger.getLedgersInfoAsList().get(3).getLedgerId())); + } else if (sizeThreshold != null && sizeThreshold.equals(100L) && timeThreshold == null) { + // the last 2 ledgers won't be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId())); + } else if (sizeThreshold != null && sizeThreshold.equals(1L) + && timeThreshold != null && timeThreshold.equals(1L)) { + // the last 1 ledger wont be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 4); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId(), + ledger.getLedgersInfoAsList().get(3).getLedgerId())); + } else if (sizeThreshold != null && sizeThreshold.equals(0L) + && timeThreshold != null && timeThreshold.equals(0L)) { + // All the inactive ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 4); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId(), + ledger.getLedgersInfoAsList().get(3).getLedgerId())); + } + // then a manual offload can run and offload the one ledger under the threshold ledger.offloadPrefix(p); @@ -873,8 +1019,8 @@ public CompletableFuture offload(ReadHandle ledger, ledger.getLedgersInfoAsList().get(3).getLedgerId())); } - @Test - public void autoTriggerWhileManualInProgress() throws Exception { + @Test(dataProvider = "manualTriggerWhileAutoInProgress") + public void autoTriggerWhileManualInProgress(Long sizeThreshold, Long timeThreshold) throws Exception { CompletableFuture slowOffload = new CompletableFuture<>(); CountDownLatch offloadRunning = new CountDownLatch(1); MockLedgerOffloader offloader = new MockLedgerOffloader() { @@ -891,7 +1037,8 @@ public CompletableFuture offload(ReadHandle ledger, config.setMaxEntriesPerLedger(10); config.setRetentionTime(10, TimeUnit.MINUTES); config.setRetentionSizeInMB(10); - offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(100L); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(sizeThreshold); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInSeconds(timeThreshold); config.setLedgerOffloader(offloader); ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger", config); @@ -911,21 +1058,47 @@ public CompletableFuture offload(ReadHandle ledger, ledger.addEntry(buildEntry(10, "entry-" + i)); } + Assert.assertEquals(4, ledger.getLedgersInfoAsList().size()); + // allow the manual offload to complete slowOffload.complete(null); - assertEquals(cbPromise.join(), - PositionImpl.get(ledger.getLedgersInfoAsList().get(1).getLedgerId(), 0)); - - // auto trigger should eventually offload everything else over threshold - assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 2); - assertEquals(offloader.offloadedLedgers(), - Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), - ledger.getLedgersInfoAsList().get(1).getLedgerId())); + if (null == sizeThreshold && timeThreshold != null && timeThreshold.equals(0L)) { + // All the inactive ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId())); + } else if (sizeThreshold != null && sizeThreshold.equals(100L) && timeThreshold == null) { + // the last 2 ledgers won't be offloaded. + assertEquals(cbPromise.join(), + PositionImpl.get(ledger.getLedgersInfoAsList().get(1).getLedgerId(), 0)); + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 2); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId())); + } else if (sizeThreshold != null && sizeThreshold.equals(1L) + && timeThreshold != null && timeThreshold.equals(1L)) { + // the last 1 ledger wont be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId())); + } else if (sizeThreshold != null && sizeThreshold.equals(0L) + && timeThreshold != null && timeThreshold.equals(0L)) { + // All the inactive ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); + assertEquals(offloader.offloadedLedgers(), + Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), + ledger.getLedgersInfoAsList().get(1).getLedgerId(), + ledger.getLedgersInfoAsList().get(2).getLedgerId())); + } } - @Test - public void multipleAutoTriggers() throws Exception { + @Test(dataProvider = "testAutoTriggerOffload") + public void multipleAutoTriggers(Long sizeThreshold, Long timeThreshold) throws Exception { CompletableFuture slowOffload = new CompletableFuture<>(); CountDownLatch offloadRunning = new CountDownLatch(1); MockLedgerOffloader offloader = new MockLedgerOffloader() { @@ -942,7 +1115,8 @@ public CompletableFuture offload(ReadHandle ledger, config.setMaxEntriesPerLedger(10); config.setRetentionTime(10, TimeUnit.MINUTES); config.setRetentionSizeInMB(10); - offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(100L); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(sizeThreshold); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInSeconds(timeThreshold); config.setLedgerOffloader(offloader); ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger", config); @@ -951,7 +1125,7 @@ public CompletableFuture offload(ReadHandle ledger, for (int i = 0; i < 25; i++) { ledger.addEntry(buildEntry(10, "entry-" + i)); } - offloadRunning.await(); + offloadRunning.await(5, TimeUnit.SECONDS); // trigger a bunch more rolls. Eventually there will be 5 ledgers. // first 3 should be offloaded, 4th is 100bytes, 5th is 0 bytes. @@ -963,21 +1137,65 @@ public CompletableFuture offload(ReadHandle ledger, // allow the first offload to continue slowOffload.complete(null); - assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); - assertEquals(offloader.offloadedLedgers(), - Set.of(ledger.getLedgersInfoAsList().get(0).getLedgerId(), - ledger.getLedgersInfoAsList().get(1).getLedgerId(), - ledger.getLedgersInfoAsList().get(2).getLedgerId())); + Assert.assertEquals(5, ledger.getLedgersInfoAsList().size()); + + if (sizeThreshold == null && timeThreshold != null && timeThreshold == 0L) { + // All the inactive ledgers will be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 4); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), + Set.of(allLedgerIds.get(0), + allLedgerIds.get(1), + allLedgerIds.get(2), + allLedgerIds.get(3)) + ); + } else if (sizeThreshold != null && sizeThreshold == 100L && timeThreshold == null) { + // The last 2 ledgers won't be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 3); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), + Set.of(allLedgerIds.get(0), + allLedgerIds.get(1), + allLedgerIds.get(2)) + ); + } else if (sizeThreshold != null && sizeThreshold == -1L && timeThreshold == null) { + // Offloading is disabled, no ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 0); + assertEquals(offloader.offloadedLedgers().size(), 0); + } else if (sizeThreshold == null && timeThreshold == null) { + // Offloading is disabled, no ledgers will be offloaded. + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 0); + assertEquals(offloader.offloadedLedgers().size(), 0); + } else if (sizeThreshold != null && sizeThreshold == 1L && timeThreshold != null && timeThreshold == 1L) { + // All the inactive ledgers will be offloaded + assertEventuallyTrue(() -> offloader.offloadedLedgers().size() == 4); + List allLedgerIds = ledger.getLedgersInfoAsList().stream().map(LedgerInfo::getLedgerId).toList(); + assertEquals(offloader.offloadedLedgers(), + Set.of(allLedgerIds.get(0), + allLedgerIds.get(1), + allLedgerIds.get(2), + allLedgerIds.get(3)) + ); + } } - @Test - public void offloadAsSoonAsClosed() throws Exception { + @DataProvider(name = "offloadAsSoonAsClosed") + public Object[][] offloadAsSoonAsClosedProvider() { + return new Object[][]{ + {null, 0L}, + {0L, null} + }; + } + + @Test(dataProvider = "offloadAsSoonAsClosed") + public void offloadAsSoonAsClosed(Long sizeThreshold, Long timeThreshold) throws Exception { MockLedgerOffloader offloader = new MockLedgerOffloader(); ManagedLedgerConfig config = new ManagedLedgerConfig(); config.setMaxEntriesPerLedger(10); config.setRetentionTime(10, TimeUnit.MINUTES); config.setRetentionSizeInMB(10); - offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(0L); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(sizeThreshold); + offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInSeconds(timeThreshold); config.setLedgerOffloader(offloader); ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger", config); @@ -1044,6 +1262,7 @@ Set deletedOffloads() { OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_BYTES, + OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_SECONDS, OffloadPoliciesImpl.DEFAULT_OFFLOAD_DELETION_LAG_IN_MILLIS, OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY); diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclableTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclableTest.java index 4b4914e605c2b..f46e3ec36b24c 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclableTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionImplRecyclableTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionTest.java index 659796d92db3e..f2b1a7062b5e3 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/PositionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapperTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapperTest.java index aeb8f97bfaef6..c374b034054da 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapperTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapperTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java index 340acfea6a413..0386966ad2284 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImplTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImplTest.java new file mode 100644 index 0000000000000..4482e9944c0ce --- /dev/null +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ShadowManagedLedgerImplTest.java @@ -0,0 +1,158 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.bookkeeper.mledger.impl; + +import static org.testng.Assert.*; +import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.AsyncCallbacks; +import org.apache.bookkeeper.mledger.ManagedLedger; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; +import org.apache.bookkeeper.mledger.ManagedLedgerException; +import org.apache.bookkeeper.mledger.Position; +import org.apache.bookkeeper.test.MockedBookKeeperTestCase; +import org.awaitility.Awaitility; +import org.testng.annotations.Test; + +@Slf4j +public class ShadowManagedLedgerImplTest extends MockedBookKeeperTestCase { + + private ShadowManagedLedgerImpl openShadowManagedLedger(String name, String sourceName) + throws ManagedLedgerException, InterruptedException { + ManagedLedgerConfig config = new ManagedLedgerConfig(); + config.setShadowSourceName(sourceName); + Map properties = new HashMap<>(); + properties.put(ManagedLedgerConfig.PROPERTY_SOURCE_TOPIC_KEY, "source_topic"); + config.setProperties(properties); + ManagedLedger shadowML = factory.open(name, config); + assertTrue(shadowML instanceof ShadowManagedLedgerImpl); + return (ShadowManagedLedgerImpl) shadowML; + } + + @Test + public void testShadowWrites() throws Exception { + ManagedLedgerImpl sourceML = (ManagedLedgerImpl) factory.open("source_ML", new ManagedLedgerConfig() + .setMaxEntriesPerLedger(2) + .setRetentionTime(-1, TimeUnit.DAYS) + .setRetentionSizeInMB(-1)); + byte[] data = new byte[10]; + List positions = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + Position pos = sourceML.addEntry(data); + log.info("pos={}", pos); + positions.add(pos); + } + log.info("currentLedgerId:{}", sourceML.currentLedger.getId()); + assertEquals(sourceML.ledgers.size(), 3); + + ShadowManagedLedgerImpl shadowML = openShadowManagedLedger("shadow_ML", "source_ML"); + //After init, the state should be the same. + assertEquals(shadowML.ledgers.size(), 3); + assertEquals(sourceML.currentLedger.getId(), shadowML.currentLedger.getId()); + assertEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + + //Add new data to source ML + Position newPos = sourceML.addEntry(data); + + // The state should not be the same. + log.info("Source.LCE={},Shadow.LCE={}", sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + assertNotEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + + //Add new data to source ML, and a new ledger rolled + newPos = sourceML.addEntry(data); + assertEquals(sourceML.ledgers.size(), 4); + Awaitility.await().untilAsserted(()->assertEquals(shadowML.ledgers.size(), 4)); + log.info("Source.LCE={},Shadow.LCE={}", sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + Awaitility.await().untilAsserted(()->assertEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry)); + + {// test write entry with ledgerId < currentLedger + CompletableFuture future = new CompletableFuture<>(); + shadowML.asyncAddEntry(data, new AsyncCallbacks.AddEntryCallback() { + @Override + public void addComplete(Position position, ByteBuf entryData, Object ctx) { + future.complete(position); + } + + @Override + public void addFailed(ManagedLedgerException exception, Object ctx) { + future.completeExceptionally(exception); + } + }, positions.get(2)); + assertEquals(future.get(), positions.get(2)); + // LCE is not updated. + log.info("1.Source.LCE={},Shadow.LCE={}", sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + assertNotEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + } + + {// test write entry with ledgerId == currentLedger + newPos = sourceML.addEntry(data); + assertEquals(sourceML.ledgers.size(), 4); + assertNotEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + + CompletableFuture future = new CompletableFuture<>(); + shadowML.asyncAddEntry(data, new AsyncCallbacks.AddEntryCallback() { + @Override + public void addComplete(Position position, ByteBuf entryData, Object ctx) { + future.complete(position); + } + + @Override + public void addFailed(ManagedLedgerException exception, Object ctx) { + future.completeExceptionally(exception); + } + }, newPos); + assertEquals(future.get(), newPos); + // LCE should be updated. + log.info("2.Source.LCE={},Shadow.LCE={}", sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + assertEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + } + + {// test write entry with ledgerId > currentLedger + PositionImpl fakePos = PositionImpl.get(newPos.getLedgerId() + 1, newPos.getEntryId()); + + CompletableFuture future = new CompletableFuture<>(); + shadowML.asyncAddEntry(data, new AsyncCallbacks.AddEntryCallback() { + @Override + public void addComplete(Position position, ByteBuf entryData, Object ctx) { + future.complete(position); + } + + @Override + public void addFailed(ManagedLedgerException exception, Object ctx) { + future.completeExceptionally(exception); + } + }, fakePos); + //This write will be queued unit new ledger is rolled in source. + + newPos = sourceML.addEntry(data); // new ledger rolled. + newPos = sourceML.addEntry(data); + Awaitility.await().untilAsserted(() -> assertEquals(shadowML.ledgers.size(), 5)); + assertEquals(future.get(), fakePos); + // LCE should be updated. + log.info("3.Source.LCE={},Shadow.LCE={}", sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + assertEquals(sourceML.lastConfirmedEntry, shadowML.lastConfirmedEntry); + } + } +} \ No newline at end of file diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java new file mode 100644 index 0000000000000..2b69581ca2c73 --- /dev/null +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java @@ -0,0 +1,172 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.bookkeeper.mledger.impl.cache; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import lombok.extern.slf4j.Slf4j; +import org.testng.annotations.Test; + +@Slf4j +public class InflightReadsLimiterTest { + + @Test + public void testDisabled() throws Exception { + + InflightReadsLimiter limiter = new InflightReadsLimiter(0); + assertTrue(limiter.isDisabled()); + + limiter = new InflightReadsLimiter(-1); + assertTrue(limiter.isDisabled()); + + limiter = new InflightReadsLimiter(1); + assertFalse(limiter.isDisabled()); + } + + @Test + public void testBasicAcquireRelease() throws Exception { + InflightReadsLimiter limiter = new InflightReadsLimiter(100); + assertEquals(100, limiter.getRemainingBytes()); + InflightReadsLimiter.Handle handle = limiter.acquire(100, null); + assertEquals(0, limiter.getRemainingBytes()); + assertTrue(handle.success); + assertEquals(handle.acquiredPermits, 100); + assertEquals(1, handle.trials); + limiter.release(handle); + assertEquals(100, limiter.getRemainingBytes()); + } + + @Test + public void testNotEnoughPermits() throws Exception { + InflightReadsLimiter limiter = new InflightReadsLimiter(100); + assertEquals(100, limiter.getRemainingBytes()); + InflightReadsLimiter.Handle handle = limiter.acquire(100, null); + assertEquals(0, limiter.getRemainingBytes()); + assertTrue(handle.success); + assertEquals(handle.acquiredPermits, 100); + assertEquals(1, handle.trials); + + InflightReadsLimiter.Handle handle2 = limiter.acquire(100, null); + assertEquals(0, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 0); + assertEquals(1, handle2.trials); + + limiter.release(handle); + assertEquals(100, limiter.getRemainingBytes()); + + handle2 = limiter.acquire(100, handle2); + assertEquals(0, limiter.getRemainingBytes()); + assertTrue(handle2.success); + assertEquals(handle2.acquiredPermits, 100); + assertEquals(2, handle2.trials); + + limiter.release(handle2); + assertEquals(100, limiter.getRemainingBytes()); + + } + + @Test + public void testPartialAcquire() throws Exception { + InflightReadsLimiter limiter = new InflightReadsLimiter(100); + assertEquals(100, limiter.getRemainingBytes()); + + InflightReadsLimiter.Handle handle = limiter.acquire(30, null); + assertEquals(70, limiter.getRemainingBytes()); + assertTrue(handle.success); + assertEquals(handle.acquiredPermits, 30); + assertEquals(1, handle.trials); + + InflightReadsLimiter.Handle handle2 = limiter.acquire(100, null); + assertEquals(0, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 70); + assertEquals(1, handle2.trials); + + limiter.release(handle); + + handle2 = limiter.acquire(100, handle2); + assertEquals(0, limiter.getRemainingBytes()); + assertTrue(handle2.success); + assertEquals(handle2.acquiredPermits, 100); + assertEquals(2, handle2.trials); + + limiter.release(handle2); + assertEquals(100, limiter.getRemainingBytes()); + + } + + @Test + public void testTooManyTrials() throws Exception { + InflightReadsLimiter limiter = new InflightReadsLimiter(100); + assertEquals(100, limiter.getRemainingBytes()); + + InflightReadsLimiter.Handle handle = limiter.acquire(30, null); + assertEquals(70, limiter.getRemainingBytes()); + assertTrue(handle.success); + assertEquals(handle.acquiredPermits, 30); + assertEquals(1, handle.trials); + + InflightReadsLimiter.Handle handle2 = limiter.acquire(100, null); + assertEquals(0, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 70); + assertEquals(1, handle2.trials); + + handle2 = limiter.acquire(100, handle2); + assertEquals(0, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 70); + assertEquals(2, handle2.trials); + + handle2 = limiter.acquire(100, handle2); + assertEquals(0, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 70); + assertEquals(3, handle2.trials); + + handle2 = limiter.acquire(100, handle2); + assertEquals(0, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 70); + assertEquals(4, handle2.trials); + + // too many trials, start from scratch + handle2 = limiter.acquire(100, handle2); + assertEquals(70, limiter.getRemainingBytes()); + assertFalse(handle2.success); + assertEquals(handle2.acquiredPermits, 0); + assertEquals(1, handle2.trials); + + limiter.release(handle); + + handle2 = limiter.acquire(100, handle2); + assertEquals(0, limiter.getRemainingBytes()); + assertTrue(handle2.success); + assertEquals(handle2.acquiredPermits, 100); + assertEquals(2, handle2.trials); + + limiter.release(handle2); + assertEquals(100, limiter.getRemainingBytes()); + + } + +} diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManagerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManagerTest.java index f6d3ac881568e..6f573ff8d75c8 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManagerTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/PendingReadsManagerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,12 +18,14 @@ */ package org.apache.bookkeeper.mledger.impl.cache; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.api.ReadHandle; -import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.Entry; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.mledger.ManagedLedgerException; import org.apache.bookkeeper.mledger.Position; import org.apache.bookkeeper.mledger.impl.EntryImpl; @@ -59,14 +61,14 @@ public class PendingReadsManagerTest { static final Object CTX = "foo"; static final Object CTX2 = "far"; static final long ledgerId = 123414L; - OrderedExecutor orderedExecutor; + ExecutorService orderedExecutor; PendingReadsManagerTest() { } @BeforeClass(alwaysRun = true) void before() { - orderedExecutor = OrderedExecutor.newBuilder().build(); + orderedExecutor = Executors.newSingleThreadExecutor(); } @AfterClass(alwaysRun = true) @@ -80,12 +82,19 @@ void after() { RangeEntryCacheImpl rangeEntryCache; PendingReadsManager pendingReadsManager; + InflightReadsLimiter inflighReadsLimiter; ReadHandle lh; ManagedLedgerImpl ml; @BeforeMethod(alwaysRun = true) void setupMocks() { rangeEntryCache = mock(RangeEntryCacheImpl.class); + ManagedLedgerConfig config = new ManagedLedgerConfig(); + config.setReadEntryTimeoutSeconds(10000); + when(rangeEntryCache.getName()).thenReturn("my-topic"); + when(rangeEntryCache.getManagedLedgerConfig()).thenReturn(config); + inflighReadsLimiter = new InflightReadsLimiter(0); + when(rangeEntryCache.getPendingReadsLimiter()).thenReturn(inflighReadsLimiter); pendingReadsManager = new PendingReadsManager(rangeEntryCache); doAnswer(new Answer() { @Override diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadUtilsTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadUtilsTest.java index bcb1700b7dee4..798dfda9d890e 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadUtilsTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadUtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.bookkeeper.mledger.offload; import org.apache.bookkeeper.mledger.proto.MLDataFormats; diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadersCacheTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadersCacheTest.java index 5431a86481204..78fe1bdb3b033 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadersCacheTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/offload/OffloadersCacheTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/CallbackMutexTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/CallbackMutexTest.java index 3d20c0ff495cc..ae3dbad6368c8 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/CallbackMutexTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/CallbackMutexTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/MockClock.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/MockClock.java index b74bec3e6d082..8a419d53236cd 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/MockClock.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/MockClock.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtilTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtilTest.java index 880d6cbef4333..088220cd35e5f 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtilTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/PositionAckSetUtilTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/RangeCacheTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/RangeCacheTest.java index 341a4928cc798..8ce0db4ac4caa 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/RangeCacheTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/RangeCacheTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java index 12efbb054ded6..cb0fd2aa090b0 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/ThrowableToStringUtil.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/ThrowableToStringUtil.java index d7540ad30ca8b..14bea7a7e6d39 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/ThrowableToStringUtil.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/ThrowableToStringUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java index 5518838be37a9..c889f94b60801 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -58,6 +58,7 @@ import org.apache.bookkeeper.conf.TestBKConfiguration; import org.apache.bookkeeper.meta.zk.ZKMetadataDriverBase; import org.apache.bookkeeper.metastore.InMemoryMetaStore; +import org.apache.bookkeeper.mledger.ManagedLedger; import org.apache.bookkeeper.net.BookieId; import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.proto.BookieServer; @@ -848,4 +849,14 @@ public TestStatsProvider getStatsProvider(int index) throws Exception { return servers.get(index).getStatsProvider(); } + public static void closeManagedLedgerWithRetry(ManagedLedger closeable){ + Awaitility.await().until(() -> { + try { + closeable.close(); + return true; + } catch (Exception ex){ + return false; + } + }); + } } diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java b/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java index 1e960c32bf678..e2101268b09e6 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java b/managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java index 6f9d04d9eb0b3..b925334d65c56 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pom.xml b/pom.xml index 8f49987d96555..626c0b7ce46cf 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ flexible messaging model and an intuitive client API. 4 false 1 - + /tmp apachepulsar false @@ -118,7 +118,7 @@ flexible messaging model and an intuitive client API. 1.21 - 4.15.1 + 4.15.3 3.8.0 1.5.0 1.10.0 @@ -126,7 +126,7 @@ flexible messaging model and an intuitive client API. 4.1.12.1 5.1.0 4.1.77.Final - 2.0.52.Final + 0.0.15.Final 9.4.48.v20220622 2.5.2 2.34 @@ -138,8 +138,9 @@ flexible messaging model and an intuitive client API. 4.4 2.18.0 1.69 - 1.0.2 - 2.13.4 + 1.0.6 + 1.0.2.3 + 2.13.4.20221013 0.9.11 1.6.2 8.37 @@ -174,10 +175,10 @@ flexible messaging model and an intuitive client API. 3.3.3 2.4.7 1.2.4 - 8.1.0 + 8.5.2 363 2.13 - 1.9.5.Final + 1.9.7.Final 42.5.0 8.0.30 0.11.1 @@ -199,14 +200,14 @@ flexible messaging model and an intuitive client API. 2.1 2.1.9 3.1.0 - 2.9.1 + 3.1.2 0.9.0 2.14.6 3.21.0 0.9.1 2.1.0 3.18.1 - 1.18.22 + 1.18.24 1.3.2 2.3.1 1.2.0 @@ -234,13 +235,13 @@ flexible messaging model and an intuitive client API. 2.0.6 - 1.17.2 + 1.17.6 2.2 3.2.13 1.1.1 - 7.3.0 + 7.6.1 3.12.4 3.25.0-GA 1.5.0 @@ -248,11 +249,12 @@ flexible messaging model and an intuitive client API. 4.2.0 1.2.22 1.5.1 + 2.33.2 0.6.1 3.0.0 - 4.0.rc2 + 4.1 1.0 3.1.0 @@ -282,6 +284,7 @@ flexible messaging model and an intuitive client API. 7.1.0 0.9.15 1.6.1 + 1.18.20.0 rename-netty-native-libs.sh @@ -290,6 +293,12 @@ flexible messaging model and an intuitive client API. + + org.jline + jline + ${jline3.version} + + org.asynchttpclient async-http-client @@ -624,15 +633,26 @@ flexible messaging model and an intuitive client API. - io.netty - netty-tcnative-boringssl-static - ${netty-tc-native.version} + io.netty.incubator + netty-incubator-transport-classes-io_uring + ${netty-iouring.version} - - io.netty - netty-codec-haproxy - ${netty.version} + io.netty.incubator + netty-incubator-transport-native-io_uring + ${netty-iouring.version} + + + io.netty.incubator + netty-incubator-transport-native-io_uring + ${netty-iouring.version} + linux-x86_64 + + + io.netty.incubator + netty-incubator-transport-native-io_uring + ${netty-iouring.version} + linux-aarch_64 @@ -683,6 +703,12 @@ flexible messaging model and an intuitive client API. ${commons-io.version} + + org.apache.commons + commons-text + ${commons-text.version} + + org.slf4j slf4j-api @@ -1404,13 +1430,6 @@ flexible messaging model and an intuitive client API. org.apache.maven.plugins maven-checkstyle-plugin - - - org.apache.pulsar - buildtools - ${project.version} - - org.apache.maven.plugins @@ -1548,7 +1567,7 @@ flexible messaging model and an intuitive client API. - JAVADOC_STYLE + SLASHSTAR_STYLE JAVADOC_STYLE DOUBLESLASH_STYLE SCRIPT_STYLE @@ -1793,8 +1812,22 @@ flexible messaging model and an intuitive client API. none true + ${project.build.directory}/generated-sources/delombok + + org.projectlombok + lombok-maven-plugin + ${lombok.plugin.version} + + + generate-sources + + delombok + + + + maven-antrun-plugin ${maven-antrun-plugin.version} @@ -2058,7 +2091,6 @@ flexible messaging model and an intuitive client API. pulsar-common pulsar-broker-common pulsar-broker - pulsar-broker-shaded pulsar-client-api pulsar-client pulsar-client-shaded diff --git a/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java b/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java index 4a82e54962338..2e062b87a8325 100644 --- a/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java +++ b/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/package-info.java b/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/package-info.java index 025caadc09bbf..e6fd55da98e5c 100644 --- a/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/package-info.java +++ b/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-athenz/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenzTest.java b/pulsar-broker-auth-athenz/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenzTest.java index f1cc632ec0236..89ee5ca083079 100644 --- a/pulsar-broker-auth-athenz/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenzTest.java +++ b/pulsar-broker-auth-athenz/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenzTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java index 0e090c638c135..93f7d3f420699 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java index 92c026ce601cc..7f99d677a980d 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import java.io.IOException; diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationDataSource.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationDataSource.java index f023556bc2bac..1ace01aee0238 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationDataSource.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationDataSource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationState.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationState.java index f089ed77df715..862e171043ce7 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationState.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslAuthenticationState.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import java.util.concurrent.atomic.AtomicLong; diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleToken.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleToken.java index 7795fa75e76d9..452f1e352d2ca 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleToken.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleToken.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleTokenSigner.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleTokenSigner.java index 6ded38132e1ad..c979566e485ce 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleTokenSigner.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/SaslRoleTokenSigner.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/package-info.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/package-info.java index 025caadc09bbf..e6fd55da98e5c 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/package-info.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/MiniKdc.java b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/MiniKdc.java index 4d4cd3748309f..4e095a32b03bf 100644 --- a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/MiniKdc.java +++ b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/MiniKdc.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import java.io.File; diff --git a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/ProxySaslAuthenticationTest.java b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/ProxySaslAuthenticationTest.java index 66737c80de878..261efe680f862 100644 --- a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/ProxySaslAuthenticationTest.java +++ b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/ProxySaslAuthenticationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -25,6 +25,7 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Optional; @@ -36,7 +37,6 @@ import lombok.Cleanup; import org.apache.commons.io.FileUtils; -import org.apache.curator.shaded.com.google.common.collect.Maps; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.api.Authentication; import org.apache.pulsar.client.api.AuthenticationFactory; @@ -199,7 +199,7 @@ protected void setup() throws Exception { lookupUrl = new URI(pulsar.getBrokerServiceUrl()); // set admin auth, to verify admin web resources - Map clientSaslConfig = Maps.newHashMap(); + Map clientSaslConfig = new HashMap<>(); clientSaslConfig.put("saslJaasClientSectionName", "PulsarClient"); clientSaslConfig.put("serverType", "broker"); log.info("set client jaas section name: PulsarClient"); @@ -295,7 +295,7 @@ void testAuthentication() throws Exception { } private PulsarClient createProxyClient(String proxyServiceUrl, int numberOfConnections) throws PulsarClientException { - Map clientSaslConfig = Maps.newHashMap(); + Map clientSaslConfig = new HashMap<>(); clientSaslConfig.put("saslJaasClientSectionName", "PulsarClient"); clientSaslConfig.put("serverType", "proxy"); log.info("set client jaas section name: PulsarClient, serverType: proxy"); diff --git a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslAuthenticateTest.java b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslAuthenticateTest.java index f7fc4abaf808a..9965a2c085985 100644 --- a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslAuthenticateTest.java +++ b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslAuthenticateTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import static org.testng.Assert.assertFalse; @@ -29,6 +28,7 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Properties; @@ -40,7 +40,6 @@ import com.google.common.collect.ImmutableSet; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import org.apache.curator.shaded.com.google.common.collect.Maps; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.api.Authentication; import org.apache.pulsar.client.api.AuthenticationDataProvider; @@ -141,7 +140,7 @@ public static void startMiniKdc() throws Exception { Configuration.getConfiguration().refresh(); // Client config - Map clientSaslConfig = Maps.newHashMap(); + Map clientSaslConfig = new HashMap<>(); clientSaslConfig.put("saslJaasClientSectionName", "PulsarClient"); clientSaslConfig.put("serverType", "broker"); log.info("set client jaas section name: PulsarClient"); @@ -192,7 +191,7 @@ protected void setup() throws Exception { .authentication(authSasl)); // set admin auth, to verify admin web resources - Map clientSaslConfig = Maps.newHashMap(); + Map clientSaslConfig = new HashMap<>(); clientSaslConfig.put("saslJaasClientSectionName", "PulsarClient"); clientSaslConfig.put("serverType", "broker"); log.info("set client jaas section name: PulsarClient"); diff --git a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslServerTokenSignerTest.java b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslServerTokenSignerTest.java index f0381580deecd..b99c46c6573ea 100644 --- a/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslServerTokenSignerTest.java +++ b/pulsar-broker-auth-sasl/src/test/java/org/apache/pulsar/broker/authentication/SaslServerTokenSignerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import javax.naming.AuthenticationException; diff --git a/pulsar-broker-common/pom.xml b/pulsar-broker-common/pom.xml index ccebe3f6906c7..8146dc83fa8ba 100644 --- a/pulsar-broker-common/pom.xml +++ b/pulsar-broker-common/pom.xml @@ -73,7 +73,7 @@ org.bouncycastle bc-fips - ${bouncycastlefips.version} + ${bouncycastle.bc-fips.version} test diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java index 3354d823adc05..6602dfcd04970 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/ConfigurationStringUtil.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/ConfigurationStringUtil.java index 99736b4f2f4a8..2d6f77d7598ab 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/ConfigurationStringUtil.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/ConfigurationStringUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.bookie.rackawareness; import java.util.ArrayList; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicy.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicy.java index 9e6affbb7ef36..9e416985ec553 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicy.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/package-info.java index fd1f46466bbf9..18616b10ac599 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/BitRateUnit.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/BitRateUnit.java index 7e0d0dcfda1cc..8bf04d7c2c451 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/BitRateUnit.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/BitRateUnit.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ClassLoaderSwitcher.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ClassLoaderSwitcher.java index 787182ef012bc..55cb9198da2bc 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ClassLoaderSwitcher.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ClassLoaderSwitcher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/MetadataSessionExpiredPolicy.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/MetadataSessionExpiredPolicy.java index 5038912851177..97c37e902d4e3 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/MetadataSessionExpiredPolicy.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/MetadataSessionExpiredPolicy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java index 1fd1d0770213a..2235b9a7128b8 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java index 8ba741801043b..d7617ef277444 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -58,6 +58,7 @@ */ @Getter @Setter +@ToString public class ServiceConfiguration implements PulsarConfiguration { @Category @@ -643,12 +644,14 @@ The delayed message index bucket time step(in seconds) in per bucket snapshot se @FieldContext( category = CATEGORY_POLICIES, + dynamic = true, doc = "Allow forced deletion of tenants. Default is false." ) private boolean forceDeleteTenantAllowed = false; @FieldContext( category = CATEGORY_POLICIES, + dynamic = true, doc = "Allow forced deletion of namespaces. Default is false." ) private boolean forceDeleteNamespaceAllowed = false; @@ -1861,6 +1864,12 @@ The delayed message index bucket time step(in seconds) in per bucket snapshot se @FieldContext(category = CATEGORY_STORAGE_ML, doc = "Whether we should make a copy of the entry payloads when " + "inserting in cache") private boolean managedLedgerCacheCopyEntries = false; + + @FieldContext(category = CATEGORY_STORAGE_ML, doc = "Maximum buffer size for bytes read from storage." + + " This is the memory retained by data read from storage (or cache) until it has been delivered to the" + + " Consumer Netty channel. Use O to disable") + private long managedLedgerMaxReadsInFlightSizeInMB = 0; + @FieldContext( category = CATEGORY_STORAGE_ML, dynamic = true, @@ -1960,6 +1969,11 @@ The delayed message index bucket time step(in seconds) in per bucket snapshot se doc = "The number of bytes before triggering automatic offload to long term storage" ) private long managedLedgerOffloadAutoTriggerSizeThresholdBytes = -1L; + @FieldContext( + category = CATEGORY_STORAGE_OFFLOADING, + doc = "The threshold to triggering automatic offload to long term storage" + ) + private long managedLedgerOffloadThresholdInSeconds = -1L; @FieldContext( category = CATEGORY_STORAGE_ML, doc = "Max number of entries to append to a cursor ledger" @@ -2658,6 +2672,7 @@ The delayed message index bucket time step(in seconds) in per bucket snapshot se private boolean splitTopicAndPartitionLabelInPrometheus = false; @FieldContext( + dynamic = true, category = CATEGORY_METRICS, doc = "Enable expose the broker bundles metrics." ) diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java index 7507181f34bdd..b5a0af97f8f10 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ShutdownService.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ShutdownService.java index 37aa365a2ab8e..69ac157aa1265 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ShutdownService.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ShutdownService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataCommand.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataCommand.java index 0bd03d5daf686..9dd666b4cb1bd 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataCommand.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataCommand.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttp.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttp.java index f48dbc263e0e6..876dfb87fc582 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttp.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttp.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttps.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttps.java index ec4dc292c13ce..31328df35d2eb 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttps.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataHttps.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSource.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSource.java index 453fafbab3244..4a159b16e3fd8 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSource.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java index f6723609908ac..69ef526012daa 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProvider.java index 840b5cb057db6..9e7b25930e0be 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProvider.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java index 9f6bacf729891..3c4759fec7da9 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import java.io.BufferedReader; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderList.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderList.java index f921a6f1e0918..f3712168104ba 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderList.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderList.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java index 4cfcad6a68695..47e5316bce9ce 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java index 9cc220aa8c75b..7fe20d5c5421a 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationService.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationService.java index 6fe6c5f8e7ca7..c63f5505e5974 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationService.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -87,7 +87,6 @@ public AuthenticationService(ServiceConfiguration conf) throws PulsarServerExcep public String authenticateHttpRequest(HttpServletRequest request, AuthenticationDataSource authData) throws AuthenticationException { - AuthenticationException authenticationException = null; String authMethodName = request.getHeader(AuthenticationFilter.PULSAR_AUTH_METHOD_NAME); if (authMethodName != null) { @@ -108,8 +107,6 @@ public String authenticateHttpRequest(HttpServletRequest request, Authentication LOG.debug("Authentication failed for provider " + providerToUse.getAuthMethodName() + " : " + e.getMessage(), e); } - // Store the exception so we can throw it later instead of a generic one - authenticationException = e; throw e; } } else { @@ -133,11 +130,7 @@ public String authenticateHttpRequest(HttpServletRequest request, Authentication return anonymousUserRole; } // If at least a provider was configured, then the authentication needs to be provider - if (authenticationException != null) { - throw authenticationException; - } else { - throw new AuthenticationException("Authentication required"); - } + throw new AuthenticationException("Authentication required"); } else { // No authentication required return ""; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java index 0e5dcc3121f27..469a3fbe3e9de 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import java.util.concurrent.CompletableFuture; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/OneStageAuthenticationState.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/OneStageAuthenticationState.java index 6e5b889ff3c9c..a355ce959562f 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/OneStageAuthenticationState.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/OneStageAuthenticationState.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.authentication; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java index b4ae44e200d01..0a095235f3cb3 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/AuthenticationMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/package-info.java index 068c693b9c395..acfc53788ee10 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/metrics/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/package-info.java index e4432e5951756..3104a84ec7f22 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/AuthTokenUtils.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/AuthTokenUtils.java index 12063d3f0528e..cb917a9e0bf00 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/AuthTokenUtils.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/AuthTokenUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/package-info.java index 5492a2dea9d6c..4bdf8e66bc47c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/utils/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java index 12a54d502f4cb..9adc212019d63 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationService.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationService.java index 3baaf57990a9a..9e9e2e832385c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationService.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java index d77288e30850f..fa613245cfa27 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java index de586345fd0da..a43591dd1d94f 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/PulsarAuthorizationProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -554,6 +554,7 @@ public CompletableFuture allowTopicOperationAsync(TopicName topicName, case OFFLOAD: case UNLOAD: case DELETE_METADATA: + case UPDATE_METADATA: case ADD_BUNDLE_RANGE: case GET_BUNDLE_RANGE: case DELETE_BUNDLE_RANGE: diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/package-info.java index 26c9419d8e36e..d17d8d91f0adb 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java index ad820b36aebee..7fc9ea8d3f1a2 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/package-info.java index 83e11fdf2c61b..5d8fe448344ef 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/ConnectionController.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/ConnectionController.java index 609d0cc19071c..fcf010a04816c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/ConnectionController.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/ConnectionController.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/package-info.java index 9483f3427982c..db36dc5e66e19 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/limiter/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/package-info.java index cf095a74f8d9b..4df99bf52ada3 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BaseResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BaseResources.java index 31409e3789076..e705581a9d54d 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BaseResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BaseResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BookieResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BookieResources.java index 32c0e7a395e80..23befce463877 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BookieResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BookieResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BrokerResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BrokerResources.java index 9ba2f6ef51b88..77fc2f3e69f8c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BrokerResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/BrokerResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java index 5bde79e632113..843cec7b20594 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/DynamicConfigurationResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/DynamicConfigurationResources.java index c142e0896a132..2c9823bd84e27 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/DynamicConfigurationResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/DynamicConfigurationResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LoadManagerReportResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LoadManagerReportResources.java index acc5e23869d12..c3ecc1cf3fac0 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LoadManagerReportResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LoadManagerReportResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LocalPoliciesResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LocalPoliciesResources.java index 6432bfbac7835..797eb089cbefb 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LocalPoliciesResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/LocalPoliciesResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/MetadataStoreCacheLoader.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/MetadataStoreCacheLoader.java index eada0db382dcb..43376f4055063 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/MetadataStoreCacheLoader.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/MetadataStoreCacheLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java index 2223e951f6628..899cf01bc4bfc 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -26,18 +26,17 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Collectors; import lombok.Getter; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.TopicDomain; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.partition.PartitionedTopicMetadata; -import org.apache.pulsar.common.policies.data.LocalPolicies; import org.apache.pulsar.common.policies.data.NamespaceIsolationDataImpl; import org.apache.pulsar.common.policies.data.Policies; import org.apache.pulsar.common.policies.impl.NamespaceIsolationPolicies; import org.apache.pulsar.common.util.Codec; -import org.apache.pulsar.metadata.api.MetadataCache; import org.apache.pulsar.metadata.api.MetadataStore; import org.apache.pulsar.metadata.api.MetadataStoreException; import org.slf4j.Logger; @@ -51,23 +50,15 @@ public class NamespaceResources extends BaseResources { private final PartitionedTopicResources partitionedTopicResources; private final MetadataStore configurationStore; - private final MetadataCache localPoliciesCache; - private static final String POLICIES_READONLY_FLAG_PATH = "/admin/flags/policies-readonly"; private static final String NAMESPACE_BASE_PATH = "/namespace"; private static final String BUNDLE_DATA_BASE_PATH = "/loadbalance/bundle-data"; - public NamespaceResources(MetadataStore localStore, MetadataStore configurationStore, int operationTimeoutSec) { + public NamespaceResources(MetadataStore configurationStore, int operationTimeoutSec) { super(configurationStore, Policies.class, operationTimeoutSec); this.configurationStore = configurationStore; isolationPolicies = new IsolationPolicyResources(configurationStore, operationTimeoutSec); partitionedTopicResources = new PartitionedTopicResources(configurationStore, operationTimeoutSec); - - if (localStore != null) { - localPoliciesCache = localStore.getMetadataCache(LocalPolicies.class); - } else { - localPoliciesCache = null; - } } public CompletableFuture> listNamespacesAsync(String tenant) { @@ -295,6 +286,79 @@ public CompletableFuture clearPartitionedTopicTenantAsync(String tenant) { final String partitionedTopicPath = joinPath(PARTITIONED_TOPIC_PATH, tenant); return deleteIfExistsAsync(partitionedTopicPath); } + + public CompletableFuture markPartitionedTopicDeletedAsync(TopicName tn) { + if (tn.isPartitioned()) { + return CompletableFuture.completedFuture(null); + } + if (log.isDebugEnabled()) { + log.debug("markPartitionedTopicDeletedAsync {}", tn); + } + return updatePartitionedTopicAsync(tn, md -> { + md.deleted = true; + return md; + }); + } + + public CompletableFuture unmarkPartitionedTopicDeletedAsync(TopicName tn) { + if (tn.isPartitioned()) { + return CompletableFuture.completedFuture(null); + } + if (log.isDebugEnabled()) { + log.debug("unmarkPartitionedTopicDeletedAsync {}", tn); + } + return updatePartitionedTopicAsync(tn, md -> { + md.deleted = false; + return md; + }); + } + + public CompletableFuture isPartitionedTopicBeingDeletedAsync(TopicName tn) { + if (tn.isPartitioned()) { + tn = TopicName.get(tn.getPartitionedTopicName()); + } + return getPartitionedTopicMetadataAsync(tn) + .thenApply(mdOpt -> mdOpt.map(partitionedTopicMetadata -> partitionedTopicMetadata.deleted) + .orElse(false)); + } + + public CompletableFuture runWithMarkDeleteAsync(TopicName topic, + Supplier> supplier) { + CompletableFuture future = new CompletableFuture<>(); + + markPartitionedTopicDeletedAsync(topic).whenCompleteAsync((markResult, markExc) -> { + final boolean mdFound; + if (markExc != null) { + if (markExc.getCause() instanceof MetadataStoreException.NotFoundException) { + mdFound = false; + } else { + log.error("Failed to mark the topic {} as deleted", topic, markExc); + future.completeExceptionally(markExc); + return; + } + } else { + mdFound = true; + } + + supplier.get().whenComplete((deleteResult, deleteExc) -> { + if (deleteExc != null && mdFound) { + unmarkPartitionedTopicDeletedAsync(topic) + .thenRun(() -> future.completeExceptionally(deleteExc)) + .exceptionally(ex -> { + log.warn("Failed to unmark the topic {} as deleted", topic, ex); + future.completeExceptionally(deleteExc); + return null; + }); + } else if (deleteExc != null) { + future.completeExceptionally(deleteExc); + } else { + future.complete(deleteResult); + } + }); + }); + + return future; + } } // clear resource of `/loadbalance/bundle-data/{tenant}/{namespace}/` in metadata-store diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/PulsarResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/PulsarResources.java index 9cfeddd123d80..161a44703a703 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/PulsarResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/PulsarResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -60,8 +60,7 @@ public PulsarResources(MetadataStore localMetadataStore, MetadataStore configura if (configurationMetadataStore != null) { tenantResources = new TenantResources(configurationMetadataStore, operationTimeoutSec); clusterResources = new ClusterResources(configurationMetadataStore, operationTimeoutSec); - namespaceResources = new NamespaceResources(localMetadataStore, configurationMetadataStore, - operationTimeoutSec); + namespaceResources = new NamespaceResources(configurationMetadataStore, operationTimeoutSec); resourcegroupResources = new ResourceGroupResources(configurationMetadataStore, operationTimeoutSec); } else { tenantResources = null; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ResourceGroupResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ResourceGroupResources.java index 414bf4ffcfc35..578609b21958f 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ResourceGroupResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ResourceGroupResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TenantResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TenantResources.java index 87f48f7e682a4..f82ea0da2c04c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TenantResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TenantResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java index ee537431280f3..840ced0a1c1c4 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,8 +19,6 @@ package org.apache.pulsar.broker.resources; import static org.apache.pulsar.common.util.Codec.decode; -import java.util.EnumSet; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -30,6 +28,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.TopicDomain; import org.apache.pulsar.common.naming.TopicName; @@ -37,6 +36,7 @@ import org.apache.pulsar.metadata.api.Notification; import org.apache.pulsar.metadata.api.NotificationType; +@Slf4j public class TopicResources { private static final String MANAGED_LEDGER_PATH = "/managed-ledgers"; @@ -125,10 +125,14 @@ public CompletableFuture clearTenantPersistence(String tenant) { } void handleNotification(Notification notification) { + if (topicListeners.isEmpty()) { + return; + } if (notification.getPath().startsWith(MANAGED_LEDGER_PATH) - && EnumSet.of(NotificationType.Created, NotificationType.Deleted).contains(notification.getType())) { + && (notification.getType() == NotificationType.Created + || notification.getType() == NotificationType.Deleted)) { for (Map.Entry, Pattern> entry : - new HashMap<>(topicListeners).entrySet()) { + topicListeners.entrySet()) { Matcher matcher = entry.getValue().matcher(notification.getPath()); if (matcher.matches()) { TopicName topicName = TopicName.get( diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/package-info.java index 94cd53aed5797..e23a45fc39fd5 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java index c2aa40e030d80..4b0cf76f2276b 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsServlet.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsServlet.java index 1c3277d5ee480..136fe77d77aff 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsServlet.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsServlet.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -66,7 +66,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) { HttpServletResponse res = (HttpServletResponse) context.getResponse(); try { res.setStatus(HTTP_STATUS_OK_200); - res.setContentType("text/plain"); + res.setContentType("text/plain;charset=utf-8"); generateMetrics(cluster, res.getOutputStream()); } catch (Exception e) { long end = System.currentTimeMillis(); diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusRawMetricsProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusRawMetricsProvider.java index d2067766a41b7..fe232fc941b8c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusRawMetricsProvider.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusRawMetricsProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java index 3723fb4ff5c99..5289e0938e57b 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/BindAddressValidator.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/BindAddressValidator.java index 00313c6048cc9..f417e0b59b78d 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/BindAddressValidator.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/BindAddressValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/MultipleListenerValidator.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/MultipleListenerValidator.java index 05688f0660b18..780203371ecdc 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/MultipleListenerValidator.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/MultipleListenerValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/package-info.java index 09ccc74260cef..7f1cdeda66ffc 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/validator/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java index 6c69bce42685e..55265b21b3b1b 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/AuthenticationFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DisableDebugHttpMethodFilter.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DisableDebugHttpMethodFilter.java index 2bd68a7be0856..f51bd537f8769 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DisableDebugHttpMethodFilter.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DisableDebugHttpMethodFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandler.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandler.java index 3ebdbab761e35..af437e8c27f3f 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandler.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandler.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JettyRequestLogFactory.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JettyRequestLogFactory.java index 8b9b507ee8b01..e5daa5852b51f 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JettyRequestLogFactory.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JettyRequestLogFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JsonMapperProvider.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JsonMapperProvider.java index f4c4fc1837d9d..0aa2d01adf11e 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JsonMapperProvider.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/JsonMapperProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/RateLimitingFilter.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/RateLimitingFilter.java index b2c2b84bbdf79..502b691fa34b0 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/RateLimitingFilter.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/RateLimitingFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.web; import com.google.common.util.concurrent.RateLimiter; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/UnrecognizedPropertyExceptionMapper.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/UnrecognizedPropertyExceptionMapper.java index 6311157002425..6badf31bb1969 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/UnrecognizedPropertyExceptionMapper.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/UnrecognizedPropertyExceptionMapper.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java index c3cbe7a0ab6eb..a1d566e135cf6 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/package-info.java index 5f61532b031b6..1c201419df475 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlet.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlet.java index 21a00107c1bce..1ecf4c4e53943 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlet.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlet.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinition.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinition.java index b8c407420de48..4f68889a74499 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinition.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinition.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinitions.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinitions.java index b018c4ac6025b..e8ced486bfb57 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinitions.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletDefinitions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletMetadata.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletMetadata.java index 4138d4ea8bab0..87a531032a3d7 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletMetadata.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletMetadata.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java index f7df7aaf7c39d..d79dbc2c44f6c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoader.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoader.java index 9ebbf8cf260dc..c2b4b90073391 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoader.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java index 4feef4c7a6fbc..0046d28afa444 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java index 8c3b3b2b8c828..71f2737abb426 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /** * Pulsar additional servlet plugin. */ diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/BindAddress.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/BindAddress.java index a5b4aa20b3126..633462d0dbe22 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/BindAddress.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/BindAddress.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/Category.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/Category.java index 7a2c81e48f53c..5f3e01f526d7d 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/Category.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/Category.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/FieldContext.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/FieldContext.java index 3c0ffb36ebfd5..839e1f9929e84 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/FieldContext.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/FieldContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertiesContext.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertiesContext.java index 27f42775451ad..782e0d0749121 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertiesContext.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertiesContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertyContext.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertyContext.java index 59657e728b335..cc5bbc65bec6c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertyContext.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PropertyContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfiguration.java index 7dbbffadcfebd..59e2a4bc78d76 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfiguration.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfiguration.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java index b0479d8158857..66b8e042675e2 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/VipStatus.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/VipStatus.java index dcde2d02dd571..5e6a31b323f55 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/VipStatus.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/VipStatus.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/package-info.java index 7306dab9a3b7a..7e2494b1537a7 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/package-info.java index f01bd9198f568..05e3f33593f8c 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/JettySslContextFactory.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/JettySslContextFactory.java index 514fa4a07250e..46a86045995f9 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/JettySslContextFactory.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/JettySslContextFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/package-info.java index 8978699ff7926..4e9cc9273b2d1 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/jetty/tls/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkBookieRackAffinityMapping.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkBookieRackAffinityMapping.java index 35438afb7d99b..e7688f5b7470d 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkBookieRackAffinityMapping.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkBookieRackAffinityMapping.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java index 2855957395f06..f85c355726e16 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/package-info.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/package-info.java index 5e129c634444f..18f76f21e54d5 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/package-info.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/zookeeper/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMappingTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMappingTest.java index 8cbd0ebe9ca55..bbc0c9257fdaa 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMappingTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMappingTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java index 3ae5fd2b0eaaa..5ca946bbbb501 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/BitRateUnitTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/BitRateUnitTest.java index 14adcc7027334..60f009a27ca2f 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/BitRateUnitTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/BitRateUnitTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java index fa72af76e8a34..723fde7083d38 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderListTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderListTest.java index 7d7e0ca92f61a..98deee514a962 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderListTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderListTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java index c7ab278130021..82e8a8f87ee55 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java index ca80ee3aa3a38..7e329d14307c7 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/NamespaceResourcesTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/NamespaceResourcesTest.java index ba755572c214e..85f54a76dc3c4 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/NamespaceResourcesTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/NamespaceResourcesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.resources; import static org.testng.Assert.assertFalse; diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/TopicResourcesTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/TopicResourcesTest.java index cfafc5107d2de..9a0fe5b9fce34 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/TopicResourcesTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/resources/TopicResourcesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java index 9bbfa5d771438..0ac3e22197606 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java index 3723fb4ff5c99..5289e0938e57b 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/BindAddressValidatorTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/BindAddressValidatorTest.java index ea36074a259a6..2e354acbdc823 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/BindAddressValidatorTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/BindAddressValidatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/MultipleListenerValidatorTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/MultipleListenerValidatorTest.java index 5ec3858bc1bc2..5f5c536c93c86 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/MultipleListenerValidatorTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/validator/MultipleListenerValidatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandlerTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandlerTest.java index 2d7b8e7e78340..adf2b621d5381 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandlerTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/DynamicSkipUnknownPropertyHandlerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java index c1929eb09208e..e9d91dde26d7d 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletUtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java index 07ae5ec6790ad..2392b5e0528f5 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java index 0d5e6f5262be9..dd5045b1b09eb 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -52,10 +52,8 @@ public void testEmptyStringAsExtractionDirectory() throws IOException { AdditionalServletWithClassLoader as1 = mock(AdditionalServletWithClassLoader.class); AdditionalServletWithClassLoader as2 = mock(AdditionalServletWithClassLoader.class); - String originalTmpDirectory = System.getProperty("java.io.tmpdir"); try (MockedStatic utils = mockStatic(AdditionalServletUtils.class)) { - String tmpDirectory = "/my/tmp/directory"; - System.setProperty("java.io.tmpdir", tmpDirectory); + String tmpDirectory = System.getProperty("java.io.tmpdir"); utils.when(() -> AdditionalServletUtils.searchForServlets( "/additionalServletDirectory", tmpDirectory)).thenReturn(definitions); utils.when(() -> AdditionalServletUtils.load(asm1, tmpDirectory)).thenReturn(as1); @@ -65,8 +63,6 @@ public void testEmptyStringAsExtractionDirectory() throws IOException { Assert.assertEquals(servlets.getServlets().get("AS1"), as1); Assert.assertEquals(servlets.getServlets().get("AS2"), as2); - } finally { - System.setProperty("java.io.tmpdir", originalTmpDirectory); } } diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServlet.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServlet.java index 05b955c31c975..22b8fa5ea35f5 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServlet.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServlet.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoaderTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoaderTest.java index 983816ec4f02f..afbec583b4d50 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoaderTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoaderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryTest.java index c1816674880a7..bf91dab14fe1f 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.jetty.tls; import com.google.common.io.Resources; diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryWithKeyStoreTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryWithKeyStoreTest.java index c79ea6103d8e5..1d41cd3684124 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryWithKeyStoreTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/jetty/tls/JettySslContextFactoryWithKeyStoreTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml deleted file mode 100644 index c3dfc658aad88..0000000000000 --- a/pulsar-broker-shaded/pom.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - 4.0.0 - - - org.apache.pulsar - pulsar - 2.11.0-SNAPSHOT - .. - - - pulsar-broker-shaded - jar - Pulsar Shaded Broker - - - - ${project.groupId} - pulsar-broker - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - prepare-package - - unpack - - - - - org.asynchttpclient - async-http-client - ${asynchttpclient.version} - jar - true - org/asynchttpclient/config/ahc-default.properties - ${project.build.directory}/classes - - - - - - - - - maven-antrun-plugin - - - shade-ahc-properties - prepare-package - - run - - - - - - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - ${shadePluginPhase} - - shade - - - true - true - false - - - - org.apache.pulsar:* - org.apache.bookkeeper*:* - commons-*:* - org.apache.commons:* - org.asynchttpclient:* - org.reactivestreams:reactive-streams - com.typesafe.netty:netty-reactive-streams - org.javassist:javassist - com.google.*:* - com.fasterxml.jackson.*:* - io.netty:* - org.apache.pulsar:pulsar-common - org.apache.bookkeeper:circe-checksum - com.yahoo.datasketches:sketches-core - - javax.ws.rs:* - javax.websocket:* - org.glassfish.hk2*:* - org.eclipse.jetty*:* - net.java.dev.jna:* - com.carrotsearch:* - io.prometheus:* - io.perfmark:* - com.github.ben-manes.caffeine:* - org.glassfish.jersey.*:* - org.rocksdb:* - org.apache.bookkeeper:* - org.apache.zookeeper:* - jline:* - javax.servlet:* - - com.beust:* - io.swagger:* - joda-time:* - org.yaml:snakeyaml - org.hdrhistogram:* - com.github.zafarkhaja:java-semver - org.apache.avro:avro - - com.thoughtworks.paranamer:paranamer - org.apache.commons:commons-compress - org.tukaani:xz - - - - - org.apache.pulsar:pulsar-client-original - - ** - - - - org/bouncycastle/** - - - - - - org.asynchttpclient - org.apache.pulsar.shade.org.asynchttpclient - - - org.apache.commons - org.apache.pulsar.shade.org.apache.commons - - - com.google - org.apache.pulsar.shade.com.google - - - com.fasterxml.jackson - org.apache.pulsar.shade.com.fasterxml.jackson - - - io.netty - org.apache.pulsar.shade.io.netty - - - org.apache.pulsar.common - org.apache.pulsar.shade.org.apache.pulsar.common - - - org.apache.pulsar.policies - org.apache.pulsar.shade.org.apache.pulsar.policies - - - org.apache.pulsar.checksum - org.apache.pulsar.shade.org.apache.pulsar.checksum - - - com.yahoo.datasketches - org.apache.pulsar.shade.com.yahoo.datasketches - - - com.yahoo.sketches - org.apache.pulsar.shade.com.yahoo.sketches - - - - org.apache.zookeeper - org.apache.pulsar.shade.org.apache.zookeeper - - - org.apache.jute - org.apache.pulsar.shade.org.apache.jute - - - com.typesafe - org.apache.pulsar.shade.com.typesafe - - - org.eclipse.jetty - org.apache.pulsar.shade.org.eclipse.jetty - - - javax.websocket - org.apache.pulsar.shade.javax.websocket - - - org.glassfish - org.apache.pulsar.shade.org.glassfish - - - org.apache.bookkeeper - org.apache.pulsar.shade.org.apache.bookkeeper - - - org.rocksdb - org.apache.pulsar.shade.org.rocksdb - - - com.sun.jna - org.apache.pulsar.shade.com.sun.jna - - - com.carrotsearch - org.apache.pulsar.shade.com.carrotsearch - - - javax.servlet - org.apache.pulsar.shade.javax.servlet - - - com.github - org.apache.pulsar.shade.com.github - - - jline - org.apache.pulsar.shade.jline - - - com.sun - org.apache.pulsar.shade.com.sun - - - jersey - org.apache.pulsar.shade.jersey - - - javax.ws - org.apache.pulsar.shade.javax.ws - - - javax.inject - org.apache.pulsar.shade.javax.inject - - - org.jvnet - org.apache.pulsar.shade.org.jvnet - - - com.beust - org.apache.pulsar.shade.com.beust - - - com.wordnik - org.apache.pulsar.shade.com.worknik - - - io.prometheus - org.apache.pulsar.shade.io.prometheus - - - io.swagger - org.apache.pulsar.shade.io.swagger - - - org.joda - org.apache.pulsar.shade.org.joda - - - org.yaml - org.apache.pulsar.shade.org.yaml - - - org.HdrHistogram - org.apache.pulsar.shade.org.HdrHistogram - - - com.ea - org.apache.pulsar.shade.com.ea - - - javassist - org.apache.pulsar.shade.javassist - - - org.reactivestreams - org.apache.pulsar.shade.org.reactivestreams - - - org.aopalliance - org.apache.pulsar.shade.org.aopalliance - - - com.wordnik - org.apache.pulsar.shade.com.worknik - - - org.apache.avro - org.apache.pulsar.shade.org.apache.avro - - - - org.codehaus.jackson - org.apache.pulsar.shade.org.codehaus.jackson - - - com.thoughtworks.paranamer - org.apache.pulsar.shade.com.thoughtworks.paranamer - - - org.tukaani - org.apache.pulsar.shade.org.tukaani - - - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - rename-epoll-library - package - - exec - - - ${project.parent.basedir}/src/${rename.netty.native.libs} - - ${project.artifactId} - - - - - - - - diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index a8e39ef7d2401..8d0f0e7547fc3 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -857,7 +857,7 @@ - + diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java index 5f574356bf134..e5e50985491e3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java index 1b4edf8686eac..6b0b4ed8d730c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataTeardown.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataTeardown.java index d0ba5c47f7502..cbbf909cdf7fa 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataTeardown.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataTeardown.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarInitialNamespaceSetup.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarInitialNamespaceSetup.java index bb27be60b3512..c4020546d1c6c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarInitialNamespaceSetup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarInitialNamespaceSetup.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java index e0ebcc7657c2c..06147a1fb3b0f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -23,6 +23,7 @@ import com.beust.jcommander.Parameter; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Sets; +import io.netty.util.internal.PlatformDependent; import java.io.File; import java.nio.file.Paths; import java.util.Optional; @@ -434,16 +435,18 @@ public void close() { } } - private void startBookieWithMetadataStore() throws Exception { + @VisibleForTesting + void startBookieWithMetadataStore() throws Exception { if (StringUtils.isBlank(metadataStoreUrl)){ log.info("Starting BK with RocksDb metadata store"); metadataStoreUrl = "rocksdb://" + Paths.get(metadataDir).toAbsolutePath(); } else { - log.info("Starting BK with metadata store:", metadataStoreUrl); + log.info("Starting BK with metadata store: {}", metadataStoreUrl); } ServerConfiguration bkServerConf = new ServerConfiguration(); bkServerConf.loadConf(new File(configFile).toURI().toURL()); + calculateCacheSize(bkServerConf); bkCluster = BKCluster.builder() .baseServerConfiguration(bkServerConf) .metadataServiceUri(metadataStoreUrl) @@ -460,7 +463,7 @@ private void startBookieWithZookeeper() throws Exception { log.info("Starting BK & ZK cluster"); ServerConfiguration bkServerConf = new ServerConfiguration(); bkServerConf.loadConf(new File(configFile).toURI().toURL()); - + calculateCacheSize(bkServerConf); // Start LocalBookKeeper bkEnsemble = new LocalBookkeeperEnsemble( this.getNumOfBk(), this.getZkPort(), this.getBkPort(), this.getStreamStoragePort(), this.getZkDir(), @@ -469,6 +472,22 @@ private void startBookieWithZookeeper() throws Exception { config.setMetadataStoreUrl("zk:127.0.0.1:" + zkPort); } + private void calculateCacheSize(ServerConfiguration bkServerConf) { + String writeCacheMaxSizeMb = "dbStorage_writeCacheMaxSizeMb"; + String readAheadCacheMaxSizeMb = "dbStorage_readAheadCacheMaxSizeMb"; + Object writeCache = bkServerConf.getProperty(writeCacheMaxSizeMb); + Object readCache = bkServerConf.getProperty(readAheadCacheMaxSizeMb); + // we need to add one broker and one zk (if needed) to calculate the default cache + int instanceCount = usingNewDefaultsPIP117 ? (1 + numOfBk) : (2 + numOfBk); + long defaultCacheMB = PlatformDependent.maxDirectMemory() / (1024 * 1024) / instanceCount / 4; + if (writeCache == null || writeCache.equals("")) { + bkServerConf.setProperty(writeCacheMaxSizeMb, defaultCacheMB); + } + if (readCache == null || readCache.equals("")) { + bkServerConf.setProperty(readAheadCacheMaxSizeMb, defaultCacheMB); + } + } + private static void processTerminator(int exitCode) { log.info("Halting standalone process with code {}", exitCode); ShutdownUtil.triggerImmediateForcefulShutdown(exitCode); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneBuilder.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneBuilder.java index 428f3b09b8a95..5469d24782958 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneBuilder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneBuilder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java index f2c397e170db6..33dd58deac095 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetup.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetup.java index b1fae8753ec10..78ce55f1b2ce2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetup.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarVersionStarter.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarVersionStarter.java index 6dab0b4a496e0..7eee9d083fc29 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarVersionStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarVersionStarter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactory.java index ecdde80910dea..95923baac0294 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java index f3d69202a080b..20f109d03771b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -37,7 +37,6 @@ import org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicy; import org.apache.bookkeeper.client.RegionAwareEnsemblePlacementPolicy; import org.apache.bookkeeper.conf.ClientConfiguration; -import org.apache.bookkeeper.meta.MetadataDrivers; import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.stats.StatsLogger; import org.apache.pulsar.bookie.rackawareness.BookieRackAffinityMapping; @@ -68,7 +67,7 @@ public BookKeeper create(ServiceConfiguration conf, MetadataStoreExtended store, EventLoopGroup eventLoopGroup, Optional> ensemblePlacementPolicyClass, Map properties, StatsLogger statsLogger) throws IOException { - MetadataDrivers.registerClientDriver("metadata-store", PulsarMetadataClientDriver.class); + PulsarMetadataClientDriver.init(); ClientConfiguration bkConf = createBkClientConfiguration(store, conf); if (properties != null) { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/ManagedLedgerClientFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/ManagedLedgerClientFactory.java index 25ed135a7a4fa..b16b9a7dd4833 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/ManagedLedgerClientFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/ManagedLedgerClientFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -63,6 +63,8 @@ public void initialize(ServiceConfiguration conf, MetadataStoreExtended metadata managedLedgerFactoryConfig.setCacheEvictionTimeThresholdMillis( conf.getManagedLedgerCacheEvictionTimeThresholdMillis()); managedLedgerFactoryConfig.setCopyEntriesInCache(conf.isManagedLedgerCacheCopyEntries()); + managedLedgerFactoryConfig.setManagedLedgerMaxReadsInFlightSize( + conf.getManagedLedgerMaxReadsInFlightSizeInMB() * 1024L * 1024L); managedLedgerFactoryConfig.setPrometheusStatsLatencyRolloverSeconds( conf.getManagedLedgerPrometheusStatsLatencyRolloverSeconds()); managedLedgerFactoryConfig.setTraceTaskExecution(conf.isManagedLedgerTraceTaskExecution()); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java index f6aec263f1360..ec7a8f85fffee 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -98,11 +98,10 @@ import org.apache.pulsar.broker.rest.Topics; import org.apache.pulsar.broker.service.BrokerService; import org.apache.pulsar.broker.service.PulsarMetadataEventSynchronizer; -import org.apache.pulsar.broker.service.SystemTopicBaseTxnBufferSnapshotService; import org.apache.pulsar.broker.service.SystemTopicBasedTopicPoliciesService; import org.apache.pulsar.broker.service.Topic; import org.apache.pulsar.broker.service.TopicPoliciesService; -import org.apache.pulsar.broker.service.TransactionBufferSnapshotService; +import org.apache.pulsar.broker.service.TransactionBufferSnapshotServiceFactory; import org.apache.pulsar.broker.service.schema.SchemaRegistryService; import org.apache.pulsar.broker.service.schema.SchemaStorageFactory; import org.apache.pulsar.broker.stats.MetricsGenerator; @@ -260,8 +259,7 @@ public class PulsarService implements AutoCloseable, ShutdownService { private MetadataStoreExtended localMetadataStore; private PulsarMetadataEventSynchronizer localMetadataSynchronizer; private CoordinationService coordinationService; - private TransactionBufferSnapshotService transactionBufferSnapshotService; - + private TransactionBufferSnapshotServiceFactory transactionBufferSnapshotServiceFactory; private MetadataStore configurationMetadataStore; private PulsarMetadataEventSynchronizer configMetadataSynchronizer; private boolean shouldShutdownConfigurationMetadataStore; @@ -317,13 +315,13 @@ public PulsarService(ServiceConfiguration config, this.config = config; this.processTerminator = processTerminator; this.loadManagerExecutor = Executors - .newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-load-manager")); + .newSingleThreadScheduledExecutor(new ExecutorProvider.ExtendedThreadFactory("pulsar-load-manager")); this.workerConfig = workerConfig; this.functionWorkerService = functionWorkerService; this.executor = Executors.newScheduledThreadPool(config.getNumExecutorThreadPoolSize(), - new DefaultThreadFactory("pulsar")); + new ExecutorProvider.ExtendedThreadFactory("pulsar")); this.cacheExecutor = Executors.newScheduledThreadPool(config.getNumCacheExecutorThreadPoolSize(), - new DefaultThreadFactory("zk-cache-callback")); + new ExecutorProvider.ExtendedThreadFactory("zk-cache-callback")); if (config.isTransactionCoordinatorEnabled()) { this.transactionExecutorProvider = new ExecutorProvider(this.getConfiguration() @@ -510,9 +508,9 @@ public CompletableFuture closeAsync() { adminClient = null; } - if (transactionBufferSnapshotService != null) { - transactionBufferSnapshotService.close(); - transactionBufferSnapshotService = null; + if (transactionBufferSnapshotServiceFactory != null) { + transactionBufferSnapshotServiceFactory.close(); + transactionBufferSnapshotServiceFactory = null; } if (transactionBufferClient != null) { @@ -617,7 +615,7 @@ private synchronized void resetMetricsServlet() { private CompletableFuture addTimeoutHandling(CompletableFuture future) { ScheduledExecutorService shutdownExecutor = Executors.newSingleThreadScheduledExecutor( - new DefaultThreadFactory(getClass().getSimpleName() + "-shutdown")); + new ExecutorProvider.ExtendedThreadFactory(getClass().getSimpleName() + "-shutdown")); FutureUtil.addTimeoutHandling(future, Duration.ofMillis(Math.max(1L, getConfiguration().getBrokerShutdownTimeoutMs())), shutdownExecutor, () -> FutureUtil.createTimeoutException("Timeout in close", getClass(), "close")); @@ -837,7 +835,8 @@ public void start() throws PulsarServerException { MLTransactionMetadataStoreProvider.initBufferedWriterMetrics(getAdvertisedAddress()); MLPendingAckStoreProvider.initBufferedWriterMetrics(getAdvertisedAddress()); - this.transactionBufferSnapshotService = new SystemTopicBaseTxnBufferSnapshotService(getClient()); + this.transactionBufferSnapshotServiceFactory = new TransactionBufferSnapshotServiceFactory(getClient()); + this.transactionTimer = new HashedWheelTimer(new DefaultThreadFactory("pulsar-transaction-timer")); transactionBufferClient = TransactionBufferClientImpl.create(this, transactionTimer, @@ -903,9 +902,8 @@ public void start() throws PulsarServerException { + (config.getWebServicePortTls().isPresent() ? ", tls-port = " + config.getWebServicePortTls() : "") + (StringUtils.isNotEmpty(brokerServiceUrl) ? ", broker url= " + brokerServiceUrl : "") + (StringUtils.isNotEmpty(brokerServiceUrlTls) ? ", broker tls url= " + brokerServiceUrlTls : ""); - LOG.info("messaging service is ready, bootstrap_seconds={}", bootstrapTimeSeconds); - LOG.info("messaging service is ready, {}, cluster={}, configs={}", bootstrapMessage, - config.getClusterName(), config); + LOG.info("messaging service is ready, bootstrap_seconds={}, {}, cluster={}, configs={}", + bootstrapTimeSeconds, bootstrapMessage, config.getClusterName(), config); state = State.Started; } catch (Exception e) { @@ -1426,7 +1424,8 @@ public BookKeeperClientFactory getBookKeeperClientFactory() { protected synchronized ScheduledExecutorService getCompactorExecutor() { if (this.compactorExecutor == null) { - compactorExecutor = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("compaction")); + compactorExecutor = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("compaction")); } return this.compactorExecutor; } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/TransactionMetadataStoreService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/TransactionMetadataStoreService.java index a15039b3ff8ba..3d9e6924d1168 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/TransactionMetadataStoreService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/TransactionMetadataStoreService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -24,7 +24,6 @@ import com.google.common.annotations.VisibleForTesting; import io.netty.util.HashedWheelTimer; import io.netty.util.Timer; -import io.netty.util.concurrent.DefaultThreadFactory; import java.util.Collections; import java.util.Deque; import java.util.List; @@ -52,6 +51,7 @@ import org.apache.pulsar.client.api.transaction.TransactionBufferClientException.ReachMaxPendingOpsException; import org.apache.pulsar.client.api.transaction.TransactionBufferClientException.RequestTimeoutException; import org.apache.pulsar.client.api.transaction.TxnID; +import org.apache.pulsar.client.util.ExecutorProvider; import org.apache.pulsar.common.api.proto.TxnAction; import org.apache.pulsar.common.naming.SystemTopicNames; import org.apache.pulsar.common.util.FutureUtil; @@ -93,7 +93,7 @@ public class TransactionMetadataStoreService { private static final long HANDLE_PENDING_CONNECT_TIME_OUT = 30000L; private final ThreadFactory threadFactory = - new DefaultThreadFactory("transaction-coordinator-thread-factory"); + new ExecutorProvider.ExtendedThreadFactory("transaction-coordinator-thread-factory"); public TransactionMetadataStoreService(TransactionMetadataStoreProvider transactionMetadataStoreProvider, diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java index e2c44a80d4ae8..ad141c5884fc1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -61,10 +61,12 @@ import org.apache.pulsar.common.policies.data.SubscribeRate; import org.apache.pulsar.common.policies.data.TopicOperation; import org.apache.pulsar.common.policies.data.TopicPolicies; +import org.apache.pulsar.common.policies.data.impl.AutoSubscriptionCreationOverrideImpl; import org.apache.pulsar.common.policies.data.impl.DispatchRateImpl; import org.apache.pulsar.common.util.Codec; import org.apache.pulsar.common.util.FutureUtil; import org.apache.pulsar.common.util.ObjectMapperFactory; +import org.apache.pulsar.functions.worker.WorkerService; import org.apache.pulsar.metadata.api.MetadataStoreException; import org.apache.pulsar.metadata.api.MetadataStoreException.AlreadyExistsException; import org.apache.pulsar.metadata.api.MetadataStoreException.BadVersionException; @@ -295,6 +297,14 @@ protected void validatePersistentTopicName(String property, String cluster, Stri } } + protected WorkerService validateAndGetWorkerService() { + try { + return pulsar().getWorkerService(); + } catch (UnsupportedOperationException e) { + throw new RestException(Status.CONFLICT, e.getMessage()); + } + } + protected Policies getNamespacePolicies(NamespaceName namespaceName) { try { Policies policies = namespaceResources().getPolicies(namespaceName) @@ -428,6 +438,13 @@ protected SubscribeRate subscribeRate() { ); } + protected AutoSubscriptionCreationOverrideImpl autoSubscriptionCreationOverride() { + boolean allowAutoSubscriptionCreation = pulsar().getConfiguration().isAllowAutoSubscriptionCreation(); + return AutoSubscriptionCreationOverrideImpl.builder() + .allowAutoSubscriptionCreation(allowAutoSubscriptionCreation) + .build(); + } + public static ObjectMapper jsonMapper() { return ObjectMapperFactory.getThreadLocal(); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokerStatsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokerStatsBase.java index 53227fd641ba1..670fa10b28b88 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokerStatsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokerStatsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java index 2aa6ee7886449..3328fa9715b99 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java index 9e2c7c6b06c19..391cfe5ebbfcc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java index 81d90b84c8fd1..bee81bf5dcdb6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -56,7 +56,7 @@ public class FunctionsBase extends AdminResource { Functions functions() { - return pulsar().getWorkerService().getFunctions(); + return validateAndGetWorkerService().getFunctions(); } @POST diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java index 1991867627e73..1af182c2d5901 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.admin.impl; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -219,24 +218,29 @@ protected CompletableFuture internalDeleteNamespaceAsync(boolean force) { })) .thenCompose(topics -> { List allTopics = topics.get(0); + ArrayList allUserCreatedTopics = new ArrayList<>(); List allPartitionedTopics = topics.get(1); - if (!force) { - boolean hasNonSystemTopic = false; - for (String topic : allTopics) { - if (!pulsar().getBrokerService().isSystemTopic(TopicName.get(topic))) { - hasNonSystemTopic = true; - break; - } + ArrayList allUserCreatedPartitionTopics = new ArrayList<>(); + boolean hasNonSystemTopic = false; + List allSystemTopics = new ArrayList<>(); + List allPartitionedSystemTopics = new ArrayList<>(); + for (String topic : allTopics) { + if (!pulsar().getBrokerService().isSystemTopic(TopicName.get(topic))) { + hasNonSystemTopic = true; + allUserCreatedTopics.add(topic); + } else { + allSystemTopics.add(topic); } - if (!hasNonSystemTopic) { - for (String topic : allPartitionedTopics) { - if (!pulsar().getBrokerService().isSystemTopic(TopicName.get(topic))) { - hasNonSystemTopic = true; - break; - } - } + } + for (String topic : allPartitionedTopics) { + if (!pulsar().getBrokerService().isSystemTopic(TopicName.get(topic))) { + hasNonSystemTopic = true; + allUserCreatedPartitionTopics.add(topic); + } else { + allPartitionedSystemTopics.add(topic); } - + } + if (!force) { if (hasNonSystemTopic) { throw new RestException(Status.CONFLICT, "Cannot delete non empty namespace"); } @@ -244,13 +248,17 @@ protected CompletableFuture internalDeleteNamespaceAsync(boolean force) { return namespaceResources().setPoliciesAsync(namespaceName, old -> { old.deleted = true; return old; - }).thenCompose(__ -> { - return internalDeleteTopicsAsync(allTopics); - }).thenCompose(__ -> { - return internalDeletePartitionedTopicsAsync(allPartitionedTopics); + }).thenCompose(ignore -> { + return internalDeleteTopicsAsync(allUserCreatedTopics); + }).thenCompose(ignore -> { + return internalDeletePartitionedTopicsAsync(allUserCreatedPartitionTopics); + }).thenCompose(ignore -> { + return internalDeleteTopicsAsync(allSystemTopics); + }).thenCompose(ignore__ -> { + return internalDeletePartitionedTopicsAsync(allPartitionedSystemTopics); }); }) - .thenCompose(__ -> pulsar().getNamespaceService() + .thenCompose(ignore -> pulsar().getNamespaceService() .getNamespaceBundleFactory().getBundlesAsync(namespaceName)) .thenCompose(bundles -> FutureUtil.waitForAll(bundles.getBundles().stream() .map(bundle -> pulsar().getNamespaceService().getOwnerAsync(bundle) @@ -267,12 +275,12 @@ protected CompletableFuture internalDeleteNamespaceAsync(boolean force) { return FutureUtil.failedFuture(ex); } return admin.namespaces().deleteNamespaceBundleAsync(namespaceName.toString(), - bundle.getBundleRange()); + bundle.getBundleRange(), force); } return CompletableFuture.completedFuture(null); }) ).collect(Collectors.toList()))) - .thenCompose(__ -> internalClearZkSources()); + .thenCompose(ignore -> internalClearZkSources()); } private CompletableFuture internalDeletePartitionedTopicsAsync(List topicNames) { @@ -281,8 +289,10 @@ private CompletableFuture internalDeletePartitionedTopicsAsync(List> futures = new ArrayList<>(); for (String topicName : topicNames) { - futures.add(namespaceResources().getPartitionedTopicResources() - .deletePartitionedTopicAsync(TopicName.get(topicName))); + TopicName tn = TopicName.get(topicName); + futures.add(pulsar().getPulsarResources().getNamespaceResources().getPartitionedTopicResources() + .runWithMarkDeleteAsync(tn, + () -> namespaceResources().getPartitionedTopicResources().deletePartitionedTopicAsync(tn))); } return FutureUtil.waitForAll(futures); } @@ -1966,6 +1976,37 @@ protected void internalSetOffloadThreshold(long newThreshold) { } } + protected CompletableFuture internalSetOffloadThresholdInSecondsAsync(long newThreshold) { + CompletableFuture f = new CompletableFuture<>(); + + validateNamespacePolicyOperationAsync(namespaceName, PolicyName.OFFLOAD, PolicyOperation.WRITE) + .thenApply(v -> validatePoliciesReadOnlyAccessAsync()) + .thenApply(v -> updatePoliciesAsync(namespaceName, + policies -> { + if (policies.offload_policies == null) { + policies.offload_policies = new OffloadPoliciesImpl(); + } + ((OffloadPoliciesImpl) policies.offload_policies) + .setManagedLedgerOffloadThresholdInSeconds(newThreshold); + policies.offload_threshold_in_seconds = newThreshold; + return policies; + }) + ) + .thenAccept(v -> { + log.info("[{}] Successfully updated offloadThresholdInSeconds configuration:" + + " namespace={}, value={}", clientAppId(), namespaceName, newThreshold); + f.complete(null); + }) + .exceptionally(t -> { + log.error("[{}] Failed to update offloadThresholdInSeconds configuration for namespace {}", + clientAppId(), namespaceName, t); + f.completeExceptionally(new RestException(t)); + return null; + }); + + return f; + } + protected void internalSetOffloadDeletionLag(Long newDeletionLagMs) { validateNamespacePolicyOperation(namespaceName, PolicyName.OFFLOAD, PolicyOperation.WRITE); validatePoliciesReadOnlyAccess(); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/OffloaderObjectsScannerUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/OffloaderObjectsScannerUtils.java index c5aedf8c80c39..7eb648a8b55ac 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/OffloaderObjectsScannerUtils.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/OffloaderObjectsScannerUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PackagesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PackagesBase.java index 8a8dcd9f03be9..c5b0f60e91c5e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PackagesBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PackagesBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java index a00d90e92162d..4f77bb608cd7a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -106,6 +106,7 @@ import org.apache.pulsar.common.partition.PartitionedTopicMetadata; import org.apache.pulsar.common.policies.data.AuthAction; import org.apache.pulsar.common.policies.data.AuthPolicies; +import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride; import org.apache.pulsar.common.policies.data.BacklogQuota; import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies; import org.apache.pulsar.common.policies.data.DispatchRate; @@ -129,6 +130,7 @@ import org.apache.pulsar.common.policies.data.TopicOperation; import org.apache.pulsar.common.policies.data.TopicPolicies; import org.apache.pulsar.common.policies.data.TopicStats; +import org.apache.pulsar.common.policies.data.impl.AutoSubscriptionCreationOverrideImpl; import org.apache.pulsar.common.policies.data.impl.BacklogQuotaImpl; import org.apache.pulsar.common.policies.data.impl.DispatchRateImpl; import org.apache.pulsar.common.policies.data.stats.PartitionedTopicStatsImpl; @@ -619,7 +621,7 @@ protected CompletableFuture internalUpdatePropertiesAsync(boolean authorit return CompletableFuture.completedFuture(null); } return validateTopicOwnershipAsync(topicName, authoritative) - .thenCompose(__ -> validateTopicOperationAsync(topicName, TopicOperation.PRODUCE)) + .thenCompose(__ -> validateTopicOperationAsync(topicName, TopicOperation.UPDATE_METADATA)) .thenCompose(__ -> { if (topicName.isPartitioned()) { return internalUpdateNonPartitionedTopicProperties(properties); @@ -745,8 +747,9 @@ protected void internalDeletePartitionedTopic(AsyncResponse asyncResponse, .thenCompose(unused -> internalRemovePartitionsTopicAsync(numPartitions, force)); }) // Only tries to delete the znode for partitioned topic when all its partitions are successfully deleted - ).thenCompose(__ -> namespaceResources() - .getPartitionedTopicResources().deletePartitionedTopicAsync(topicName)) + ).thenCompose(__ -> getPulsarResources().getNamespaceResources().getPartitionedTopicResources() + .runWithMarkDeleteAsync(topicName, () -> namespaceResources() + .getPartitionedTopicResources().deletePartitionedTopicAsync(topicName))) .thenAccept(__ -> { log.info("[{}] Deleted partitioned topic {}", clientAppId(), topicName); asyncResponse.resume(Response.noContent().build()); @@ -780,6 +783,13 @@ protected void internalDeletePartitionedTopic(AsyncResponse asyncResponse, } private CompletableFuture internalRemovePartitionsTopicAsync(int numPartitions, boolean force) { + return pulsar().getPulsarResources().getNamespaceResources().getPartitionedTopicResources() + .runWithMarkDeleteAsync(topicName, + () -> internalRemovePartitionsTopicNoAutocreationDisableAsync(numPartitions, force)); + } + + private CompletableFuture internalRemovePartitionsTopicNoAutocreationDisableAsync(int numPartitions, + boolean force) { return FutureUtil.waitForAll(IntStream.range(0, numPartitions) .mapToObj(i -> { TopicName topicNamePartition = topicName.getPartition(i); @@ -1209,7 +1219,14 @@ protected void internalGetSubscriptions(AsyncResponse asyncResponse, boolean aut resumeAsyncResponseExceptionally(asyncResponse, ex); return null; }) - ); + ).exceptionally(ex -> { + // If the exception is not redirect exception we need to log it. + if (!isRedirectException(ex)) { + log.error("[{}] Failed to get subscriptions for {}", clientAppId(), topicName, ex); + } + resumeAsyncResponseExceptionally(asyncResponse, ex); + return null; + }); } private void resumeAsyncResponse(AsyncResponse asyncResponse, Set subscriptions, @@ -1887,7 +1904,7 @@ protected void internalSkipAllMessages(AsyncResponse asyncResponse, String subNa .thenCompose(__ -> { // If the topic name is a partition name, no need to get partition topic metadata again if (topicName.isPartitioned()) { - return internalSkipAllMessagesForNonPartitionedTopicAsync(asyncResponse, subName, authoritative); + return internalSkipAllMessagesForNonPartitionedTopicAsync(asyncResponse, subName); } else { return getPartitionedTopicMetadataAsync(topicName, authoritative, false).thenCompose(partitionMetadata -> { @@ -1928,8 +1945,7 @@ protected void internalSkipAllMessages(AsyncResponse asyncResponse, String subNa return null; }); } else { - return internalSkipAllMessagesForNonPartitionedTopicAsync(asyncResponse, subName, - authoritative); + return internalSkipAllMessagesForNonPartitionedTopicAsync(asyncResponse, subName); } }); } @@ -1945,8 +1961,7 @@ protected void internalSkipAllMessages(AsyncResponse asyncResponse, String subNa } private CompletableFuture internalSkipAllMessagesForNonPartitionedTopicAsync(AsyncResponse asyncResponse, - String subName, - boolean authoritative) { + String subName) { return getTopicReferenceAsync(topicName).thenCompose(t -> { PersistentTopic topic = (PersistentTopic) t; BiConsumer biConsumer = (v, ex) -> { @@ -2304,79 +2319,81 @@ protected void internalCreateSubscription(AsyncResponse asyncResponse, String su internalCreateSubscriptionForNonPartitionedTopic(asyncResponse, subscriptionName, targetMessageId, authoritative, replicated, properties); } else { - boolean allowAutoTopicCreation = pulsar().getBrokerService().isAllowAutoTopicCreation(topicName); - getPartitionedTopicMetadataAsync(topicName, - authoritative, allowAutoTopicCreation).thenAccept(partitionMetadata -> { - final int numPartitions = partitionMetadata.partitions; - if (numPartitions > 0) { - final CompletableFuture future = new CompletableFuture<>(); - final AtomicInteger count = new AtomicInteger(numPartitions); - final AtomicInteger failureCount = new AtomicInteger(0); - final AtomicReference partitionException = new AtomicReference<>(); + pulsar().getBrokerService().isAllowAutoTopicCreationAsync(topicName) + .thenCompose(allowAutoTopicCreation -> getPartitionedTopicMetadataAsync(topicName, + authoritative, allowAutoTopicCreation).thenAccept(partitionMetadata -> { + final int numPartitions = partitionMetadata.partitions; + if (numPartitions > 0) { + final CompletableFuture future = new CompletableFuture<>(); + final AtomicInteger count = new AtomicInteger(numPartitions); + final AtomicInteger failureCount = new AtomicInteger(0); + final AtomicReference partitionException = new AtomicReference<>(); + + // Create the subscription on each partition + for (int i = 0; i < numPartitions; i++) { + TopicName topicNamePartition = topicName.getPartition(i); + try { + pulsar().getAdminClient().topics() + .createSubscriptionAsync(topicNamePartition.toString(), + subscriptionName, targetMessageId, false, properties) + .handle((r, ex) -> { + if (ex != null) { + // fail the operation on unknown exception or + // if all the partitioned failed due to + // subscription-already-exist + if (failureCount.incrementAndGet() == numPartitions + || !(ex instanceof PulsarAdminException + .ConflictException)) { + partitionException.set(ex); + } + } - // Create the subscription on each partition - for (int i = 0; i < numPartitions; i++) { - TopicName topicNamePartition = topicName.getPartition(i); - try { - pulsar().getAdminClient().topics() - .createSubscriptionAsync(topicNamePartition.toString(), - subscriptionName, targetMessageId, false, properties) - .handle((r, ex) -> { - if (ex != null) { - // fail the operation on unknown exception or - // if all the partitioned failed due to - // subscription-already-exist - if (failureCount.incrementAndGet() == numPartitions - || !(ex instanceof PulsarAdminException.ConflictException)) { - partitionException.set(ex); - } - } + if (count.decrementAndGet() == 0) { + future.complete(null); + } - if (count.decrementAndGet() == 0) { - future.complete(null); - } + return null; + }); + } catch (Exception e) { + log.warn("[{}] [{}] Failed to create subscription {} at message id {}", + clientAppId(), topicNamePartition, subscriptionName, targetMessageId, e); + future.completeExceptionally(e); + } + } - return null; - }); - } catch (Exception e) { - log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(), - topicNamePartition, subscriptionName, targetMessageId, e); - future.completeExceptionally(e); - } - } + future.whenComplete((r, ex) -> { + if (ex != null) { + if (ex instanceof PulsarAdminException) { + asyncResponse.resume(new RestException((PulsarAdminException) ex)); + return; + } else { + asyncResponse.resume(new RestException(ex)); + return; + } + } - future.whenComplete((r, ex) -> { - if (ex != null) { - if (ex instanceof PulsarAdminException) { - asyncResponse.resume(new RestException((PulsarAdminException) ex)); - return; - } else { - asyncResponse.resume(new RestException(ex)); - return; - } - } + if (partitionException.get() != null) { + log.warn("[{}] [{}] Failed to create subscription {} at message id {}", + clientAppId(), topicName, + subscriptionName, targetMessageId, partitionException.get()); + if (partitionException.get() instanceof PulsarAdminException) { + asyncResponse.resume( + new RestException((PulsarAdminException) partitionException.get())); + return; + } else { + asyncResponse.resume(new RestException(partitionException.get())); + return; + } + } - if (partitionException.get() != null) { - log.warn("[{}] [{}] Failed to create subscription {} at message id {}", - clientAppId(), topicName, - subscriptionName, targetMessageId, partitionException.get()); - if (partitionException.get() instanceof PulsarAdminException) { - asyncResponse.resume( - new RestException((PulsarAdminException) partitionException.get())); - return; - } else { - asyncResponse.resume(new RestException(partitionException.get())); - return; - } + asyncResponse.resume(Response.noContent().build()); + }); + } else { + internalCreateSubscriptionForNonPartitionedTopic(asyncResponse, + subscriptionName, targetMessageId, authoritative, replicated, properties); } - asyncResponse.resume(Response.noContent().build()); - }); - } else { - internalCreateSubscriptionForNonPartitionedTopic(asyncResponse, - subscriptionName, targetMessageId, authoritative, replicated, properties); - } - }).exceptionally(ex -> { + })).exceptionally(ex -> { // If the exception is not redirect exception we need to log it. if (!isRedirectException(ex)) { log.error("[{}] Failed to create subscription {} on topic {}", @@ -2402,12 +2419,12 @@ private void internalCreateSubscriptionForNonPartitionedTopic( MessageIdImpl targetMessageId, boolean authoritative, boolean replicated, Map properties) { - boolean isAllowAutoTopicCreation = pulsar().getBrokerService().isAllowAutoTopicCreation(topicName); - validateTopicOwnershipAsync(topicName, authoritative) .thenCompose(__ -> { validateTopicOperation(topicName, TopicOperation.SUBSCRIBE, subscriptionName); - return pulsar().getBrokerService().getTopic(topicName.toString(), isAllowAutoTopicCreation); + return pulsar().getBrokerService().isAllowAutoTopicCreationAsync(topicName) + .thenCompose(isAllowAutoTopicCreation -> pulsar().getBrokerService() + .getTopic(topicName.toString(), isAllowAutoTopicCreation)); }).thenApply(optTopic -> { if (optTopic.isPresent()) { return optTopic.get(); @@ -4502,12 +4519,13 @@ private CompletableFuture createSubscriptions(TopicName topicName, int num // We must not re-create non-durable subscriptions on the new partitions return; } + boolean replicated = ss.isReplicated(); for (int i = partitionMetadata.partitions; i < numPartitions; i++) { final String topicNamePartition = topicName.getPartition(i).toString(); CompletableFuture future = new CompletableFuture<>(); admin.topics().createSubscriptionAsync(topicNamePartition, - subscription, MessageId.latest).whenComplete((__, ex) -> { + subscription, MessageId.latest, replicated).whenComplete((__, ex) -> { if (ex == null) { future.complete(null); } else { @@ -5507,4 +5525,30 @@ protected CompletableFuture internalDeleteShadowTopics() { updateTopicPoliciesAsync(topicName, topicPolicies); }); } + + protected CompletableFuture internalSetAutoSubscriptionCreation( + AutoSubscriptionCreationOverrideImpl autoSubscriptionCreationOverride, boolean isGlobal) { + return getTopicPoliciesAsyncWithRetry(topicName, isGlobal) + .thenCompose(op -> { + TopicPolicies topicPolicies = op.orElseGet(TopicPolicies::new); + topicPolicies.setAutoSubscriptionCreationOverride(autoSubscriptionCreationOverride); + topicPolicies.setIsGlobal(isGlobal); + return pulsar().getTopicPoliciesService().updateTopicPoliciesAsync(topicName, topicPolicies); + }); + } + + protected CompletableFuture internalGetAutoSubscriptionCreation(boolean applied, + boolean isGlobal) { + return getTopicPoliciesAsyncWithRetry(topicName, isGlobal) + .thenApply(op -> op.map(TopicPolicies::getAutoSubscriptionCreationOverride) + .orElseGet(() -> { + if (applied) { + AutoSubscriptionCreationOverride namespacePolicy = getNamespacePolicies(namespaceName) + .autoSubscriptionCreationOverride; + return namespacePolicy == null ? autoSubscriptionCreationOverride() + : (AutoSubscriptionCreationOverrideImpl) namespacePolicy; + } + return null; + })); + } } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceGroupsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceGroupsBase.java index 1ce3aa592eb4c..826b9c322e353 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceGroupsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceGroupsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceQuotasBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceQuotasBase.java index 9254c9b44c216..8e4d6f3211d67 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceQuotasBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ResourceQuotasBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java index 76af582514300..78bf5ad43ef20 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java index 26186fe17ab6c..7a3a554a3a00c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -50,7 +50,7 @@ public class SinksBase extends AdminResource { Sinks sinks() { - return pulsar().getWorkerService().getSinks(); + return validateAndGetWorkerService().getSinks(); } @POST diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java index 4a5efdad80cb8..1bf092784dd3a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -50,7 +50,7 @@ public class SourcesBase extends AdminResource { Sources sources() { - return pulsar().getWorkerService().getSources(); + return validateAndGetWorkerService().getSources(); } @POST diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java index fdf0433b340cf..32538eda1d11d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.admin.impl; import static org.apache.pulsar.common.naming.Constants.GLOBAL_CLUSTER; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java index dbd70feb1c052..f537f0ecdb9eb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -39,6 +39,7 @@ import org.apache.pulsar.broker.service.Topic; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.broker.web.RestException; +import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.Transactions; import org.apache.pulsar.client.api.transaction.TxnID; import org.apache.pulsar.common.naming.NamespaceName; @@ -47,6 +48,7 @@ import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.partition.PartitionedTopicMetadata; import org.apache.pulsar.common.policies.data.TransactionBufferStats; +import org.apache.pulsar.common.policies.data.TransactionCoordinatorInfo; import org.apache.pulsar.common.policies.data.TransactionCoordinatorInternalStats; import org.apache.pulsar.common.policies.data.TransactionCoordinatorStats; import org.apache.pulsar.common.policies.data.TransactionInBufferStats; @@ -68,6 +70,33 @@ @Slf4j public abstract class TransactionsBase extends AdminResource { + protected void internalListCoordinators(AsyncResponse asyncResponse) { + final PulsarAdmin admin; + try { + admin = pulsar().getAdminClient(); + } catch (PulsarServerException ex) { + asyncResponse.resume(new RestException(ex)); + return; + } + Map result = new HashMap<>(); + admin.lookups() + .lookupPartitionedTopicAsync(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN.getPartitionedTopicName()) + .thenAccept(map -> { + map.forEach((topicPartition, brokerServiceUrl) -> { + final int coordinatorId = TopicName.getPartitionIndex(topicPartition); + result.put(coordinatorId, new TransactionCoordinatorInfo(coordinatorId, brokerServiceUrl)); + }); + + asyncResponse.resume(result.values()); + }) + .exceptionally(ex -> { + log.error("[{}] Failed to list transaction coordinators: {}", + clientAppId(), ex.getMessage(), ex); + resumeAsyncResponseExceptionally(asyncResponse, ex); + return null; + }); + } + protected void internalGetCoordinatorStats(AsyncResponse asyncResponse, boolean authoritative, Integer coordinatorId) { if (coordinatorId != null) { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/package-info.java index ffb050ddf4de9..8546c66fe83c1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/package-info.java index c13919497e2f5..6a5060e09059b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/BrokerStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/BrokerStats.java index ba8ff81dac471..a228f249fa6c2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/BrokerStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/BrokerStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Brokers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Brokers.java index 2bf14b33add95..356f29e9429ea 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Brokers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Brokers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Clusters.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Clusters.java index 995bb29cb42bc..41ae0717764c9 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Clusters.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Clusters.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java index da06f91f8261f..16df1118171c1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java index 3fd09ddd594e3..d4a27f0fb3abf 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -881,6 +881,7 @@ public void unloadNamespace(@Suspended final AsyncResponse asyncResponse, @PathP @ApiOperation(hidden = true, value = "Unload a namespace bundle") @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 403, message = "Don't have admin permission") }) public void unloadNamespaceBundle(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @@ -907,6 +908,7 @@ public void unloadNamespaceBundle(@Suspended final AsyncResponse asyncResponse, @ApiOperation(hidden = true, value = "Split a namespace bundle") @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 403, message = "Don't have admin permission") }) public void splitNamespaceBundle( @Suspended final AsyncResponse asyncResponse, diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java index fef5eda009bde..0d857f2211f41 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.admin.v1; import io.swagger.annotations.Api; @@ -122,7 +121,9 @@ public void getInternalStats( @Path("/{property}/{cluster}/{namespace}/{topic}/partitions") @ApiOperation(hidden = true, value = "Create a partitioned topic.", notes = "It needs to be called before creating a producer on a partitioned topic.") - @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponses(value = { + @ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 406, message = "The number of partitions should be more than 0 and less than or equal" + " to maxNumPartitionsPerPartitionedTopic"), @ApiResponse(code = 409, message = "Partitioned topic already exist")}) @@ -149,7 +150,7 @@ public void createPartitionedTopic( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void unloadTopic(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java index 520e11d1c66c6..943b191209fa8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -190,6 +190,7 @@ public void revokePermissionsOnTopic(@Suspended final AsyncResponse asyncRespons @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 406, message = "The number of partitions should be " + "more than 0 and less than or equal to maxNumPartitionsPerPartitionedTopic"), @ApiResponse(code = 409, message = "Partitioned topic already exist")}) @@ -218,6 +219,7 @@ public void createPartitionedTopic( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 409, message = "Partitioned topic already exist"), @ApiResponse(code = 412, message = "Failed Reason : Name is invalid or Namespace does not have any clusters configured"), @@ -272,6 +274,7 @@ public void createNonPartitionedTopic( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 406, message = "The number of partitions should be more than 0" + " and less than or equal to maxNumPartitionsPerPartitionedTopic" + " and number of new partitions must be greater than existing number of partitions"), @@ -302,7 +305,8 @@ public void updatePartitionedTopic( @ApiOperation(hidden = true, value = "Get partitioned topic metadata.") @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), - @ApiResponse(code = 403, message = "Don't have admin permission") }) + @ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void getPartitionedMetadata( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @@ -329,7 +333,7 @@ public void getPartitionedMetadata( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Partitioned topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or partitioned topic does not exist")}) public void deletePartitionedTopic(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -349,7 +353,7 @@ public void deletePartitionedTopic(@Suspended final AsyncResponse asyncResponse, @Path("/{property}/{cluster}/{namespace}/{topic}/unload") @ApiOperation(hidden = true, value = "Unload a topic") @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist") }) public void unloadTopic(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -367,7 +371,7 @@ public void unloadTopic(@Suspended final AsyncResponse asyncResponse, @PathParam @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic has active producers/subscriptions")}) public void deleteTopic( @Suspended AsyncResponse asyncResponse, @@ -401,7 +405,7 @@ public void deleteTopic( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist") }) public void getSubscriptions(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -422,7 +426,7 @@ public void getSubscriptions(@Suspended final AsyncResponse asyncResponse, @Path @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void getStats( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @@ -448,7 +452,7 @@ public void getStats( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void getInternalStats( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @@ -472,7 +476,7 @@ public void getInternalStats( @Path("{property}/{cluster}/{namespace}/{topic}/internal-info") @ApiOperation(hidden = true, value = "Get the stored topic metadata.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void getManagedLedgerInfo(@PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -488,7 +492,7 @@ public void getManagedLedgerInfo(@PathParam("property") String property, @PathPa @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void getPartitionedStats(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @@ -512,7 +516,7 @@ public void getPartitionedStats(@Suspended final AsyncResponse asyncResponse, @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void getPartitionedStatsInternal( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @@ -538,7 +542,7 @@ public void getPartitionedStatsInternal( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 412, message = "Subscription has active consumers")}) public void deleteSubscription(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @@ -563,7 +567,7 @@ public void deleteSubscription(@Suspended final AsyncResponse asyncResponse, @Pa @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on non-persistent topic"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist")}) public void skipAllMessages(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @PathParam("subName") String encodedSubName, @@ -584,7 +588,7 @@ public void skipAllMessages(@Suspended final AsyncResponse asyncResponse, @PathP @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist") }) + @ApiResponse(code = 404, message = "Namesapce or topic or subscription does not exist") }) public void skipMessages(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @PathParam("subName") String encodedSubName, @@ -606,7 +610,7 @@ public void skipMessages(@Suspended final AsyncResponse asyncResponse, @PathPara @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist") }) public void expireTopicMessages(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -631,7 +635,7 @@ public void expireTopicMessages(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Expiry messages on a non-persistent topic is not allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration")}) @@ -667,7 +671,7 @@ public void expireTopicMessages( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist") }) public void expireMessagesForAllSubscriptions(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -691,7 +695,7 @@ public void expireMessagesForAllSubscriptions(@Suspended final AsyncResponse asy @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist")}) public void resetCursor(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @PathParam("subName") String encodedSubName, @@ -725,7 +729,7 @@ public void resetCursor(@Suspended final AsyncResponse asyncResponse, @PathParam @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Not supported for partitioned topics")}) public void resetCursorOnPosition(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @@ -753,7 +757,7 @@ public void resetCursorOnPosition(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 400, message = "Create subscription on non persistent topic is not supported"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Not supported for partitioned topics")}) public void createSubscription(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @@ -781,7 +785,8 @@ public void createSubscription(@Suspended final AsyncResponse asyncResponse, @Pa @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic, subscription or the message position does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic or subscription or the message position does not" + + " exist") }) public void peekNthMessage( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @@ -807,7 +812,7 @@ public void peekNthMessage( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't java admin permission"), - @ApiResponse(code = 404, message = "Topic, subscription or the messageId does not exist") + @ApiResponse(code = 404, message = "Namespace or topic or subscription or the messageId does not exist") }) public void getMessageByID(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @@ -862,7 +867,7 @@ public void getBacklog( @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on non-persistent topic"), @ApiResponse(code = 406, message = "Need to provide a persistent topic name"), - @ApiResponse(code = 404, message = "Topic does not exist") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist") }) public void terminate( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @@ -889,7 +894,7 @@ public void terminate( + "messages to be published and will let consumer to drain existing messages in backlog") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on non-persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void terminatePartitionedTopic(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, @@ -905,7 +910,7 @@ public void terminatePartitionedTopic(@Suspended final AsyncResponse asyncRespon @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 409, message = "Compaction already running")}) public void compact(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @@ -928,7 +933,7 @@ public void compact(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist, or compaction hasn't run") }) + @ApiResponse(code = 404, message = "Namespace or topic does not exist, or compaction hasn't run") }) public void compactionStatus( @Suspended final AsyncResponse asyncResponse, @PathParam("property") String property, @PathParam("cluster") String cluster, @@ -954,7 +959,7 @@ public void compactionStatus( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 409, message = "Offload already running")}) public void triggerOffload(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant, @@ -980,7 +985,7 @@ public void triggerOffload(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic does not exist")}) public void offloadStatus(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant, @PathParam("cluster") String cluster, @@ -1005,7 +1010,7 @@ public void offloadStatus(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Operation is not allowed on the persistent topic"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1038,7 +1043,7 @@ public void getLastMessageId( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or " + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Operation not allowed on this topic"), @ApiResponse(code = 412, message = "Can't find owner for topic"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1075,7 +1080,7 @@ public void setReplicatedSubscriptionStatus( @ApiResponses(value = { @ApiResponse(code = 401, message = "Don't have permission to administrate resources"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Can't find owner for topic"), @ApiResponse(code = 500, message = "Internal server error")}) public void getReplicatedSubscriptionStatus( diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Properties.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Properties.java index 50d5f245b8399..66764d41ce467 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Properties.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Properties.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java index 6773c3d8a99ff..37244fea1cd6c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java index 13bfba351216b..ca90eb4bac0c0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/SchemasResource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/package-info.java index 158a2802eb19b..f6cffb50fb6e3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java index 05eb1dd94f92d..a50bc7515ff6f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/BrokerStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/BrokerStats.java index 7e388596a4afe..aba6cb1a0aba4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/BrokerStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/BrokerStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Brokers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Brokers.java index 2a9e13c79bdbd..088962e6ed098 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Brokers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Brokers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Clusters.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Clusters.java index 1e0dede8e48dd..8b9d35c80939d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Clusters.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Clusters.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java index a83ea8cd51473..0d302bec065bc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -53,7 +53,7 @@ public class Functions extends AdminResource { FunctionsV2 functions() { - return pulsar().getWorkerService().getFunctionsV2(); + return validateAndGetWorkerService().getFunctionsV2(); } @POST diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java index 9b07427c72d49..b6bf1f0927cc6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -808,6 +808,7 @@ public void unloadNamespace(@Suspended final AsyncResponse asyncResponse, @ApiOperation(value = "Unload a namespace bundle") @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 403, message = "Don't have admin permission") }) public void unloadNamespaceBundle(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant, @PathParam("namespace") String namespace, @@ -834,6 +835,7 @@ public void unloadNamespaceBundle(@Suspended final AsyncResponse asyncResponse, @ApiOperation(value = "Split a namespace bundle") @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), @ApiResponse(code = 403, message = "Don't have admin permission") }) public void splitNamespaceBundle( @Suspended final AsyncResponse asyncResponse, @@ -2088,6 +2090,58 @@ public void setOffloadThreshold(@PathParam("tenant") String tenant, internalSetOffloadThreshold(newThreshold); } + @GET + @Path("/{tenant}/{namespace}/offloadThresholdInSeconds") + @ApiOperation(value = "Maximum number of bytes stored on the pulsar cluster for a topic," + + " before the broker will start offloading to longterm storage", + notes = "A negative value disables automatic offloading") + @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace doesn't exist") }) + public void getOffloadThresholdInSeconds( + @Suspended final AsyncResponse asyncResponse, + @PathParam("tenant") String tenant, + @PathParam("namespace") String namespace) { + validateNamespaceName(tenant, namespace); + validateNamespacePolicyOperationAsync(namespaceName, PolicyName.OFFLOAD, PolicyOperation.READ) + .thenCompose(__ -> getNamespacePoliciesAsync(namespaceName)) + .thenAccept(policies -> { + if (policies.offload_policies == null + || policies.offload_policies.getManagedLedgerOffloadThresholdInSeconds() == null) { + asyncResponse.resume(policies.offload_threshold_in_seconds); + } else { + asyncResponse.resume(policies.offload_policies.getManagedLedgerOffloadThresholdInSeconds()); + } + }) + .exceptionally(ex -> { + log.error("[{}] Failed to get offload threshold on namespace {}", clientAppId(), namespaceName, ex); + resumeAsyncResponseExceptionally(asyncResponse, ex); + return null; + }); + } + + @PUT + @Path("/{tenant}/{namespace}/offloadThresholdInSeconds") + @ApiOperation(value = "Set maximum number of seconds stored on the pulsar cluster for a topic," + + " before the broker will start offloading to longterm storage", + notes = "A negative value disables automatic offloading") + @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Namespace doesn't exist"), + @ApiResponse(code = 409, message = "Concurrent modification"), + @ApiResponse(code = 412, message = "offloadThresholdInSeconds value is not valid") }) + public void setOffloadThresholdInSeconds( + @Suspended final AsyncResponse response, + @PathParam("tenant") String tenant, + @PathParam("namespace") String namespace, + long newThreshold) { + validateNamespaceName(tenant, namespace); + internalSetOffloadThresholdInSecondsAsync(newThreshold) + .thenAccept(response::resume) + .exceptionally(t -> { + resumeAsyncResponseExceptionally(response, t); + return null; + }); + } + @GET @Path("/{tenant}/{namespace}/offloadDeletionLagMs") @ApiOperation(value = "Number of milliseconds to wait before deleting a ledger segment which has been offloaded" diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java index 5b0deccd0378b..de1ee46fd8ed5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.admin.v2; import io.swagger.annotations.Api; @@ -190,7 +189,7 @@ public void createPartitionedTopic( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Partitioned topic name is invalid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -542,7 +541,7 @@ public void getEntryFilters(@Suspended AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/entryFilters") @ApiOperation(value = "Set entry filters for specified topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Tenant or namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -570,7 +569,7 @@ public void setEntryFilters(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/entryFilters") @ApiOperation(value = "Remove entry filters for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Tenant or namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java index 6c63129c4835e..9ba408d1b5209 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -69,6 +69,7 @@ import org.apache.pulsar.common.policies.data.SchemaCompatibilityStrategy; import org.apache.pulsar.common.policies.data.SubscribeRate; import org.apache.pulsar.common.policies.data.TopicPolicies; +import org.apache.pulsar.common.policies.data.impl.AutoSubscriptionCreationOverrideImpl; import org.apache.pulsar.common.policies.data.impl.BacklogQuotaImpl; import org.apache.pulsar.common.policies.data.impl.DispatchRateImpl; import org.apache.pulsar.common.util.Codec; @@ -256,7 +257,7 @@ public void revokePermissionsOnTopic( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Tenant does not exist"), + @ApiResponse(code = 404, message = "Tenant or namespace doesn't exist"), @ApiResponse(code = 406, message = "The number of partitions should be more than 0 and" + " less than or equal to maxNumPartitionsPerPartitionedTopic"), @ApiResponse(code = 409, message = "Partitioned topic already exist"), @@ -299,7 +300,7 @@ public void createPartitionedTopic( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Tenant does not exist"), + @ApiResponse(code = 404, message = "Tenant or namespace doesn't exist"), @ApiResponse(code = 406, message = "The number of partitions should be more than 0 and" + " less than or equal to maxNumPartitionsPerPartitionedTopic"), @ApiResponse(code = 409, message = "Partitioned topic already exist"), @@ -340,6 +341,7 @@ public void createPartitionedTopic( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), + @ApiResponse(code = 404, message = "Tenant or namespace doesn't exist"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 409, message = "Partitioned topic already exist"), @ApiResponse(code = 412, @@ -941,7 +943,7 @@ public void getPartitionedMetadata( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 409, message = "Concurrent modification"), @ApiResponse(code = 412, message = "Topic name is invalid"), @ApiResponse(code = 500, message = "Internal server error") @@ -976,7 +978,7 @@ public void getProperties( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Method Not Allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -1081,7 +1083,7 @@ public void deletePartitionedTopic( @ApiResponses(value = { @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 409, message = "Concurrent modification"), @ApiResponse(code = 412, message = "Topic name is not valid or can't find owner for topic"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1116,7 +1118,7 @@ public void unloadTopic( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic has active producers/subscriptions"), @ApiResponse(code = 500, message = "Internal server error")}) public void deleteTopic( @@ -1159,7 +1161,7 @@ public void deleteTopic( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration"), @@ -1191,7 +1193,7 @@ public void getSubscriptions( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") }) @@ -1232,7 +1234,7 @@ public void getStats( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") }) @@ -1265,7 +1267,7 @@ public void getInternalStats( @ApiResponses(value = { @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration")}) @@ -1290,7 +1292,7 @@ public void getManagedLedgerInfo( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Partitioned topic name is invalid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -1332,7 +1334,7 @@ public void getPartitionedStats( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") }) @@ -1366,7 +1368,7 @@ public void getPartitionedStatsInternal( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 412, message = "Subscription has active consumers"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration")}) @@ -1405,7 +1407,7 @@ public void deleteSubscription( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Operation not allowed on non-persistent topic"), @ApiResponse(code = 412, message = "Can't find owner for topic"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1439,7 +1441,7 @@ public void skipAllMessages( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Skipping messages on a partitioned topic is not allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -1476,7 +1478,7 @@ public void skipMessages( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Expiry messages on a non-persistent topic is not allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration")}) @@ -1513,7 +1515,7 @@ public void expireTopicMessages( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Expiry messages on a non-persistent topic is not allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration")}) @@ -1552,7 +1554,7 @@ public void expireTopicMessages( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic or subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Expiry messages on a non-persistent topic is not allowed"), @ApiResponse(code = 412, message = "Can't find owner for topic"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1589,7 +1591,7 @@ public void expireMessagesForAllSubscriptions( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Not supported for partitioned topics"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration")}) @@ -1643,7 +1645,7 @@ public void createSubscription( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Method Not Allowed"), @ApiResponse(code = 412, message = "Failed to reset cursor on subscription or " + "Unable to find position for timestamp specified"), @@ -1693,7 +1695,7 @@ public void resetCursor( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Method Not Allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -1730,7 +1732,7 @@ public void updateSubscriptionProperties( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Method Not Allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -1766,7 +1768,7 @@ public void getSubscriptionProperties( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Method Not Allowed"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") @@ -1812,7 +1814,7 @@ public void analyzeSubscriptionBacklog( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic/Subscription does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic or subscription does not exist"), @ApiResponse(code = 405, message = "Not supported for partitioned topics"), @ApiResponse(code = 412, message = "Unable to find position for position specified"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1850,7 +1852,8 @@ public void resetCursorOnPosition( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic, subscription or the message position does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic, subscription or the message position does not" + + " exist"), @ApiResponse(code = 405, message = "Skipping messages on a non-persistent topic is not allowed"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1889,7 +1892,7 @@ public void peekNthMessage( @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic, the message position does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic, the message position does not exist"), @ApiResponse(code = 405, message = "If given partitioned topic"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error")}) @@ -1932,7 +1935,8 @@ public void examineMessage( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic, subscription or the message position does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic, subscription or the message position does not" + + " exist"), @ApiResponse(code = 405, message = "Skipping messages on a non-persistent topic is not allowed"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -1969,7 +1973,7 @@ public void getMessageById( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Topic is not non-partitioned and persistent"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -2044,7 +2048,7 @@ public void getBacklog( @ApiOperation(value = "Calculate backlog size by a message ID (in bytes).") @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") }) @@ -2066,7 +2070,7 @@ public void getBacklogSizeByMessageId( @Path("/{tenant}/{namespace}/{topic}/backlogQuotaMap") @ApiOperation(value = "Get backlog quota map on a topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic policy does not exist"), + @ApiResponse(code = 404, message = "Topic policy or namespace does not exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry")}) public void getBacklogQuotaMap( @@ -2092,7 +2096,7 @@ public void getBacklogQuotaMap( @Path("/{tenant}/{namespace}/{topic}/backlogQuota") @ApiOperation(value = "Set a backlog quota for a topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 409, message = "Concurrent modification"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @@ -2105,7 +2109,8 @@ public void setBacklogQuota( @ApiParam(value = "Whether leader broker redirected this call to this broker. For internal use.") @QueryParam("authoritative") @DefaultValue("false") boolean authoritative, @QueryParam("isGlobal") @DefaultValue("false") boolean isGlobal, - @QueryParam("backlogQuotaType") BacklogQuotaType backlogQuotaType, BacklogQuotaImpl backlogQuota) { + @QueryParam("backlogQuotaType") BacklogQuotaType backlogQuotaType, + @ApiParam(value = "backlog quota policies for the specified topic") BacklogQuotaImpl backlogQuota) { validateTopicName(tenant, namespace, encodedTopic); preValidation(authoritative) .thenCompose(__ -> internalSetBacklogQuota(backlogQuotaType, backlogQuota, isGlobal)) @@ -2120,7 +2125,7 @@ public void setBacklogQuota( @Path("/{tenant}/{namespace}/{topic}/backlogQuota") @ApiOperation(value = "Remove a backlog quota policy from a topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2145,7 +2150,7 @@ public void removeBacklogQuota(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/replication") @ApiOperation(value = "Get the replication clusters for a topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry")}) public void getReplicationClusters(@Suspended final AsyncResponse asyncResponse, @@ -2177,7 +2182,7 @@ public void getReplicationClusters(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/replication") @ApiOperation(value = "Set the replication clusters for a topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 409, message = "Concurrent modification"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @@ -2203,7 +2208,7 @@ public void setReplicationClusters( @Path("/{tenant}/{namespace}/{topic}/replication") @ApiOperation(value = "Remove the replication clusters from a topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2227,7 +2232,7 @@ public void removeReplicationClusters(@Suspended final AsyncResponse asyncRespon @Path("/{tenant}/{namespace}/{topic}/messageTTL") @ApiOperation(value = "Get message TTL in seconds for a topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry")}) public void getMessageTTL(@Suspended final AsyncResponse asyncResponse, @@ -2262,7 +2267,7 @@ public void getMessageTTL(@Suspended final AsyncResponse asyncResponse, @ApiOperation(value = "Set message TTL in seconds for a topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Not authenticate to perform the request or policy is read only"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry"), @ApiResponse(code = 412, message = "Invalid message TTL value")}) @@ -2270,7 +2275,7 @@ public void setMessageTTL(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant, @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic, - @ApiParam(value = "TTL in seconds for the specified namespace", required = true) + @ApiParam(value = "TTL in seconds for the specified topic", required = true) @QueryParam("messageTTL") Integer messageTTL, @QueryParam("isGlobal") @DefaultValue("false") boolean isGlobal, @ApiParam(value = "Whether leader broker redirected this call to this broker. For internal use.") @@ -2291,7 +2296,7 @@ public void setMessageTTL(@Suspended final AsyncResponse asyncResponse, @ApiResponses(value = { @ApiResponse(code = 403, message = "Not authenticate to perform the request or policy is read only"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry"), @ApiResponse(code = 412, message = "Invalid message TTL value")}) @@ -2394,7 +2399,7 @@ public void removeDeduplication(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/retention") @ApiOperation(value = "Get retention configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2420,7 +2425,7 @@ public void getRetention(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/retention") @ApiOperation(value = "Set retention configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2432,7 +2437,7 @@ public void setRetention(@Suspended final AsyncResponse asyncResponse, @ApiParam(value = "Whether leader broker redirected this call to this broker. For internal use.") @QueryParam("authoritative") @DefaultValue("false") boolean authoritative, @QueryParam("isGlobal") @DefaultValue("false") boolean isGlobal, - @ApiParam(value = "Retention policies for the specified namespace") RetentionPolicies retention) { + @ApiParam(value = "Retention policies for the specified topic") RetentionPolicies retention) { validateTopicName(tenant, namespace, encodedTopic); preValidation(authoritative) .thenCompose(__ -> internalSetRetention(retention, isGlobal)) @@ -2457,7 +2462,7 @@ public void setRetention(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/retention") @ApiOperation(value = "Remove retention configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2489,7 +2494,7 @@ public void removeRetention(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/persistence") @ApiOperation(value = "Get configuration of persistence policies for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2515,7 +2520,7 @@ public void getPersistence(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/persistence") @ApiOperation(value = "Set configuration of persistence policies for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2554,7 +2559,7 @@ public void setPersistence(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/persistence") @ApiOperation(value = "Remove configuration of persistence policies for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2585,7 +2590,7 @@ public void removePersistence(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxSubscriptionsPerTopic") @ApiOperation(value = "Get maxSubscriptionsPerTopic config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2611,7 +2616,7 @@ public void getMaxSubscriptionsPerTopic(@Suspended final AsyncResponse asyncResp @Path("/{tenant}/{namespace}/{topic}/maxSubscriptionsPerTopic") @ApiOperation(value = "Set maxSubscriptionsPerTopic config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2643,7 +2648,7 @@ public void setMaxSubscriptionsPerTopic(@Suspended final AsyncResponse asyncResp @Path("/{tenant}/{namespace}/{topic}/maxSubscriptionsPerTopic") @ApiOperation(value = "Remove maxSubscriptionsPerTopic config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2672,7 +2677,7 @@ public void removeMaxSubscriptionsPerTopic(@Suspended final AsyncResponse asyncR @Path("/{tenant}/{namespace}/{topic}/replicatorDispatchRate") @ApiOperation(value = "Get replicatorDispatchRate config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2698,7 +2703,7 @@ public void getReplicatorDispatchRate(@Suspended final AsyncResponse asyncRespon @Path("/{tenant}/{namespace}/{topic}/replicatorDispatchRate") @ApiOperation(value = "Set replicatorDispatchRate config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2730,7 +2735,7 @@ public void setReplicatorDispatchRate(@Suspended final AsyncResponse asyncRespon @Path("/{tenant}/{namespace}/{topic}/replicatorDispatchRate") @ApiOperation(value = "Remove replicatorDispatchRate config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2759,7 +2764,7 @@ public void removeReplicatorDispatchRate(@Suspended final AsyncResponse asyncRes @Path("/{tenant}/{namespace}/{topic}/maxProducers") @ApiOperation(value = "Get maxProducers config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2785,7 +2790,7 @@ public void getMaxProducers(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxProducers") @ApiOperation(value = "Set maxProducers config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2819,7 +2824,7 @@ public void setMaxProducers(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxProducers") @ApiOperation(value = "Remove maxProducers config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2850,7 +2855,7 @@ public void removeMaxProducers(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxConsumers") @ApiOperation(value = "Get maxConsumers config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2876,7 +2881,7 @@ public void getMaxConsumers(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxConsumers") @ApiOperation(value = "Set maxConsumers config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -2910,7 +2915,7 @@ public void setMaxConsumers(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxConsumers") @ApiOperation(value = "Remove maxConsumers config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2941,7 +2946,7 @@ public void removeMaxConsumers(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxMessageSize") @ApiOperation(value = "Get maxMessageSize config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -2968,7 +2973,7 @@ public void getMaxMessageSize(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxMessageSize") @ApiOperation(value = "Set maxMessageSize config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -3004,7 +3009,7 @@ public void setMaxMessageSize(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/maxMessageSize") @ApiOperation(value = "Remove maxMessageSize config for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3041,7 +3046,7 @@ public void removeMaxMessageSize(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Termination of a partitioned topic is not allowed"), @ApiResponse(code = 406, message = "Need to provide a persistent topic name"), @ApiResponse(code = 412, message = "Topic name is not valid"), @@ -3077,7 +3082,7 @@ public void terminate( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Termination of a non-partitioned topic is not allowed"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -3104,7 +3109,7 @@ public void terminatePartitionedTopic(@Suspended final AsyncResponse asyncRespon @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Operation is not allowed on the persistent topic"), @ApiResponse(code = 409, message = "Compaction already running"), @ApiResponse(code = 412, message = "Topic name is not valid"), @@ -3138,7 +3143,7 @@ public void compact( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist, or compaction hasn't run"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist, or compaction hasn't run"), @ApiResponse(code = 405, message = "Operation is not allowed on the persistent topic"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -3175,7 +3180,7 @@ public void compactionStatus( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Operation is not allowed on the persistent topic"), @ApiResponse(code = 409, message = "Offload already running"), @ApiResponse(code = 412, message = "Topic name is not valid"), @@ -3213,7 +3218,7 @@ public void triggerOffload( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Operation is not allowed on the persistent topic"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -3246,7 +3251,7 @@ public void offloadStatus( @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" + "subscriber is not authorized to access this operation"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 405, message = "Operation is not allowed on the persistent topic"), @ApiResponse(code = 412, message = "Topic name is not valid"), @ApiResponse(code = 500, message = "Internal server error"), @@ -3273,7 +3278,7 @@ public void getLastMessageId( @Path("/{tenant}/{namespace}/{topic}/dispatchRate") @ApiOperation(value = "Get dispatch rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3299,7 +3304,7 @@ public void getDispatchRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/dispatchRate") @ApiOperation(value = "Set message dispatch rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3336,7 +3341,7 @@ public void setDispatchRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/dispatchRate") @ApiOperation(value = "Remove message dispatch rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3368,7 +3373,7 @@ public void removeDispatchRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/subscriptionDispatchRate") @ApiOperation(value = "Get subscription message dispatch rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3394,7 +3399,7 @@ public void getSubscriptionDispatchRate(@Suspended final AsyncResponse asyncResp @Path("/{tenant}/{namespace}/{topic}/subscriptionDispatchRate") @ApiOperation(value = "Set subscription message dispatch rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3433,7 +3438,7 @@ public void setSubscriptionDispatchRate( @Path("/{tenant}/{namespace}/{topic}/subscriptionDispatchRate") @ApiOperation(value = "Remove subscription message dispatch rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3465,7 +3470,7 @@ public void removeSubscriptionDispatchRate(@Suspended final AsyncResponse asyncR @Path("/{tenant}/{namespace}/{topic}/{subName}/dispatchRate") @ApiOperation(value = "Get message dispatch rate configuration for specified subscription.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3493,7 +3498,7 @@ public void getSubscriptionLevelDispatchRate(@Suspended final AsyncResponse asyn @Path("/{tenant}/{namespace}/{topic}/{subName}/dispatchRate") @ApiOperation(value = "Set message dispatch rate configuration for specified subscription.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3533,7 +3538,7 @@ public void setSubscriptionLevelDispatchRate( @Path("/{tenant}/{namespace}/{topic}/{subName}/dispatchRate") @ApiOperation(value = "Remove message dispatch rate configuration for specified subscription.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3566,7 +3571,7 @@ public void removeSubscriptionLevelDispatchRate( @Path("/{tenant}/{namespace}/{topic}/compactionThreshold") @ApiOperation(value = "Get compaction threshold configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3592,7 +3597,7 @@ public void getCompactionThreshold(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/compactionThreshold") @ApiOperation(value = "Set compaction threshold configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3629,7 +3634,7 @@ public void setCompactionThreshold(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/compactionThreshold") @ApiOperation(value = "Remove compaction threshold configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3661,7 +3666,7 @@ public void removeCompactionThreshold(@Suspended final AsyncResponse asyncRespon @Path("/{tenant}/{namespace}/{topic}/maxConsumersPerSubscription") @ApiOperation(value = "Get max consumers per subscription configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3687,7 +3692,7 @@ public void getMaxConsumersPerSubscription(@Suspended final AsyncResponse asyncR @Path("/{tenant}/{namespace}/{topic}/maxConsumersPerSubscription") @ApiOperation(value = "Set max consumers per subscription configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3725,7 +3730,7 @@ public void setMaxConsumersPerSubscription( @Path("/{tenant}/{namespace}/{topic}/maxConsumersPerSubscription") @ApiOperation(value = "Remove max consumers per subscription configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3758,7 +3763,7 @@ public void removeMaxConsumersPerSubscription(@Suspended final AsyncResponse asy @Path("/{tenant}/{namespace}/{topic}/publishRate") @ApiOperation(value = "Get publish rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3784,7 +3789,7 @@ public void getPublishRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/publishRate") @ApiOperation(value = "Set message publish rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3822,7 +3827,7 @@ public void setPublishRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/publishRate") @ApiOperation(value = "Remove message publish rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3855,7 +3860,7 @@ public void removePublishRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/subscriptionTypesEnabled") @ApiOperation(value = "Get is enable sub type fors specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3883,7 +3888,7 @@ public void getSubscriptionTypesEnabled(@Suspended final AsyncResponse asyncResp @Path("/{tenant}/{namespace}/{topic}/subscriptionTypesEnabled") @ApiOperation(value = "Set is enable sub types for specified topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3921,7 +3926,7 @@ public void setSubscriptionTypesEnabled(@Suspended final AsyncResponse asyncResp @Path("/{tenant}/{namespace}/{topic}/subscriptionTypesEnabled") @ApiOperation(value = "Remove subscription types enabled for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, to enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3952,7 +3957,7 @@ public void removeSubscriptionTypesEnabled(@Suspended final AsyncResponse asyncR @Path("/{tenant}/{namespace}/{topic}/subscribeRate") @ApiOperation(value = "Get subscribe rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -3977,7 +3982,7 @@ public void getSubscribeRate(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/subscribeRate") @ApiOperation(value = "Set subscribe rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -4016,7 +4021,7 @@ public void setSubscribeRate( @Path("/{tenant}/{namespace}/{topic}/subscribeRate") @ApiOperation(value = "Remove subscribe rate configuration for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -4056,7 +4061,7 @@ public void removeSubscribeRate(@Suspended final AsyncResponse asyncResponse, @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic does not exist"), @ApiResponse(code = 500, message = "Internal server error")}) public void truncateTopic( @Suspended final AsyncResponse asyncResponse, @@ -4127,7 +4132,7 @@ public void setReplicatedSubscriptionStatus( @ApiResponses(value = { @ApiResponse(code = 401, message = "Don't have permission to administrate resources"), @ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 412, message = "Can't find owner for topic"), @ApiResponse(code = 500, message = "Internal server error")}) public void getReplicatedSubscriptionStatus( @@ -4153,7 +4158,7 @@ public void getReplicatedSubscriptionStatus( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist")}) public void getSchemaCompatibilityStrategy( @Suspended AsyncResponse asyncResponse, @ApiParam(value = "Specify the tenant", required = true) @@ -4183,7 +4188,7 @@ public void getSchemaCompatibilityStrategy( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist")}) public void setSchemaCompatibilityStrategy( @Suspended AsyncResponse asyncResponse, @ApiParam(value = "Specify the tenant", required = true) @@ -4223,7 +4228,7 @@ public void setSchemaCompatibilityStrategy( @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"), @ApiResponse(code = 403, message = "Don't have admin permission"), @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"), - @ApiResponse(code = 404, message = "Topic does not exist")}) + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist")}) public void removeSchemaCompatibilityStrategy( @Suspended AsyncResponse asyncResponse, @ApiParam(value = "Specify the tenant", required = true) @@ -4340,7 +4345,7 @@ public void getEntryFilters(@Suspended AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/entryFilters") @ApiOperation(value = "Set entry filters for specified topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -4368,7 +4373,7 @@ public void setEntryFilters(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/entryFilters") @ApiOperation(value = "Remove entry filters for specified topic.") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, please enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification")}) @@ -4403,7 +4408,7 @@ public void removeEntryFilters(@Suspended final AsyncResponse asyncResponse, @Path("/{tenant}/{namespace}/{topic}/shadowTopics") @ApiOperation(value = "Get the shadow topic list for a topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry")}) public void getShadowTopics( @@ -4429,7 +4434,7 @@ public void getShadowTopics( @Path("/{tenant}/{namespace}/{topic}/shadowTopics") @ApiOperation(value = "Set shadow topic list for a topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -4456,7 +4461,7 @@ public void setShadowTopics( @Path("/{tenant}/{namespace}/{topic}/shadowTopics") @ApiOperation(value = "Delete shadow topics for a topic") @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), - @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 404, message = "Namespace or topic doesn't exist"), @ApiResponse(code = 405, message = "Topic level policy is disabled, enable the topic level policy and retry"), @ApiResponse(code = 409, message = "Concurrent modification"), @@ -4478,5 +4483,93 @@ public void deleteShadowTopics( }); } + @POST + @Path("/{tenant}/{namespace}/{topic}/autoSubscriptionCreation") + @ApiOperation(value = "Override namespace's allowAutoSubscriptionCreation setting for a topic") + @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Topic doesn't exist"), + @ApiResponse(code = 405, message = + "Topic level policy is disabled, enable the topic level policy and retry"), + @ApiResponse(code = 409, message = "Concurrent modification")}) + public void setAutoSubscriptionCreation( + @Suspended final AsyncResponse asyncResponse, + @PathParam("tenant") String tenant, + @PathParam("namespace") String namespace, + @PathParam("topic") String encodedTopic, + @QueryParam("isGlobal") @DefaultValue("false") boolean isGlobal, + @QueryParam("authoritative") @DefaultValue("false") boolean authoritative, + @ApiParam(value = "Settings for automatic subscription creation") + AutoSubscriptionCreationOverrideImpl autoSubscriptionCreationOverride) { + validateTopicName(tenant, namespace, encodedTopic); + preValidation(authoritative) + .thenCompose(__ -> internalSetAutoSubscriptionCreation(autoSubscriptionCreationOverride, isGlobal)) + .thenAccept(__ -> asyncResponse.resume(Response.noContent().build())) + .exceptionally(ex -> { + handleTopicPolicyException("setAutoSubscriptionCreation", ex, asyncResponse); + return null; + }); + } + + @GET + @Path("/{tenant}/{namespace}/{topic}/autoSubscriptionCreation") + @ApiOperation(value = "Get autoSubscriptionCreation info in a topic") + @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 405, + message = "Topic level policy is disabled, please enable the topic level policy and retry"), + @ApiResponse(code = 409, message = "Concurrent modification")}) + public void getAutoSubscriptionCreation( + @Suspended final AsyncResponse asyncResponse, + @PathParam("tenant") String tenant, + @PathParam("namespace") String namespace, + @PathParam("topic") @Encoded String encodedTopic, + @QueryParam("applied") @DefaultValue("false") boolean applied, + @QueryParam("isGlobal") @DefaultValue("false") boolean isGlobal, + @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) { + validateTopicName(tenant, namespace, encodedTopic); + preValidation(authoritative) + .thenCompose(__ -> internalGetAutoSubscriptionCreation(applied, isGlobal)) + .thenApply(asyncResponse::resume).exceptionally(ex -> { + handleTopicPolicyException("getAutoSubscriptionCreation", ex, asyncResponse); + return null; + }); + } + + @DELETE + @Path("/{tenant}/{namespace}/{topic}/autoSubscriptionCreation") + @ApiOperation(value = "Remove autoSubscriptionCreation ina a topic.") + @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 404, message = "Topic does not exist"), + @ApiResponse(code = 405, + message = "Topic level policy is disabled, please enable the topic level policy and retry"), + @ApiResponse(code = 409, message = "Concurrent modification")}) + public void removeAutoSubscriptionCreation( + @Suspended final AsyncResponse asyncResponse, + @PathParam("tenant") String tenant, + @PathParam("namespace") String namespace, + @PathParam("topic") @Encoded String encodedTopic, + @QueryParam("isGlobal") @DefaultValue("false") boolean isGlobal, + @ApiParam(value = "Whether leader broker redirected this call to this broker. For internal use.") + @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) { + validateTopicName(tenant, namespace, encodedTopic); + preValidation(authoritative) + .thenCompose(__ -> internalSetAutoSubscriptionCreation(null, isGlobal)) + .thenRun(() -> { + log.info( + "[{}] Successfully remove topic removeAutoSubscriptionCreation: " + + "tenant={}, namespace={}, topic={}, isGlobal={}", + clientAppId(), + tenant, + namespace, + topicName.getLocalName(), + isGlobal); + asyncResponse.resume(Response.noContent().build()); + }) + .exceptionally(ex -> { + handleTopicPolicyException("removeAutoSubscriptionCreation", ex, asyncResponse); + return null; + }); + } + private static final Logger log = LoggerFactory.getLogger(PersistentTopics.class); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceGroups.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceGroups.java index f89ea9d4320aa..52fd03b18ed0b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceGroups.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceGroups.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java index 45e2ec74a8f2e..58ccc1c10288c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java index 335510f0893ca..45d6bff42ca6a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/SchemasResource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Tenants.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Tenants.java index 94ecec552ce6f..ebd02dffa0921 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Tenants.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Tenants.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Worker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Worker.java index 12b7950a58223..80c75b04917ce 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Worker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Worker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -45,12 +45,12 @@ public class Worker extends AdminResource implements Supplier { Workers workers() { - return pulsar().getWorkerService().getWorkers(); + return validateAndGetWorkerService().getWorkers(); } @Override public WorkerService get() { - return pulsar().getWorkerService(); + return validateAndGetWorkerService(); } @GET diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/WorkerStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/WorkerStats.java index 6703caa7a278b..5a77d81b6f1e3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/WorkerStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/WorkerStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -40,7 +40,7 @@ public class WorkerStats extends AdminResource { public Workers workers() { - return pulsar().getWorkerService().getWorkers(); + return validateAndGetWorkerService().getWorkers(); } @GET diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/package-info.java index fe67309d67d05..b6a32e71dbcb7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Functions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Functions.java index cdada46d67873..e4d3b88c292f5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Functions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Functions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Packages.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Packages.java index 03a83bf314520..15e7b69554dc7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Packages.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Packages.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sink.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sink.java index d6bf22c294937..59f2c698c8fb2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sink.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sink.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sinks.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sinks.java index 3b398416de3b9..35c777592bdb6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sinks.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sinks.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Source.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Source.java index ad19db3af01d5..9b3ce2b4b516d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Source.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Source.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sources.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sources.java index 336e6fa501af8..e0f533799811a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sources.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Sources.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java index 5dcf57f80f97c..aa24dbdcc3ae9 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -52,6 +52,17 @@ @Slf4j public class Transactions extends TransactionsBase { + @GET + @Path("/coordinators") + @ApiOperation(value = "List transaction coordinators.") + @ApiResponses(value = {@ApiResponse(code = 403, message = "Don't have admin permission"), + @ApiResponse(code = 503, message = "This Broker is not " + + "configured with transactionCoordinatorEnabled=true.")}) + public void listCoordinators(@Suspended final AsyncResponse asyncResponse) { + checkTransactionCoordinatorEnabled(); + internalListCoordinators(asyncResponse); + } + @GET @Path("/coordinatorStats") @ApiOperation(value = "Get transaction coordinator stats.") diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/package-info.java index f64d9ac6b59a5..839d8de12608b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/BundlesQuotas.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/BundlesQuotas.java index 88ddaf15314c7..d70520a09f3ce 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/BundlesQuotas.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/BundlesQuotas.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/package-info.java index 77dc2b9adb932..d4fbef69a9b50 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/cache/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/AbstractDelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/AbstractDelayedDeliveryTracker.java new file mode 100644 index 0000000000000..5c99e4c307d7c --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/AbstractDelayedDeliveryTracker.java @@ -0,0 +1,162 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed; + +import io.netty.util.Timeout; +import io.netty.util.Timer; +import io.netty.util.TimerTask; +import java.time.Clock; +import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; + +@Slf4j +public abstract class AbstractDelayedDeliveryTracker implements DelayedDeliveryTracker, TimerTask { + + protected final PersistentDispatcherMultipleConsumers dispatcher; + + // Reference to the shared (per-broker) timer for delayed delivery + protected final Timer timer; + + // Current timeout or null if not set + protected Timeout timeout; + + // Timestamp at which the timeout is currently set + private long currentTimeoutTarget; + + // Last time the TimerTask was triggered for this class + private long lastTickRun; + + protected long tickTimeMillis; + + protected final Clock clock; + + private final boolean isDelayedDeliveryDeliverAtTimeStrict; + + public AbstractDelayedDeliveryTracker(PersistentDispatcherMultipleConsumers dispatcher, Timer timer, + long tickTimeMillis, + boolean isDelayedDeliveryDeliverAtTimeStrict) { + this(dispatcher, timer, tickTimeMillis, Clock.systemUTC(), isDelayedDeliveryDeliverAtTimeStrict); + } + + public AbstractDelayedDeliveryTracker(PersistentDispatcherMultipleConsumers dispatcher, Timer timer, + long tickTimeMillis, Clock clock, + boolean isDelayedDeliveryDeliverAtTimeStrict) { + this.dispatcher = dispatcher; + this.timer = timer; + this.tickTimeMillis = tickTimeMillis; + this.clock = clock; + this.isDelayedDeliveryDeliverAtTimeStrict = isDelayedDeliveryDeliverAtTimeStrict; + } + + + /** + * When {@link #isDelayedDeliveryDeliverAtTimeStrict} is false, we allow for early delivery by as much as the + * {@link #tickTimeMillis} because it is a slight optimization to let messages skip going back into the delay + * tracker for a brief amount of time when we're already trying to dispatch to the consumer. + * + * When {@link #isDelayedDeliveryDeliverAtTimeStrict} is true, we use the current time to determine when messages + * can be delivered. As a consequence, there are two delays that will affect delivery. The first is the + * {@link #tickTimeMillis} and the second is the {@link Timer}'s granularity. + * + * @return the cutoff time to determine whether a message is ready to deliver to the consumer + */ + protected long getCutoffTime() { + return isDelayedDeliveryDeliverAtTimeStrict ? clock.millis() : clock.millis() + tickTimeMillis; + } + + public void resetTickTime(long tickTime) { + if (this.tickTimeMillis != tickTime) { + this.tickTimeMillis = tickTime; + } + } + + protected void updateTimer() { + if (getNumberOfDelayedMessages() == 0) { + if (timeout != null) { + currentTimeoutTarget = -1; + timeout.cancel(); + timeout = null; + } + return; + } + long timestamp = nextDeliveryTime(); + if (timestamp == currentTimeoutTarget) { + // The timer is already set to the correct target time + return; + } + + if (timeout != null) { + timeout.cancel(); + } + + long now = clock.millis(); + long delayMillis = timestamp - now; + + if (delayMillis < 0) { + // There are messages that are already ready to be delivered. If + // the dispatcher is not getting them is because the consumer is + // either not connected or slow. + // We don't need to keep retriggering the timer. When the consumer + // catches up, the dispatcher will do the readMoreEntries() and + // get these messages + return; + } + + // Compute the earliest time that we schedule the timer to run. + long remainingTickDelayMillis = lastTickRun + tickTimeMillis - now; + long calculatedDelayMillis = Math.max(delayMillis, remainingTickDelayMillis); + + if (log.isDebugEnabled()) { + log.debug("[{}] Start timer in {} millis", dispatcher.getName(), calculatedDelayMillis); + } + + // Even though we may delay longer than this timestamp because of the tick delay, we still track the + // current timeout with reference to the next message's timestamp. + currentTimeoutTarget = timestamp; + timeout = timer.newTimeout(this, calculatedDelayMillis, TimeUnit.MILLISECONDS); + } + + @Override + public void run(Timeout timeout) throws Exception { + if (log.isDebugEnabled()) { + log.debug("[{}] Timer triggered", dispatcher.getName()); + } + if (timeout == null || timeout.isCancelled()) { + return; + } + + synchronized (dispatcher) { + lastTickRun = clock.millis(); + currentTimeoutTarget = -1; + this.timeout = null; + dispatcher.readMoreEntries(); + } + } + + @Override + public void close() { + if (timeout != null) { + timeout.cancel(); + timeout = null; + } + } + + protected abstract long nextDeliveryTime(); +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java index 4e9cf296cf8e8..2f248a441cdee 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,7 @@ package org.apache.pulsar.broker.delayed; import com.google.common.annotations.Beta; -import java.util.Set; +import java.util.NavigableSet; import org.apache.bookkeeper.mledger.impl.PositionImpl; /** @@ -58,7 +58,7 @@ public interface DelayedDeliveryTracker extends AutoCloseable { /** * Get a set of position of messages that have already reached the delivery time. */ - Set getScheduledMessages(int maxMessages); + NavigableSet getScheduledMessages(int maxMessages); /** * Tells whether the dispatcher should pause any message deliveries, until the DelayedDeliveryTracker has diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerFactory.java index 748b059c12980..0530a01779b39 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java index 91a56b51a54b0..0b9f45b1393bb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java index ba8a931181776..f55d5fd11694b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,47 +18,28 @@ */ package org.apache.pulsar.broker.delayed; -import io.netty.util.Timeout; +import com.google.common.annotations.VisibleForTesting; import io.netty.util.Timer; -import io.netty.util.TimerTask; import java.time.Clock; -import java.util.Set; +import java.util.NavigableSet; import java.util.TreeSet; -import java.util.concurrent.TimeUnit; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.impl.PositionImpl; import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; import org.apache.pulsar.common.util.collections.TripleLongPriorityQueue; @Slf4j -public class InMemoryDelayedDeliveryTracker implements DelayedDeliveryTracker, TimerTask { +public class InMemoryDelayedDeliveryTracker extends AbstractDelayedDeliveryTracker { protected final TripleLongPriorityQueue priorityQueue = new TripleLongPriorityQueue(); - private final PersistentDispatcherMultipleConsumers dispatcher; - - // Reference to the shared (per-broker) timer for delayed delivery - private final Timer timer; - - // Current timeout or null if not set - protected Timeout timeout; - - // Timestamp at which the timeout is currently set - private long currentTimeoutTarget; - - // Last time the TimerTask was triggered for this class - private long lastTickRun; - - private long tickTimeMillis; - - private final Clock clock; - - private final boolean isDelayedDeliveryDeliverAtTimeStrict; - // If we detect that all messages have fixed delay time, such that the delivery is // always going to be in FIFO order, then we can avoid pulling all the messages in // tracker. Instead, we use the lookahead for detection and pause the read from // the cursor if the delays are fixed. + @Getter + @VisibleForTesting private final long fixedDelayDetectionLookahead; // This is the timestamp of the message with the highest delivery time @@ -76,33 +57,14 @@ public class InMemoryDelayedDeliveryTracker implements DelayedDeliveryTracker, T fixedDelayDetectionLookahead); } - InMemoryDelayedDeliveryTracker(PersistentDispatcherMultipleConsumers dispatcher, Timer timer, + public InMemoryDelayedDeliveryTracker(PersistentDispatcherMultipleConsumers dispatcher, Timer timer, long tickTimeMillis, Clock clock, boolean isDelayedDeliveryDeliverAtTimeStrict, long fixedDelayDetectionLookahead) { - this.dispatcher = dispatcher; - this.timer = timer; - this.tickTimeMillis = tickTimeMillis; - this.clock = clock; - this.isDelayedDeliveryDeliverAtTimeStrict = isDelayedDeliveryDeliverAtTimeStrict; + super(dispatcher, timer, tickTimeMillis, clock, isDelayedDeliveryDeliverAtTimeStrict); this.fixedDelayDetectionLookahead = fixedDelayDetectionLookahead; } - /** - * When {@link #isDelayedDeliveryDeliverAtTimeStrict} is false, we allow for early delivery by as much as the - * {@link #tickTimeMillis} because it is a slight optimization to let messages skip going back into the delay - * tracker for a brief amount of time when we're already trying to dispatch to the consumer. - * - * When {@link #isDelayedDeliveryDeliverAtTimeStrict} is true, we use the current time to determine when messages - * can be delivered. As a consequence, there are two delays that will affect delivery. The first is the - * {@link #tickTimeMillis} and the second is the {@link Timer}'s granularity. - * - * @return the cutoff time to determine whether a message is ready to deliver to the consumer - */ - private long getCutoffTime() { - return isDelayedDeliveryDeliverAtTimeStrict ? clock.millis() : clock.millis() + tickTimeMillis; - } - @Override public boolean addMessage(long ledgerId, long entryId, long deliverAt) { if (deliverAt < 0 || deliverAt <= getCutoffTime()) { @@ -115,19 +77,24 @@ public boolean addMessage(long ledgerId, long entryId, long deliverAt) { deliverAt - clock.millis()); } - priorityQueue.add(deliverAt, ledgerId, entryId); updateTimer(); - // Check that new delivery time comes after the current highest, or at - // least within a single tick time interval of 1 second. + checkAndUpdateHighest(deliverAt); + + return true; + } + + /** + * Check that new delivery time comes after the current highest, or at + * least within a single tick time interval of 1 second. + */ + private void checkAndUpdateHighest(long deliverAt) { if (deliverAt < (highestDeliveryTimeTracked - tickTimeMillis)) { messagesHaveFixedDelay = false; } highestDeliveryTimeTracked = Math.max(highestDeliveryTimeTracked, deliverAt); - - return true; } /** @@ -146,9 +113,9 @@ public boolean hasMessageAvailable() { * Get a set of position of messages that have already reached. */ @Override - public Set getScheduledMessages(int maxMessages) { + public NavigableSet getScheduledMessages(int maxMessages) { int n = maxMessages; - Set positions = new TreeSet<>(); + NavigableSet positions = new TreeSet<>(); long cutoffTime = getCutoffTime(); while (n > 0 && !priorityQueue.isEmpty()) { @@ -179,14 +146,6 @@ public Set getScheduledMessages(int maxMessages) { return positions; } - @Override - public void resetTickTime(long tickTime) { - - if (this.tickTimeMillis != tickTime) { - this.tickTimeMillis = tickTime; - } - } - @Override public void clear() { this.priorityQueue.clear(); @@ -202,87 +161,9 @@ public long getBufferMemoryUsage() { return priorityQueue.bytesCapacity(); } - /** - * Update the scheduled timer task such that: - * 1. If there are no delayed messages, return and do not schedule a timer task. - * 2. If the next message in the queue has the same deliverAt time as the timer task, return and leave existing - * timer task in place. - * 3. If the deliverAt time for the next delayed message has already passed (i.e. the delay is negative), return - * without scheduling a timer task since the subscription is backlogged. - * 4. Else, schedule a timer task where the delay is the greater of these two: the next message's deliverAt time or - * the last tick time plus the tickTimeMillis (to ensure we do not schedule the task more frequently than the - * tickTimeMillis). - */ - private void updateTimer() { - if (priorityQueue.isEmpty()) { - if (timeout != null) { - currentTimeoutTarget = -1; - timeout.cancel(); - timeout = null; - } - return; - } - - long timestamp = priorityQueue.peekN1(); - if (timestamp == currentTimeoutTarget) { - // The timer is already set to the correct target time - return; - } - - if (timeout != null) { - timeout.cancel(); - } - - long now = clock.millis(); - long delayMillis = timestamp - now; - - if (delayMillis < 0) { - // There are messages that are already ready to be delivered. If - // the dispatcher is not getting them is because the consumer is - // either not connected or slow. - // We don't need to keep retriggering the timer. When the consumer - // catches up, the dispatcher will do the readMoreEntries() and - // get these messages - return; - } - - // Compute the earliest time that we schedule the timer to run. - long remainingTickDelayMillis = lastTickRun + tickTimeMillis - now; - long calculatedDelayMillis = Math.max(delayMillis, remainingTickDelayMillis); - - if (log.isDebugEnabled()) { - log.debug("[{}] Start timer in {} millis", dispatcher.getName(), calculatedDelayMillis); - } - - // Even though we may delay longer than this timestamp because of the tick delay, we still track the - // current timeout with reference to the next message's timestamp. - currentTimeoutTarget = timestamp; - timeout = timer.newTimeout(this, calculatedDelayMillis, TimeUnit.MILLISECONDS); - } - - @Override - public void run(Timeout timeout) throws Exception { - if (log.isDebugEnabled()) { - log.debug("[{}] Timer triggered", dispatcher.getName()); - } - if (timeout == null || timeout.isCancelled()) { - return; - } - - synchronized (dispatcher) { - lastTickRun = clock.millis(); - currentTimeoutTarget = -1; - this.timeout = null; - dispatcher.readMoreEntries(); - } - } - @Override public void close() { - if (timeout != null) { - timeout.cancel(); - timeout = null; - } + super.close(); priorityQueue.close(); } @@ -291,7 +172,7 @@ public boolean shouldPauseAllDeliveries() { // Pause deliveries if we know all delays are fixed within the lookahead window return fixedDelayDetectionLookahead > 0 && messagesHaveFixedDelay - && priorityQueue.size() >= fixedDelayDetectionLookahead + && getNumberOfDelayedMessages() >= fixedDelayDetectionLookahead && !hasMessageAvailable(); } @@ -299,4 +180,8 @@ public boolean shouldPauseAllDeliveries() { public boolean containsMessage(long ledgerId, long entryId) { return false; } + + protected long nextDeliveryTime() { + return priorityQueue.peekN1(); + } } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java index 7bf0ca87c40c7..de8ceca7a71db 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/Bucket.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/Bucket.java new file mode 100644 index 0000000000000..fbd6d765705d4 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/Bucket.java @@ -0,0 +1,145 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed.bucket; + +import static org.apache.bookkeeper.mledger.util.Futures.executeWithRetry; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.bookkeeper.mledger.ManagedLedgerException; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat; +import org.roaringbitmap.RoaringBitmap; + +@Slf4j +@Data +@AllArgsConstructor +abstract class Bucket { + + static final String DELAYED_BUCKET_KEY_PREFIX = "#pulsar.internal.delayed.bucket"; + static final String DELIMITER = "_"; + static final int MaxRetryTimes = 3; + + protected final ManagedCursor cursor; + protected final BucketSnapshotStorage bucketSnapshotStorage; + + long startLedgerId; + long endLedgerId; + + Map delayedIndexBitMap; + + long numberBucketDelayedMessages; + + int lastSegmentEntryId; + + int currentSegmentEntryId; + + long snapshotLength; + + private volatile Long bucketId; + + private volatile CompletableFuture snapshotCreateFuture; + + + Bucket(ManagedCursor cursor, BucketSnapshotStorage storage, long startLedgerId, long endLedgerId) { + this(cursor, storage, startLedgerId, endLedgerId, new HashMap<>(), -1, -1, 0, 0, null, null); + } + + boolean containsMessage(long ledgerId, long entryId) { + RoaringBitmap bitSet = delayedIndexBitMap.get(ledgerId); + if (bitSet == null) { + return false; + } + return bitSet.contains(entryId, entryId + 1); + } + + void putIndexBit(long ledgerId, long entryId) { + delayedIndexBitMap.computeIfAbsent(ledgerId, k -> new RoaringBitmap()).add(entryId, entryId + 1); + } + + boolean removeIndexBit(long ledgerId, long entryId) { + boolean contained = false; + RoaringBitmap bitSet = delayedIndexBitMap.get(ledgerId); + if (bitSet != null && bitSet.contains(entryId, entryId + 1)) { + contained = true; + bitSet.remove(entryId, entryId + 1); + + if (bitSet.isEmpty()) { + delayedIndexBitMap.remove(ledgerId); + } + + if (numberBucketDelayedMessages > 0) { + numberBucketDelayedMessages--; + } + } + return contained; + } + + String bucketKey() { + return String.join(DELIMITER, DELAYED_BUCKET_KEY_PREFIX, String.valueOf(startLedgerId), + String.valueOf(endLedgerId)); + } + + Optional> getSnapshotCreateFuture() { + return Optional.ofNullable(snapshotCreateFuture); + } + + Optional getBucketId() { + return Optional.ofNullable(bucketId); + } + + long getAndUpdateBucketId() { + Optional bucketIdOptional = getBucketId(); + if (bucketIdOptional.isPresent()) { + return bucketIdOptional.get(); + } + + String bucketIdStr = cursor.getCursorProperties().get(bucketKey()); + long bucketId = Long.parseLong(bucketIdStr); + setBucketId(bucketId); + return bucketId; + } + + CompletableFuture asyncSaveBucketSnapshot( + ImmutableBucket bucketState, DelayedMessageIndexBucketSnapshotFormat.SnapshotMetadata snapshotMetadata, + List bucketSnapshotSegments) { + + return bucketSnapshotStorage.createBucketSnapshot(snapshotMetadata, bucketSnapshotSegments) + .thenCompose(newBucketId -> { + bucketState.setBucketId(newBucketId); + String bucketKey = bucketState.bucketKey(); + return putBucketKeyId(bucketKey, newBucketId).exceptionally(ex -> { + log.warn("Failed to record bucketId to cursor property, bucketKey: {}", bucketKey); + return null; + }).thenApply(__ -> newBucketId); + }); + } + + private CompletableFuture putBucketKeyId(String bucketKey, Long bucketId) { + Objects.requireNonNull(bucketId); + return executeWithRetry(() -> cursor.putCursorProperty(bucketKey, String.valueOf(bucketId)), + ManagedLedgerException.BadVersionException.class, MaxRetryTimes); + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java new file mode 100644 index 0000000000000..b7f0e0a1bc1e5 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java @@ -0,0 +1,324 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed.bucket; + +import static com.google.common.base.Preconditions.checkArgument; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Range; +import com.google.common.collect.RangeMap; +import com.google.common.collect.Table; +import com.google.common.collect.TreeRangeMap; +import io.netty.util.Timeout; +import io.netty.util.Timer; +import java.time.Clock; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.Optional; +import java.util.TreeSet; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import javax.annotation.concurrent.ThreadSafe; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.bookkeeper.mledger.impl.PositionImpl; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.pulsar.broker.delayed.AbstractDelayedDeliveryTracker; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.DelayedIndex; +import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; +import org.apache.pulsar.common.util.collections.TripleLongPriorityQueue; + +@Slf4j +@ThreadSafe +public class BucketDelayedDeliveryTracker extends AbstractDelayedDeliveryTracker { + + static final int AsyncOperationTimeoutSeconds = 30; + + private final long minIndexCountPerBucket; + + private final long timeStepPerBucketSnapshotSegment; + + private final int maxNumBuckets; + + private long numberDelayedMessages; + + private final MutableBucket lastMutableBucket; + + private final TripleLongPriorityQueue sharedBucketPriorityQueue; + + private final RangeMap immutableBuckets; + + private final Table snapshotSegmentLastIndexTable; + + public BucketDelayedDeliveryTracker(PersistentDispatcherMultipleConsumers dispatcher, + Timer timer, long tickTimeMillis, + boolean isDelayedDeliveryDeliverAtTimeStrict, + BucketSnapshotStorage bucketSnapshotStorage, + long minIndexCountPerBucket, long timeStepPerBucketSnapshotSegment, + int maxNumBuckets) { + this(dispatcher, timer, tickTimeMillis, Clock.systemUTC(), isDelayedDeliveryDeliverAtTimeStrict, + bucketSnapshotStorage, minIndexCountPerBucket, timeStepPerBucketSnapshotSegment, maxNumBuckets); + } + + public BucketDelayedDeliveryTracker(PersistentDispatcherMultipleConsumers dispatcher, + Timer timer, long tickTimeMillis, Clock clock, + boolean isDelayedDeliveryDeliverAtTimeStrict, + BucketSnapshotStorage bucketSnapshotStorage, + long minIndexCountPerBucket, long timeStepPerBucketSnapshotSegment, + int maxNumBuckets) { + super(dispatcher, timer, tickTimeMillis, clock, isDelayedDeliveryDeliverAtTimeStrict); + this.minIndexCountPerBucket = minIndexCountPerBucket; + this.timeStepPerBucketSnapshotSegment = timeStepPerBucketSnapshotSegment; + this.maxNumBuckets = maxNumBuckets; + this.sharedBucketPriorityQueue = new TripleLongPriorityQueue(); + this.immutableBuckets = TreeRangeMap.create(); + this.snapshotSegmentLastIndexTable = HashBasedTable.create(); + this.numberDelayedMessages = 0L; + ManagedCursor cursor = dispatcher.getCursor(); + this.lastMutableBucket = new MutableBucket(cursor, bucketSnapshotStorage); + } + + @Override + public void run(Timeout timeout) throws Exception { + synchronized (this) { + if (timeout == null || timeout.isCancelled()) { + return; + } + lastMutableBucket.moveScheduledMessageToSharedQueue(getCutoffTime(), sharedBucketPriorityQueue); + } + super.run(timeout); + } + + private Optional findImmutableBucket(long ledgerId) { + if (immutableBuckets.asMapOfRanges().isEmpty()) { + return Optional.empty(); + } + + return Optional.ofNullable(immutableBuckets.get(ledgerId)); + } + + private void sealBucket() { + Pair immutableBucketDelayedIndexPair = + lastMutableBucket.sealBucketAndAsyncPersistent(this.timeStepPerBucketSnapshotSegment, + this.sharedBucketPriorityQueue); + if (immutableBucketDelayedIndexPair != null) { + ImmutableBucket immutableBucket = immutableBucketDelayedIndexPair.getLeft(); + immutableBuckets.put(Range.closed(immutableBucket.startLedgerId, immutableBucket.endLedgerId), + immutableBucket); + + DelayedIndex lastDelayedIndex = immutableBucketDelayedIndexPair.getRight(); + snapshotSegmentLastIndexTable.put(lastDelayedIndex.getLedgerId(), lastDelayedIndex.getEntryId(), + immutableBucket); + if (log.isDebugEnabled()) { + log.debug("[{}] Create bucket snapshot, bucket: {}", dispatcher.getName(), + lastMutableBucket); + } + } + } + + @Override + public synchronized boolean addMessage(long ledgerId, long entryId, long deliverAt) { + if (containsMessage(ledgerId, entryId)) { + return true; + } + + if (deliverAt < 0 || deliverAt <= getCutoffTime()) { + return false; + } + + boolean existBucket = findImmutableBucket(ledgerId).isPresent(); + + // Create bucket snapshot + if (!existBucket && ledgerId > lastMutableBucket.endLedgerId + && lastMutableBucket.size() >= minIndexCountPerBucket + && !lastMutableBucket.isEmpty()) { + sealBucket(); + lastMutableBucket.resetLastMutableBucketRange(); + + if (immutableBuckets.asMapOfRanges().size() > maxNumBuckets) { + // TODO merge bucket snapshot (synchronize operate) + } + } + + if (ledgerId < lastMutableBucket.startLedgerId || existBucket) { + // If (ledgerId < startLedgerId || existBucket) means that message index belong to previous bucket range, + // enter sharedBucketPriorityQueue directly + sharedBucketPriorityQueue.add(deliverAt, ledgerId, entryId); + } else { + checkArgument(ledgerId >= lastMutableBucket.endLedgerId); + lastMutableBucket.addMessage(ledgerId, entryId, deliverAt); + } + + numberDelayedMessages++; + + if (log.isDebugEnabled()) { + log.debug("[{}] Add message {}:{} -- Delivery in {} ms ", dispatcher.getName(), ledgerId, entryId, + deliverAt - clock.millis()); + } + + updateTimer(); + + return true; + } + + @Override + public synchronized boolean hasMessageAvailable() { + long cutoffTime = getCutoffTime(); + + boolean hasMessageAvailable = getNumberOfDelayedMessages() > 0 && nextDeliveryTime() <= cutoffTime; + if (!hasMessageAvailable) { + updateTimer(); + } + return hasMessageAvailable; + } + + @Override + protected long nextDeliveryTime() { + if (lastMutableBucket.isEmpty() && !sharedBucketPriorityQueue.isEmpty()) { + return sharedBucketPriorityQueue.peekN1(); + } else if (sharedBucketPriorityQueue.isEmpty() && !lastMutableBucket.isEmpty()) { + return lastMutableBucket.nextDeliveryTime(); + } + long timestamp = lastMutableBucket.nextDeliveryTime(); + long bucketTimestamp = sharedBucketPriorityQueue.peekN1(); + return Math.min(timestamp, bucketTimestamp); + } + + @Override + public synchronized long getNumberOfDelayedMessages() { + return numberDelayedMessages; + } + + @Override + public synchronized long getBufferMemoryUsage() { + return this.lastMutableBucket.getBufferMemoryUsage() + sharedBucketPriorityQueue.bytesCapacity(); + } + + @Override + public synchronized NavigableSet getScheduledMessages(int maxMessages) { + long cutoffTime = getCutoffTime(); + + lastMutableBucket.moveScheduledMessageToSharedQueue(cutoffTime, sharedBucketPriorityQueue); + + NavigableSet positions = new TreeSet<>(); + int n = maxMessages; + + while (n > 0 && !sharedBucketPriorityQueue.isEmpty()) { + long timestamp = sharedBucketPriorityQueue.peekN1(); + if (timestamp > cutoffTime) { + break; + } + + long ledgerId = sharedBucketPriorityQueue.peekN2(); + long entryId = sharedBucketPriorityQueue.peekN3(); + positions.add(new PositionImpl(ledgerId, entryId)); + + sharedBucketPriorityQueue.pop(); + removeIndexBit(ledgerId, entryId); + + ImmutableBucket bucket = snapshotSegmentLastIndexTable.remove(ledgerId, entryId); + if (bucket != null) { + if (log.isDebugEnabled()) { + log.debug("[{}] Load next snapshot segment, bucket: {}", dispatcher.getName(), bucket); + } + // All message of current snapshot segment are scheduled, load next snapshot segment + // TODO make it asynchronous and not blocking this process + try { + bucket.asyncLoadNextBucketSnapshotEntry(false).thenAccept(indexList -> { + if (CollectionUtils.isEmpty(indexList)) { + return; + } + DelayedMessageIndexBucketSnapshotFormat.DelayedIndex + lastDelayedIndex = indexList.get(indexList.size() - 1); + this.snapshotSegmentLastIndexTable.put(lastDelayedIndex.getLedgerId(), + lastDelayedIndex.getEntryId(), bucket); + for (DelayedMessageIndexBucketSnapshotFormat.DelayedIndex index : indexList) { + sharedBucketPriorityQueue.add(index.getTimestamp(), index.getLedgerId(), + index.getEntryId()); + } + }).get(AsyncOperationTimeoutSeconds, TimeUnit.SECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + // TODO make this segment load again + throw new RuntimeException(e); + } + } + + --n; + --numberDelayedMessages; + } + + updateTimer(); + + return positions; + } + + @Override + public boolean shouldPauseAllDeliveries() { + return false; + } + + @Override + public synchronized void clear() { + cleanImmutableBuckets(true); + sharedBucketPriorityQueue.clear(); + lastMutableBucket.clear(); + snapshotSegmentLastIndexTable.clear(); + numberDelayedMessages = 0; + } + + @Override + public synchronized void close() { + super.close(); + lastMutableBucket.close(); + cleanImmutableBuckets(false); + sharedBucketPriorityQueue.close(); + } + + private void cleanImmutableBuckets(boolean delete) { + if (immutableBuckets != null) { + Iterator iterator = immutableBuckets.asMapOfRanges().values().iterator(); + while (iterator.hasNext()) { + ImmutableBucket bucket = iterator.next(); + bucket.clear(delete); + iterator.remove(); + } + } + } + + private boolean removeIndexBit(long ledgerId, long entryId) { + if (lastMutableBucket.removeIndexBit(ledgerId, entryId)) { + return true; + } + + return findImmutableBucket(ledgerId).map(bucket -> bucket.removeIndexBit(ledgerId, entryId)) + .orElse(false); + } + + @Override + public boolean containsMessage(long ledgerId, long entryId) { + if (lastMutableBucket.containsMessage(ledgerId, entryId)) { + return true; + } + + return findImmutableBucket(ledgerId).map(bucket -> bucket.containsMessage(ledgerId, entryId)) + .orElse(false); + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/BucketSnapshotStorage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketSnapshotStorage.java similarity index 98% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/BucketSnapshotStorage.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketSnapshotStorage.java index da411736d7740..3ab4ce1ad2792 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/BucketSnapshotStorage.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketSnapshotStorage.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.delayed; +package org.apache.pulsar.broker.delayed.bucket; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/ImmutableBucket.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/ImmutableBucket.java new file mode 100644 index 0000000000000..833030c575172 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/ImmutableBucket.java @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed.bucket; + +import static org.apache.pulsar.broker.delayed.bucket.BucketDelayedDeliveryTracker.AsyncOperationTimeoutSeconds; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.DelayedIndex; + +@Slf4j +class ImmutableBucket extends Bucket { + ImmutableBucket(ManagedCursor cursor, BucketSnapshotStorage storage, long startLedgerId, long endLedgerId) { + super(cursor, storage, startLedgerId, endLedgerId); + } + + /** + * Asynchronous load next bucket snapshot entry. + * @param isRecover whether used to recover bucket snapshot + * @return CompletableFuture + */ + CompletableFuture> asyncLoadNextBucketSnapshotEntry(boolean isRecover) { + if (log.isDebugEnabled()) { + log.debug("[{}] Load next bucket snapshot data, bucket: {}", cursor.getName(), this); + } + + // Wait bucket snapshot create finish + CompletableFuture snapshotCreateFuture = + getSnapshotCreateFuture().orElseGet(() -> CompletableFuture.completedFuture(null)) + .thenApply(__ -> null); + + return snapshotCreateFuture.thenCompose(__ -> { + final long bucketId = getAndUpdateBucketId(); + CompletableFuture loadMetaDataFuture = new CompletableFuture<>(); + if (isRecover) { + // TODO Recover bucket snapshot + } else { + loadMetaDataFuture.complete(currentSegmentEntryId + 1); + } + + return loadMetaDataFuture.thenCompose(nextSegmentEntryId -> { + if (nextSegmentEntryId > lastSegmentEntryId) { + // TODO Delete bucket snapshot + return CompletableFuture.completedFuture(null); + } + + return bucketSnapshotStorage.getBucketSnapshotSegment(bucketId, nextSegmentEntryId, nextSegmentEntryId) + .thenApply(bucketSnapshotSegments -> { + if (CollectionUtils.isEmpty(bucketSnapshotSegments)) { + return Collections.emptyList(); + } + + DelayedMessageIndexBucketSnapshotFormat.SnapshotSegment snapshotSegment = + bucketSnapshotSegments.get(0); + List indexList = + snapshotSegment.getIndexesList(); + this.setCurrentSegmentEntryId(nextSegmentEntryId); + return indexList; + }); + }); + }); + } + + void clear(boolean delete) { + delayedIndexBitMap.clear(); + getSnapshotCreateFuture().ifPresent(snapshotGenerateFuture -> { + if (delete) { + snapshotGenerateFuture.cancel(true); + // TODO delete bucket snapshot + } else { + try { + snapshotGenerateFuture.get(AsyncOperationTimeoutSeconds, TimeUnit.SECONDS); + } catch (Exception e) { + log.warn("Failed wait to snapshot generate, bucketId: {}, bucketKey: {}", getBucketId(), + bucketKey()); + } + } + }); + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/MutableBucket.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/MutableBucket.java new file mode 100644 index 0000000000000..36026298269d7 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/MutableBucket.java @@ -0,0 +1,203 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed.bucket; + +import static com.google.common.base.Preconditions.checkArgument; +import com.google.protobuf.ByteString; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.DelayedIndex; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.SnapshotMetadata; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.SnapshotSegment; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.SnapshotSegmentMetadata; +import org.apache.pulsar.common.util.collections.TripleLongPriorityQueue; +import org.roaringbitmap.RoaringBitmap; + +@Slf4j +class MutableBucket extends Bucket implements AutoCloseable { + + private final TripleLongPriorityQueue priorityQueue; + + MutableBucket(ManagedCursor cursor, + BucketSnapshotStorage bucketSnapshotStorage) { + super(cursor, bucketSnapshotStorage, -1L, -1L); + this.priorityQueue = new TripleLongPriorityQueue(); + } + + Pair sealBucketAndAsyncPersistent( + long timeStepPerBucketSnapshotSegment, + TripleLongPriorityQueue sharedQueue) { + if (priorityQueue.isEmpty()) { + return null; + } + long numMessages = 0; + + final long startLedgerId = getStartLedgerId(); + final long endLedgerId = getEndLedgerId(); + + List bucketSnapshotSegments = new ArrayList<>(); + List segmentMetadataList = new ArrayList<>(); + Map bitMap = new HashMap<>(); + SnapshotSegment.Builder snapshotSegmentBuilder = SnapshotSegment.newBuilder(); + SnapshotSegmentMetadata.Builder segmentMetadataBuilder = SnapshotSegmentMetadata.newBuilder(); + + long currentTimestampUpperLimit = 0; + while (!priorityQueue.isEmpty()) { + long timestamp = priorityQueue.peekN1(); + if (currentTimestampUpperLimit == 0) { + currentTimestampUpperLimit = timestamp + timeStepPerBucketSnapshotSegment - 1; + } + + long ledgerId = priorityQueue.peekN2(); + long entryId = priorityQueue.peekN3(); + + checkArgument(ledgerId >= startLedgerId && ledgerId <= endLedgerId); + + // Move first segment of bucket snapshot to sharedBucketPriorityQueue + if (segmentMetadataList.size() == 0) { + sharedQueue.add(timestamp, ledgerId, entryId); + } + + priorityQueue.pop(); + numMessages++; + + DelayedIndex delayedIndex = DelayedIndex.newBuilder() + .setTimestamp(timestamp) + .setLedgerId(ledgerId) + .setEntryId(entryId).build(); + + bitMap.computeIfAbsent(ledgerId, k -> new RoaringBitmap()).add(entryId, entryId + 1); + + snapshotSegmentBuilder.addIndexes(delayedIndex); + + if (priorityQueue.isEmpty() || priorityQueue.peekN1() > currentTimestampUpperLimit) { + segmentMetadataBuilder.setMaxScheduleTimestamp(timestamp); + currentTimestampUpperLimit = 0; + + Iterator> iterator = bitMap.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + byte[] array = new byte[entry.getValue().serializedSizeInBytes()]; + entry.getValue().serialize(ByteBuffer.wrap(array)); + segmentMetadataBuilder.putDelayedIndexBitMap(entry.getKey(), ByteString.copyFrom(array)); + iterator.remove(); + } + + segmentMetadataList.add(segmentMetadataBuilder.build()); + segmentMetadataBuilder.clear(); + + bucketSnapshotSegments.add(snapshotSegmentBuilder.build()); + snapshotSegmentBuilder.clear(); + } + } + + SnapshotMetadata bucketSnapshotMetadata = SnapshotMetadata.newBuilder() + .addAllMetadataList(segmentMetadataList) + .build(); + + final int lastSegmentEntryId = segmentMetadataList.size(); + + ImmutableBucket bucket = new ImmutableBucket(cursor, bucketSnapshotStorage, startLedgerId, endLedgerId); + bucket.setCurrentSegmentEntryId(1); + bucket.setNumberBucketDelayedMessages(numMessages); + bucket.setLastSegmentEntryId(lastSegmentEntryId); + + // Add the first snapshot segment last message to snapshotSegmentLastMessageTable + checkArgument(!bucketSnapshotSegments.isEmpty()); + SnapshotSegment snapshotSegment = bucketSnapshotSegments.get(0); + DelayedIndex lastDelayedIndex = snapshotSegment.getIndexes(snapshotSegment.getIndexesCount() - 1); + Pair result = Pair.of(bucket, lastDelayedIndex); + + CompletableFuture future = asyncSaveBucketSnapshot(bucket, + bucketSnapshotMetadata, bucketSnapshotSegments); + bucket.setSnapshotCreateFuture(future); + future.whenComplete((__, ex) -> { + if (ex == null) { + bucket.setSnapshotCreateFuture(null); + } else { + //TODO Record create snapshot failed + log.error("Failed to create snapshot: ", ex); + } + }); + + return result; + } + + void moveScheduledMessageToSharedQueue(long cutoffTime, TripleLongPriorityQueue sharedBucketPriorityQueue) { + while (!priorityQueue.isEmpty()) { + long timestamp = priorityQueue.peekN1(); + if (timestamp > cutoffTime) { + break; + } + + long ledgerId = priorityQueue.peekN2(); + long entryId = priorityQueue.peekN3(); + sharedBucketPriorityQueue.add(timestamp, ledgerId, entryId); + + priorityQueue.pop(); + } + } + + void resetLastMutableBucketRange() { + this.startLedgerId = -1L; + this.endLedgerId = -1L; + } + + void clear() { + this.resetLastMutableBucketRange(); + this.delayedIndexBitMap.clear(); + } + + public void close() { + priorityQueue.close(); + } + + long getBufferMemoryUsage() { + return priorityQueue.bytesCapacity(); + } + + boolean isEmpty() { + return priorityQueue.isEmpty(); + } + + long nextDeliveryTime() { + return priorityQueue.peekN1(); + } + + long size() { + return priorityQueue.size(); + } + + void addMessage(long ledgerId, long entryId, long deliverAt) { + priorityQueue.add(deliverAt, ledgerId, entryId); + if (startLedgerId == -1L) { + this.startLedgerId = ledgerId; + } + this.endLedgerId = ledgerId; + putIndexBit(ledgerId, entryId); + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/package-info.java new file mode 100644 index 0000000000000..0ab45ecded2cf --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed.bucket; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/package-info.java index 609382dc0db0d..9247ece8efbbc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptor.java index 6ba72370d1e3b..08b6c1559e5f3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptor.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinition.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinition.java index 9b3f3d7aaf61a..cfe5f0d8729d1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinition.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinition.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinitions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinitions.java index 2d026d368d28e..3c33ed576d223 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinitions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorDefinitions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorMetadata.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorMetadata.java index 686602c7bbef2..9343ba6ebc7b6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorMetadata.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorMetadata.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java index 96421e8b508e2..903feeb849a3a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoader.java index f309aff9a6170..a74730d23e102 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java index ade496c192f26..e2e6b2e051b72 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImpl.java index 0f634e0553ed8..bcc4a0754ad80 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/package-info.java index f91af71dd18e9..89ec9c1b4ae86 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /** * Pulsar broker interceptor. */ diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilter.java index 0e58be3bfcc62..1e5e41488d623 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterBadVersionException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterBadVersionException.java index 4be60de7cb753..180c05f9c3061 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterBadVersionException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterBadVersionException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterException.java index 4b78a24584ec2..5d9507d5bda8b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerFilterException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerHostUsage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerHostUsage.java index e728de1dad125..5653666400f26 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerHostUsage.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BrokerHostUsage.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BundleSplitStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BundleSplitStrategy.java index 0e5f931716231..d3d76b8e92db1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BundleSplitStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BundleSplitStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderBroker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderBroker.java index 7b31f86767c3c..acd34e151ed2a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderBroker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderBroker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderElectionService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderElectionService.java index 5f1fc9b5bb550..5ef95761e4ec6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderElectionService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LeaderElectionService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java index 26528491f1ebb..aec527b5c9645 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadCalculator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadCalculator.java index 7e7c50708a1a7..6d372552d57b4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadCalculator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadCalculator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadData.java index 066b656a9dd0a..87f630f1a09fb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java index fc0b0ddfd357e..e34215d199648 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadRanker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadRanker.java index d9845b65d4490..f0775cdd54d52 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadRanker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadRanker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReport.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReport.java index 376068afd8bea..9a00154cbfc9d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReport.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReport.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReportUpdaterTask.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReportUpdaterTask.java index 23405138affcd..e76967ff07dc6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReportUpdaterTask.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadReportUpdaterTask.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadResourceQuotaUpdaterTask.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadResourceQuotaUpdaterTask.java index 5f805d2bccddd..3ad31fcdfecc4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadResourceQuotaUpdaterTask.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadResourceQuotaUpdaterTask.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingStrategy.java index 6e102061c9981..ee136d6e9b851 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingTask.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingTask.java index b4a01d89e5221..eb7eacec60815 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingTask.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadSheddingTask.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManager.java index b0ca2b5412408..fa6895568e918 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java index 112e59d557f52..2be8200aef5c1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/NoopLoadManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/NoopLoadManager.java index 424cb1514c557..1ab56b50cdef4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/NoopLoadManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/NoopLoadManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/PlacementStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/PlacementStrategy.java index ce25713250fa3..63ec8a8b253e6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/PlacementStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/PlacementStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceDescription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceDescription.java index a8769accba9fa..5dafab0ac26a4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceDescription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceDescription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceUnit.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceUnit.java index 51becdb7f77cd..ef4dd2a97b280 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceUnit.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ResourceUnit.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceRequest.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceRequest.java index 239058f63d6c2..24d494dbc69ce 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceRequest.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceRequest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceUnit.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceUnit.java index 824069f92fac7..cbadd19ea5e8f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceUnit.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ServiceUnit.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitState.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitState.java new file mode 100644 index 0000000000000..cd1092a26ea04 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitState.java @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel; + +import java.util.Map; +import java.util.Set; + +/** + * Defines the possible states for service units. + * + * The following diagram defines the valid state changes + * + * ┌───────────┐ + * ┌──────────┤ released │◄────────┐ + * │own └───────────┘ │release + * │ │ + * │ │ + * ▼ │ + * ┌────────┐ assign(transfer) ┌─────┴────┐ + * │ ├───────────────────►│ │ + * │ owned │ │ assigned │ + * │ │◄───────────────────┤ │ + * └──┬─────┤ own └──────────┘ + * │ ▲ │ ▲ + * │ │ │ │ + * │ │ └──────────────┐ │ + * │ │ │ │ + * │ │ unload │ │ assign(assignment) + * split │ │ │ │ + * │ │ │ │ + * │ │ create(child) │ │ + * │ │ │ │ + * ▼ │ │ │ + * ┌─────┴─────┐ └─────►┌───┴──────┐ + * │ │ │ │ + * │ splitting ├────────────────► │ free │ + * │ │ discard(parent)│ │ + * └───────────┘ └──────────┘ + */ +public enum ServiceUnitState { + + Free, // not owned by any broker (terminal state) + + Owned, // owned by a broker (terminal state) + + Assigned, // the ownership is assigned(but the assigned broker has not been notified the ownership yet) + + Released, // the source broker's ownership has been released (e.g. the topic connections are closed) + + Splitting; // the service unit(e.g. bundle) is in the process of splitting. + + private static Map> validTransitions = Map.of( + Free, Set.of(Owned, Assigned), + Owned, Set.of(Assigned, Splitting, Free), + Assigned, Set.of(Owned, Released, Free), + Released, Set.of(Owned, Free), + Splitting, Set.of(Free) + ); + + public static boolean isValidTransition(ServiceUnitState from, ServiceUnitState to) { + Set transitions = validTransitions.get(from); + return transitions.contains(to); + } + +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java new file mode 100644 index 0000000000000..3727050ec015e --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java @@ -0,0 +1,157 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel; + +import java.io.Closeable; +import java.util.concurrent.CompletableFuture; +import org.apache.pulsar.broker.PulsarServerException; +import org.apache.pulsar.broker.loadbalance.extensions.models.Split; +import org.apache.pulsar.broker.loadbalance.extensions.models.Unload; +import org.apache.pulsar.metadata.api.NotificationType; +import org.apache.pulsar.metadata.api.extended.SessionEvent; + +/** + * Defines the ServiceUnitStateChannel interface. + */ +public interface ServiceUnitStateChannel extends Closeable { + + /** + * Starts the ServiceUnitStateChannel. + * @throws PulsarServerException if it fails to start the channel. + */ + void start() throws PulsarServerException; + + /** + * Closes the ServiceUnitStateChannel. + * @throws PulsarServerException if it fails to close the channel. + */ + @Override + void close() throws PulsarServerException; + + /** + * Schedules the periodic compaction for the system topic in this channel. + * @throws PulsarServerException if it fails to schedule the compaction. + */ + void scheduleCompaction() throws PulsarServerException; + + /** + * Gets the current owner broker of the system topic in this channel. + * @return the service url without the protocol prefix, 'http://'. e.g. broker-xyz:abcd + * + * ServiceUnitStateChannel elects the separate leader as the owner broker of the system topic in this channel. + * If there is no leader at the moment, it will throw a runtime exception. + */ + String getChannelOwner(); + + /** + * Checks if the current broker is the owner broker of the system topic in this channel. + * @return True if the current broker is the owner. Otherwise, false. + */ + boolean isChannelOwner(); + + /** + * Handles the metadata session events to track + * if the connection between the broker and metadata store is stable or not. + * This will be registered as a metadata SessionEvent listener. + * + * The stability of the metadata connection is important + * to determine how to handle the broker deletion(unavailable) event notified from the metadata store. + * + * Please refer to handleBrokerRegistrationEvent(String broker, NotificationType type) for more details. + * + * @param event metadata session events + */ + void handleMetadataSessionEvent(SessionEvent event); + + /** + * Handles the broker registration event from the broker registry. + * This will be registered as a broker registry listener. + * + * Case 1: If NotificationType is Deleted, + * it will schedule a clean-up operation to release the ownerships of the deleted broker. + * + * Sub-case1: If the metadata connection has been stable for long time, + * it will immediately execute the cleanup operation to guarantee high-availability. + * + * Sub-case2: If the metadata connection has been stable only for short time, + * it will defer the clean-up operation for some time and execute it. + * This is to gracefully handle the case when metadata connection is flaky -- + * If the deleted broker comes back very soon, + * we better cancel the clean-up operation for high-availability. + * + * Sub-case3: If the metadata connection is unstable, + * it will not schedule the clean-up operation, as the broker-metadata connection is lost. + * The brokers will continue to serve existing topics connections, + * and we better not to interrupt the existing topic connections for high-availability. + * + * + * Case 2: If NotificationType is Created, + * it will cancel any scheduled clean-up operation if still not executed. + * + * @param broker notified broker + * @param type notification type + */ + void handleBrokerRegistrationEvent(String broker, NotificationType type); + + /** + * Asynchronously gets the current owner broker of the service unit. + * + * + * @param serviceUnit (e.g. bundle) + * @return the future object of the owner broker + * + * Case 1: If the service unit is owned, it returns the completed future object with the current owner. + * Case 2: If the service unit's assignment is ongoing, it returns the non-completed future object. + * Sub-case1: If the assigned broker is available and finally takes the ownership, + * the future object will complete and return the owner broker. + * Sub-case2: If the assigned broker does not take the ownership in time, + * the future object will time out. + * Case 3: If none of them, it returns null. + */ + CompletableFuture getOwnerAsync(String serviceUnit); + + /** + * Asynchronously publishes the service unit assignment event to the system topic in this channel. + * It de-duplicates assignment events if there is any ongoing assignment event for the same service unit. + * @param serviceUnit (e.g bundle) + * @param broker the assigned broker + * @return the completable future object with the owner broker + * case 1: If the assigned broker is available and takes the ownership, + * the future object will complete and return the owner broker. + * The returned owner broker could be different from the input broker (due to assignment race-condition). + * case 2: If the assigned broker does not take the ownership in time, + * the future object will time out. + */ + CompletableFuture publishAssignEventAsync(String serviceUnit, String broker); + + /** + * Asynchronously publishes the service unit unload event to the system topic in this channel. + * @param unload (unload specification object) + * @return the completable future object staged from the event message sendAsync. + */ + CompletableFuture publishUnloadEventAsync(Unload unload); + + /** + * Asynchronously publishes the bundle split event to the system topic in this channel. + * @param split (split specification object) + * @return the completable future object staged from the event message sendAsync. + */ + CompletableFuture publishSplitEventAsync(Split split); + +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateData.java new file mode 100644 index 0000000000000..cba459b7875f7 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateData.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel; + + +import java.util.Objects; + +/** + * Defines data for the service unit state changes. + * This data will be broadcast in ServiceUnitStateChannel. + */ + +public record ServiceUnitStateData(ServiceUnitState state, String broker, String sourceBroker, long timestamp) { + + public ServiceUnitStateData { + Objects.requireNonNull(state); + Objects.requireNonNull(broker); + } + + public ServiceUnitStateData(ServiceUnitState state, String broker, String sourceBroker) { + this(state, broker, sourceBroker, System.currentTimeMillis()); + } + + public ServiceUnitStateData(ServiceUnitState state, String broker) { + this(state, broker, null, System.currentTimeMillis()); + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/package-info.java new file mode 100644 index 0000000000000..a95ce9ea8e567 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/Split.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/Split.java new file mode 100644 index 0000000000000..fcec8b0ae5541 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/Split.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.models; + +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +/** + * Defines the information required for a service unit split(e.g. bundle split). + */ +public record Split( + String serviceUnit, String sourceBroker, Map> splitServiceUnitToDestBroker) { + + public Split { + Objects.requireNonNull(serviceUnit); + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/Unload.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/Unload.java new file mode 100644 index 0000000000000..d474011919d97 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/Unload.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.models; + +import java.util.Objects; +import java.util.Optional; + +/** + * Defines the information required to unload or transfer a service unit(e.g. bundle). + */ +public record Unload(String sourceBroker, String serviceUnit, Optional destBroker) { + public Unload { + Objects.requireNonNull(sourceBroker); + Objects.requireNonNull(serviceUnit); + } + public Unload(String sourceBroker, String serviceUnit) { + this(sourceBroker, serviceUnit, Optional.empty()); + } +} \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/package-info.java new file mode 100644 index 0000000000000..db9028076f992 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/models/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.models; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BrokerVersionFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BrokerVersionFilter.java index db709cce978c0..4509911191212 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BrokerVersionFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BrokerVersionFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTask.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTask.java index 480f466c2ab4d..c0c6eebc32a6e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTask.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTask.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/DeviationShedder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/DeviationShedder.java index de2ce6cedc7de..fd90a728478f4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/DeviationShedder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/DeviationShedder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/GenericBrokerHostUsageImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/GenericBrokerHostUsageImpl.java index 1405e8e3953ac..1a28bd7a39269 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/GenericBrokerHostUsageImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/GenericBrokerHostUsageImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java index d2662b6d981d1..fe161467338ff 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastResourceUsageWithWeight.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastResourceUsageWithWeight.java index 4763eaf23daa8..3abb6d6283558 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastResourceUsageWithWeight.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastResourceUsageWithWeight.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -91,7 +91,7 @@ private double updateAndGetMaxResourceUsageWithWeight(String broker, BrokerData ServiceConfiguration conf) { final double historyPercentage = conf.getLoadBalancerHistoryResourcePercentage(); Double historyUsage = brokerAvgResourceUsageWithWeight.get(broker); - double resourceUsage = brokerData.getLocalData().getMaxResourceUsageWithWeightWithinLimit( + double resourceUsage = brokerData.getLocalData().getMaxResourceUsageWithWeight( conf.getLoadBalancerCPUResourceWeight(), conf.getLoadBalancerMemoryResourceWeight(), conf.getLoadBalancerDirectMemoryResourceWeight(), diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java index b605c523ddc40..ecba0d3ae0169 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java index a298558f34502..2c90b8a4047a2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java index faa6fe48bbc6a..7d1a21a8c900e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -20,7 +20,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import io.netty.util.concurrent.DefaultThreadFactory; import java.util.ArrayList; import java.util.Collection; import java.util.ConcurrentModificationException; @@ -60,6 +59,7 @@ import org.apache.pulsar.broker.resources.ClusterResources; import org.apache.pulsar.broker.stats.prometheus.metrics.Summary; import org.apache.pulsar.client.admin.PulsarAdminException; +import org.apache.pulsar.client.util.ExecutorProvider; import org.apache.pulsar.common.naming.NamespaceBundleFactory; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.ServiceUnitId; @@ -212,7 +212,8 @@ public ModularLoadManagerImpl() { loadData = new LoadData(); loadSheddingPipeline = new ArrayList<>(); preallocatedBundleToBroker = new ConcurrentHashMap<>(); - scheduler = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-modular-load-manager")); + scheduler = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("pulsar-modular-load-manager")); this.brokerToFailureDomainMap = new HashMap<>(); this.brokerTopicLoadingPredicate = new BrokerTopicLoadingPredicate() { @@ -442,9 +443,8 @@ private boolean needBrokerDataUpdate() { long timeSinceLastReportWrittenToStore = System.currentTimeMillis() - localData.getLastUpdate(); if (timeSinceLastReportWrittenToStore > updateMaxIntervalMillis) { log.info("Writing local data to metadata store because time since last" - + " update exceeded threshold of {} minutes. ResourceUsage:[{}]", - conf.getLoadBalancerReportUpdateMaxIntervalMinutes(), - localData.printResourceUsage()); + + " update exceeded threshold of {} minutes", + conf.getLoadBalancerReportUpdateMaxIntervalMinutes()); // Always update after surpassing the maximum interval. return true; } @@ -458,10 +458,9 @@ private boolean needBrokerDataUpdate() { percentChange(lastData.getNumBundles(), localData.getNumBundles())))); if (maxChange > conf.getLoadBalancerReportUpdateThresholdPercentage()) { log.info("Writing local data to metadata store because maximum change {}% exceeded threshold {}%; " - + "time since last report written is {} seconds. ResourceUsage:[{}]", maxChange, + + "time since last report written is {} seconds", maxChange, conf.getLoadBalancerReportUpdateThresholdPercentage(), - timeSinceLastReportWrittenToStore / 1000.0, - localData.printResourceUsage()); + timeSinceLastReportWrittenToStore / 1000.0); return true; } return false; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java index d18cd6165865f..5f7cd5b8c38fa 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java index 1eff3dd250a44..a4eb5077224ce 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -114,9 +114,7 @@ public Multimap findBundlesForUnloading(final LoadData loadData, }).filter(e -> { // Only consider bundles that were not already unloaded recently return !recentlyUnloadedBundles.containsKey(e.getLeft()); - }).filter(e -> - localData.getBundles().contains(e.getLeft()) - ).sorted((e1, e2) -> { + }).sorted((e1, e2) -> { // Sort by throughput in reverse order return Double.compare(e2.getRight(), e1.getRight()); }).forEach(e -> { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarLoadReportImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarLoadReportImpl.java index 53c005279043a..caf9707df5805 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarLoadReportImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarLoadReportImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarResourceDescription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarResourceDescription.java index 676d15a51dc6a..3a1e5bce48ebf 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarResourceDescription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarResourceDescription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceRequest.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceRequest.java index 59da5313281a3..625ef7d1237d1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceRequest.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceRequest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceUnit.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceUnit.java index 277675347f7d4..b99f0c3f6a150 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceUnit.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/PulsarServiceUnit.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ResourceAvailabilityRanker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ResourceAvailabilityRanker.java index 2effd4eedc641..6c1c174f0c36f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ResourceAvailabilityRanker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ResourceAvailabilityRanker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadCalculatorImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadCalculatorImpl.java index 8998ea9cc24a8..3d9e363b4af9f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadCalculatorImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadCalculatorImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java index be45e215811b5..c2c0d1947c93e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -26,7 +26,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.common.collect.TreeMultimap; -import io.netty.util.concurrent.DefaultThreadFactory; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; @@ -55,6 +54,7 @@ import org.apache.pulsar.broker.loadbalance.PlacementStrategy; import org.apache.pulsar.broker.loadbalance.ResourceUnit; import org.apache.pulsar.broker.loadbalance.impl.LoadManagerShared.BrokerTopicLoadingPredicate; +import org.apache.pulsar.client.util.ExecutorProvider; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.ServiceUnitId; import org.apache.pulsar.common.policies.data.ResourceQuota; @@ -189,7 +189,7 @@ public class SimpleLoadManagerImpl implements LoadManager, Consumer()); this.currentLoadReports = new HashMap<>(); this.resourceUnitRankings = new HashMap<>(); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceAllocationPolicies.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceAllocationPolicies.java index 7021a767fcde2..4a1577a4e28b6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceAllocationPolicies.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceAllocationPolicies.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceUnit.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceUnit.java index 863a75dff4235..3b67b73dc682a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceUnit.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleResourceUnit.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedder.java index 928f045369cff..c75c9c8a3178c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -56,37 +56,16 @@ public class ThresholdShedder implements LoadSheddingStrategy { private static final double LOWER_BOUNDARY_THRESHOLD_MARGIN = 0.5; private static final double MB = 1024 * 1024; - - private static final long LOAD_LOG_SAMPLE_DELAY_IN_SEC = 5 * 60; // 5 mins private final Map brokerAvgResourceUsage = new HashMap<>(); - private long lastSampledLoadLogTS = 0; - - - private static int toPercentage(double usage) { - return (int) (usage * 100); - } - - private boolean canSampleLog() { - long now = System.currentTimeMillis() / 1000; - boolean sampleLog = now - lastSampledLoadLogTS >= LOAD_LOG_SAMPLE_DELAY_IN_SEC; - if (sampleLog) { - lastSampledLoadLogTS = now; - } - return sampleLog; - } @Override public Multimap findBundlesForUnloading(final LoadData loadData, final ServiceConfiguration conf) { selectedBundlesCache.clear(); - boolean sampleLog = canSampleLog(); final double threshold = conf.getLoadBalancerBrokerThresholdShedderPercentage() / 100.0; final Map recentlyUnloadedBundles = loadData.getRecentlyUnloadedBundles(); final double minThroughputThreshold = conf.getLoadBalancerBundleUnloadMinThroughputThreshold() * MB; - final double avgUsage = getBrokerAvgUsage(loadData, conf, sampleLog); - if (sampleLog) { - log.info("brokers' resource avgUsage:{}%", toPercentage(avgUsage)); - } + final double avgUsage = getBrokerAvgUsage(loadData, conf.getLoadBalancerHistoryResourcePercentage(), conf); if (avgUsage == 0) { log.warn("average max resource usage is 0"); @@ -98,9 +77,8 @@ public Multimap findBundlesForUnloading(final LoadData loadData, final double currentUsage = brokerAvgResourceUsage.getOrDefault(broker, 0.0); if (currentUsage < avgUsage + threshold) { - if (sampleLog) { - log.info("[{}] broker is not overloaded, ignoring at this point, currentUsage:{}%", - broker, toPercentage(currentUsage)); + if (log.isDebugEnabled()) { + log.debug("[{}] broker is not overloaded, ignoring at this point", broker); } return; } @@ -111,13 +89,14 @@ public Multimap findBundlesForUnloading(final LoadData loadData, double minimumThroughputToOffload = brokerCurrentThroughput * percentOfTrafficToOffload; if (minimumThroughputToOffload < minThroughputThreshold) { - if (sampleLog) { - log.info("[{}] broker is planning to shed throughput {} MByte/s less than " + if (log.isDebugEnabled()) { + log.debug("[{}] broker is planning to shed throughput {} MByte/s less than " + "minimumThroughputThreshold {} MByte/s, skipping bundle unload.", broker, minimumThroughputToOffload / MB, minThroughputThreshold / MB); } return; } + log.info( "Attempting to shed load on {}, which has max resource usage above avgUsage and threshold {}%" + " > {}% + {}% -- Offloading at least {} MByte/s of traffic, left throughput {} MByte/s", @@ -168,16 +147,15 @@ private void filterAndSelectBundle(LoadData loadData, Map recently }); } - private double getBrokerAvgUsage(final LoadData loadData, - final ServiceConfiguration conf, boolean sampleLog) { - double historyPercentage = conf.getLoadBalancerHistoryResourcePercentage(); + private double getBrokerAvgUsage(final LoadData loadData, final double historyPercentage, + final ServiceConfiguration conf) { double totalUsage = 0.0; int totalBrokers = 0; for (Map.Entry entry : loadData.getBrokerData().entrySet()) { LocalBrokerData localBrokerData = entry.getValue().getLocalData(); String broker = entry.getKey(); - totalUsage += updateAvgResourceUsage(broker, localBrokerData, historyPercentage, conf, sampleLog); + totalUsage += updateAvgResourceUsage(broker, localBrokerData, historyPercentage, conf); totalBrokers++; } @@ -185,8 +163,7 @@ private double getBrokerAvgUsage(final LoadData loadData, } private double updateAvgResourceUsage(String broker, LocalBrokerData localBrokerData, - final double historyPercentage, final ServiceConfiguration conf, - boolean sampleLog) { + final double historyPercentage, final ServiceConfiguration conf) { Double historyUsage = brokerAvgResourceUsage.get(broker); double resourceUsage = localBrokerData.getMaxResourceUsageWithWeight( @@ -194,41 +171,6 @@ private double updateAvgResourceUsage(String broker, LocalBrokerData localBroker conf.getLoadBalancerMemoryResourceWeight(), conf.getLoadBalancerDirectMemoryResourceWeight(), conf.getLoadBalancerBandwithInResourceWeight(), conf.getLoadBalancerBandwithOutResourceWeight()); - - if (sampleLog) { - log.info("{} broker load: historyUsage={}%, resourceUsage={}%", - broker, - historyUsage == null ? 0 : toPercentage(historyUsage), - toPercentage(resourceUsage)); - } - - // wrap if resourceUsage is bigger than 1.0 - if (resourceUsage > 1.0) { - log.error("{} broker resourceUsage is bigger than 100%. " - + "Some of the resource limits are mis-configured. " - + "Try to disable the error resource signals by setting their weights to zero " - + "or fix the resource limit configurations. " - + "Ref:https://pulsar.apache.org/docs/administration-load-balance/#thresholdshedder " - + "ResourceUsage:[{}], " - + "CPUResourceWeight:{}, MemoryResourceWeight:{}, DirectMemoryResourceWeight:{}, " - + "BandwithInResourceWeight:{}, BandwithOutResourceWeight:{}", - broker, - localBrokerData.printResourceUsage(), - conf.getLoadBalancerCPUResourceWeight(), - conf.getLoadBalancerMemoryResourceWeight(), - conf.getLoadBalancerDirectMemoryResourceWeight(), - conf.getLoadBalancerBandwithInResourceWeight(), - conf.getLoadBalancerBandwithOutResourceWeight()); - - resourceUsage = localBrokerData.getMaxResourceUsageWithWeightWithinLimit( - conf.getLoadBalancerCPUResourceWeight(), - conf.getLoadBalancerMemoryResourceWeight(), conf.getLoadBalancerDirectMemoryResourceWeight(), - conf.getLoadBalancerBandwithInResourceWeight(), - conf.getLoadBalancerBandwithOutResourceWeight()); - - log.warn("{} broker recomputed max resourceUsage={}%. Skipped usage signals bigger than 100%", - broker, toPercentage(resourceUsage)); - } historyUsage = historyUsage == null ? resourceUsage : historyUsage * historyPercentage + (1 - historyPercentage) * resourceUsage; @@ -239,7 +181,7 @@ private double updateAvgResourceUsage(String broker, LocalBrokerData localBroker private void tryLowerBoundaryShedding(LoadData loadData, ServiceConfiguration conf) { // Select the broker with the most resource usage. final double threshold = conf.getLoadBalancerBrokerThresholdShedderPercentage() / 100.0; - final double avgUsage = getBrokerAvgUsage(loadData, conf, canSampleLog()); + final double avgUsage = getBrokerAvgUsage(loadData, conf.getLoadBalancerHistoryResourcePercentage(), conf); Pair result = getMaxUsageBroker(loadData, threshold, avgUsage); boolean hasBrokerBelowLowerBound = result.getLeft(); String maxUsageBroker = result.getRight(); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedder.java index c31f9e14196df..b92af5b7c69f3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/WRRPlacementStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/WRRPlacementStrategy.java index 54a4646f86a74..bee9ae6d5f00f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/WRRPlacementStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/WRRPlacementStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/package-info.java index 06fdd0a7fb112..5e5ca40f2a75f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/package-info.java index 9d148446ca653..223446837332a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/LookupResult.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/LookupResult.java index 7ed90c9de6e1a..face01a8bffd7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/LookupResult.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/LookupResult.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/NamespaceData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/NamespaceData.java index 4e59906e1a16f..c56ccb1fbfb2c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/NamespaceData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/NamespaceData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/RedirectData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/RedirectData.java index 38351f1a6d6c7..1d9f6094bb725 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/RedirectData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/RedirectData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java index 3c29ef1597a3f..0acde9947226b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/TopicLookupBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -68,11 +68,12 @@ protected CompletableFuture internalLookupTopicAsync(TopicName topic // Currently, it's hard to check the non-persistent-non-partitioned topic, because it only exists // in the broker, it doesn't have metadata. If the topic is non-persistent and non-partitioned, // we'll return the true flag. - CompletableFuture existFuture = pulsar().getBrokerService() - .isAllowAutoTopicCreation(topicName) - || (!topicName.isPersistent() && !topicName.isPartitioned()) + CompletableFuture existFuture = (!topicName.isPersistent() && !topicName.isPartitioned()) ? CompletableFuture.completedFuture(true) - : pulsar().getNamespaceService().checkTopicExists(topicName); + : pulsar().getNamespaceService().checkTopicExists(topicName) + .thenCompose(exists -> exists ? CompletableFuture.completedFuture(true) + : pulsar().getBrokerService().isAllowAutoTopicCreationAsync(topicName)); + return existFuture; }) .thenCompose(exist -> { @@ -250,9 +251,19 @@ public static CompletableFuture lookupTopicAsync(PulsarService pulsarSe requestId, false)); }).exceptionally(ex -> { + Throwable throwable = FutureUtil.unwrapCompletionException(ex); + if (throwable instanceof RestException restException){ + if (restException.getResponse().getStatus() + == Response.Status.NOT_FOUND.getStatusCode()) { + validationFuture.complete( + newLookupErrorResponse(ServerError.TopicNotFound, + throwable.getMessage(), requestId)); + return null; + } + } validationFuture.complete( newLookupErrorResponse(ServerError.MetadataError, - FutureUtil.unwrapCompletionException(ex).getMessage(), requestId)); + throwable.getMessage(), requestId)); return null; }); }) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/package-info.java index 6b2a61b00438c..8460f41d681c2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java index 064a393da6570..ac471a1a819e6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/package-info.java index 4b1cdc4be8aea..81fe5cb610575 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java index 01fb15ba4951c..18dc75860888f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/package-info.java index d0bebb15daed2..3c12f8a65cabc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/LookupOptions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/LookupOptions.java index 6552090e1907d..431266682c51c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/LookupOptions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/LookupOptions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceBundleOwnershipListener.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceBundleOwnershipListener.java index eacade4c60b8f..edfb8d213da7c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceBundleOwnershipListener.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceBundleOwnershipListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java index e86007b64460d..1ffc03786d555 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java index 127a5be70bb16..4be64f4b7b50c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -113,32 +113,17 @@ * @see org.apache.pulsar.broker.PulsarService */ public class NamespaceService implements AutoCloseable { - - public enum AddressType { - BROKER_URL, LOOKUP_URL - } - private static final Logger LOG = LoggerFactory.getLogger(NamespaceService.class); private final ServiceConfiguration config; - - private final MetadataCache localPoliciesCache; - private final AtomicReference loadManager; - private final PulsarService pulsar; - private final OwnershipCache ownershipCache; private final MetadataCache localBrokerDataCache; - private final NamespaceBundleFactory bundleFactory; - - private int uncountedNamespaces; - private final String host; private static final int BUNDLE_SPLIT_RETRY_LIMIT = 7; - public static final String SLA_NAMESPACE_PROPERTY = "sla-monitor"; public static final Pattern HEARTBEAT_NAMESPACE_PATTERN = Pattern.compile("pulsar/[^/]+/([^:]+:\\d+)"); public static final Pattern HEARTBEAT_NAMESPACE_PATTERN_V2 = Pattern.compile("pulsar/([^:]+:\\d+)"); @@ -166,8 +151,6 @@ public enum AddressType { /** * Default constructor. - * - * @throws PulsarServerException */ public NamespaceService(PulsarService pulsar) { this.pulsar = pulsar; @@ -180,7 +163,6 @@ public NamespaceService(PulsarService pulsar) { ConcurrentOpenHashMap.newBuilder().build(); this.bundleOwnershipListeners = new CopyOnWriteArrayList<>(); this.localBrokerDataCache = pulsar.getLocalMetadataStore().getMetadataCache(LocalBrokerData.class); - this.localPoliciesCache = pulsar.getLocalMetadataStore().getMetadataCache(LocalPolicies.class); } public void initialize() { @@ -302,13 +284,11 @@ public void registerBootstrapNamespaces() throws PulsarServerException { // ensure that we own the heartbeat namespace if (registerNamespace(getHeartbeatNamespace(host, config), true)) { - this.uncountedNamespaces++; LOG.info("added heartbeat namespace name in local cache: ns={}", getHeartbeatNamespace(host, config)); } // ensure that we own the heartbeat namespace if (registerNamespace(getHeartbeatNamespaceV2(host, config), true)) { - this.uncountedNamespaces++; LOG.info("added heartbeat namespace name in local cache: ns={}", getHeartbeatNamespaceV2(host, config)); } @@ -1183,7 +1163,15 @@ public CompletableFuture> getOwnedTopicListForNamespaceBundle(Names public CompletableFuture checkTopicExists(TopicName topic) { if (topic.isPersistent()) { - return pulsar.getPulsarResources().getTopicResources().persistentTopicExists(topic); + if (topic.isPartitioned()) { + return pulsar.getPulsarResources().getNamespaceResources().getPartitionedTopicResources() + .partitionedTopicExistsAsync(TopicName.get(topic.getPartitionedTopicName())) + .thenCompose(exists -> exists + ? pulsar.getPulsarResources().getTopicResources().persistentTopicExists(topic) + : CompletableFuture.completedFuture(false)); + } else { + return pulsar.getPulsarResources().getTopicResources().persistentTopicExists(topic); + } } else { if (topic.isPartitioned()) { final TopicName partitionedTopicName = TopicName.get(topic.getPartitionedTopicName()); @@ -1461,8 +1449,6 @@ public static boolean isHeartbeatNamespace(ServiceUnitId ns) { public boolean registerSLANamespace() throws PulsarServerException { boolean isNameSpaceRegistered = registerNamespace(getSLAMonitorNamespace(host, config), false); if (isNameSpaceRegistered) { - this.uncountedNamespaces++; - if (LOG.isDebugEnabled()) { LOG.debug("Added SLA Monitoring namespace name in local cache: ns={}", getSLAMonitorNamespace(host, config)); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java index ac6e30e7c5233..e7cf23a042750 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java index e0cdd129a8f03..a9dd44d4589d9 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,6 +21,7 @@ import com.github.benmanes.caffeine.cache.AsyncCacheLoader; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.Caffeine; +import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.List; @@ -207,7 +208,7 @@ public CompletableFuture tryAcquiringOwnership(Namespace * */ public CompletableFuture removeOwnership(NamespaceBundle bundle) { - ResourceLock lock = locallyAcquiredLocks.get(bundle); + ResourceLock lock = locallyAcquiredLocks.remove(bundle); if (lock == null) { // We don't own the specified bundle anymore return CompletableFuture.completedFuture(null); @@ -328,6 +329,12 @@ public void invalidateLocalOwnerCache(NamespaceBundle namespaceBundle) { this.ownedBundlesCache.synchronous().invalidate(namespaceBundle); } + @VisibleForTesting + public Map> getLocallyAcquiredLocks() { + return locallyAcquiredLocks; + } + + public synchronized boolean refreshSelfOwnerInfo() { this.selfOwnerInfo = new NamespaceEphemeralData(pulsar.getBrokerServiceUrl(), pulsar.getBrokerServiceUrlTls(), pulsar.getSafeWebServiceAddress(), diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/ServiceUnitUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/ServiceUnitUtils.java index b209abf50bf1c..c86aac5316fb9 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/ServiceUnitUtils.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/ServiceUnitUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/package-info.java index e7243dc2a8b68..747637188b7ea 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/package-info.java index 874ac45a2f500..5f89b7356c379 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandler.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandler.java index 482d7a6f0b71b..85d2a93df7b8c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandler.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandler.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinition.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinition.java index 6123b390aa0f6..cd06a89f33b32 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinition.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinition.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinitions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinitions.java index d79bd7f024621..0401cae4e89b8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinitions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerDefinitions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerMetadata.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerMetadata.java index 86c486fea6d42..50c06cf8bc4d1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerMetadata.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerMetadata.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java index c65bf3713aebe..0f75a06cb3ef4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoader.java index 63aa6696917d9..d648c261403d4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlers.java index a7d09bff9236f..42a82b2de762b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/package-info.java index 211099e6463c2..3c18262d8a3bf 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/protocol/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroup.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroup.java index dc0a25cc1f479..ef40a18ab08ed 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroup.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListener.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListener.java index 7c487b8496bca..5428d12ebad8c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListener.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupNamespaceConfigListener.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupNamespaceConfigListener.java index e0d62f15b5ef5..e19034c525761 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupNamespaceConfigListener.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupNamespaceConfigListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupPublishLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupPublishLimiter.java index f2f6bcd8df1d5..85e00bb2f87dc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupPublishLimiter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupPublishLimiter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java index c74681fdb731a..d3f8eb7613a40 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculator.java index 80eb6888a6f65..4c8b9275b9725 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImpl.java index 5dc50f2a25536..09f76aa8e6fe2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageConsumer.java index a8be0766636fd..7e82d4eb0eee5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageConsumer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageConsumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsagePublisher.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsagePublisher.java index 7ae0bab86031f..2cde6769294f6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsagePublisher.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsagePublisher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTopicTransportManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTopicTransportManager.java index 6ce0781781a54..84917d00da409 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTopicTransportManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTopicTransportManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManager.java index 448460526543a..665f6a7eb7da5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/package-info.java index ba7ee9ee21c63..a842db96a84e3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/resourcegroup/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/RestMessagePublishContext.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/RestMessagePublishContext.java index 9891572ab3997..d7cee8b600b31 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/RestMessagePublishContext.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/RestMessagePublishContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/Topics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/Topics.java index a8095f0327905..5b17b05db209f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/Topics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/Topics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/TopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/TopicsBase.java index 86e8956d950d7..d4f71740d9e9e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/TopicsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/TopicsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/package-info.java index bafd56b716f2b..3662fdcd6909e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/rest/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java index 5069f7cd44000..a7a39e2ff0dcb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service; import io.netty.buffer.ByteBuf; +import io.prometheus.client.Gauge; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -50,6 +50,12 @@ @Slf4j public abstract class AbstractBaseDispatcher extends EntryFilterSupport implements Dispatcher { + private static final Gauge PENDING_BYTES_TO_DISPATCH = Gauge + .build() + .name("pulsar_broker_pending_bytes_to_dispatch") + .help("Amount of bytes loaded in memory to be dispatched to Consumers") + .register(); + protected final ServiceConfiguration serviceConfig; protected final boolean dispatchThrottlingOnBatchMessageEnabled; private final LongAdder filterProcessedMsgs = new LongAdder(); @@ -164,7 +170,8 @@ public int filterEntriesForConsumer(Optional optMetadataArray entry.release(); continue; } else if (((PersistentTopic) subscription.getTopic()) - .isTxnAborted(new TxnID(msgMetadata.getTxnidMostBits(), msgMetadata.getTxnidLeastBits()))) { + .isTxnAborted(new TxnID(msgMetadata.getTxnidMostBits(), msgMetadata.getTxnidLeastBits()), + (PositionImpl) entry.getPosition())) { individualAcknowledgeMessageIfNeeded(entry.getPosition(), Collections.emptyMap()); entries.set(i, null); entry.release(); @@ -276,8 +283,12 @@ protected void acquirePermitsForDeliveredMessages(Topic topic, ManagedCursor cur protected abstract boolean isConsumersExceededOnSubscription(); protected boolean isConsumersExceededOnSubscription(AbstractTopic topic, int consumerSize) { + if (topic.isSystemTopic()) { + return false; + } Integer maxConsumersPerSubscription = topic.getHierarchyTopicPolicies().getMaxConsumersPerSubscription().get(); - return maxConsumersPerSubscription > 0 && maxConsumersPerSubscription <= consumerSize; + return maxConsumersPerSubscription != null && maxConsumersPerSubscription > 0 + && maxConsumersPerSubscription <= consumerSize; } private void processReplicatedSubscriptionSnapshot(PositionImpl pos, ByteBuf headersAndPayload) { @@ -370,4 +381,8 @@ public long getFilterRejectedMsgCount() { public long getFilterRescheduledMsgCount() { return this.filterRescheduledMsgs.longValue(); } + + protected final void updatePendingBytesToDispatch(long size) { + PENDING_BYTES_TO_DISPATCH.inc(size); + } } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherMultipleConsumers.java index ad9805964b303..90e20790fae2a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherMultipleConsumers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherMultipleConsumers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -20,8 +20,8 @@ import com.carrotsearch.hppc.ObjectHashSet; import com.carrotsearch.hppc.ObjectSet; -import java.util.Random; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.service.persistent.PersistentStickyKeyDispatcherMultipleConsumers; @@ -45,8 +45,6 @@ public abstract class AbstractDispatcherMultipleConsumers extends AbstractBaseDi .newUpdater(AbstractDispatcherMultipleConsumers.class, "isClosed"); private volatile int isClosed = FALSE; - private Random random = new Random(42); - protected AbstractDispatcherMultipleConsumers(Subscription subscription, ServiceConfiguration serviceConfig) { super(subscription, serviceConfig); } @@ -157,7 +155,7 @@ public Consumer getRandomConsumer() { return null; } - return consumerList.get(random.nextInt(consumerList.size())); + return consumerList.get(ThreadLocalRandom.current().nextInt(consumerList.size())); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherSingleActiveConsumer.java index 8cab06be116af..6380fb8384b04 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherSingleActiveConsumer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherSingleActiveConsumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java index a3fe39b7438e7..deab89cda72dc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractSubscription.java index 6a38667055679..10e6b79609721 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractSubscription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractSubscription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java index a995192cead11..c9f95ab524f55 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -438,14 +438,21 @@ private PublishRate publishRateInBroker(ServiceConfiguration config) { return new PublishRate(config.getMaxPublishRatePerTopicInMessages(), config.getMaxPublishRatePerTopicInBytes()); } - protected boolean isProducersExceeded() { + protected boolean isProducersExceeded(Producer producer) { + if (isSystemTopic() || producer.isRemote()) { + return false; + } Integer maxProducers = topicPolicies.getMaxProducersPerTopic().get(); - if (maxProducers > 0 && maxProducers <= producers.size()) { + if (maxProducers != null && maxProducers > 0 && maxProducers <= getUserCreatedProducersSize()) { return true; } return false; } + private long getUserCreatedProducersSize() { + return producers.values().stream().filter(p -> !p.isRemote()).count(); + } + protected void registerTopicPolicyListener() { if (brokerService.pulsar().getConfig().isSystemTopicEnabled() && brokerService.pulsar().getConfig().isTopicLevelPoliciesEnabled()) { @@ -463,6 +470,9 @@ protected void unregisterTopicPolicyListener() { } protected boolean isSameAddressProducersExceeded(Producer producer) { + if (isSystemTopic() || producer.isRemote()) { + return false; + } final int maxSameAddressProducers = brokerService.pulsar().getConfiguration() .getMaxSameAddressProducersPerTopic(); @@ -487,14 +497,21 @@ public int getNumberOfSameAddressProducers(final String clientAddress) { } protected boolean isConsumersExceededOnTopic() { - int maxConsumersPerTopic = topicPolicies.getMaxConsumerPerTopic().get(); - if (maxConsumersPerTopic > 0 && maxConsumersPerTopic <= getNumberOfConsumers()) { + if (isSystemTopic()) { + return false; + } + Integer maxConsumersPerTopic = topicPolicies.getMaxConsumerPerTopic().get(); + if (maxConsumersPerTopic != null && maxConsumersPerTopic > 0 + && maxConsumersPerTopic <= getNumberOfConsumers()) { return true; } return false; } protected boolean isSameAddressConsumersExceededOnTopic(Consumer consumer) { + if (isSystemTopic()) { + return false; + } final int maxSameAddressConsumers = brokerService.pulsar().getConfiguration() .getMaxSameAddressConsumersPerTopic(); @@ -603,13 +620,15 @@ public String getReplicatorPrefix() { return replicatorPrefix; } + protected String getSchemaId() { + String base = TopicName.get(getName()).getPartitionedTopicName(); + return TopicName.get(base).getSchemaName(); + } @Override public CompletableFuture hasSchema() { - String base = TopicName.get(getName()).getPartitionedTopicName(); - String id = TopicName.get(base).getSchemaName(); return brokerService.pulsar() .getSchemaRegistryService() - .getSchema(id).thenApply(Objects::nonNull); + .getSchema(getSchemaId()).thenApply(Objects::nonNull); } @Override @@ -618,8 +637,7 @@ public CompletableFuture addSchema(SchemaData schema) { return CompletableFuture.completedFuture(SchemaVersion.Empty); } - String base = TopicName.get(getName()).getPartitionedTopicName(); - String id = TopicName.get(base).getSchemaName(); + String id = getSchemaId(); SchemaRegistryService schemaRegistryService = brokerService.pulsar().getSchemaRegistryService(); if (allowAutoUpdateSchema()) { @@ -650,8 +668,7 @@ private boolean allowAutoUpdateSchema() { @Override public CompletableFuture deleteSchema() { - String base = TopicName.get(getName()).getPartitionedTopicName(); - String id = TopicName.get(base).getSchemaName(); + String id = getSchemaId(); SchemaRegistryService schemaRegistryService = brokerService.pulsar().getSchemaRegistryService(); return BookkeeperSchemaStorage.ignoreUnrecoverableBKException(schemaRegistryService.getSchema(id)) .thenCompose(schema -> { @@ -670,8 +687,7 @@ public CompletableFuture deleteSchema() { @Override public CompletableFuture checkSchemaCompatibleForConsumer(SchemaData schema) { - String base = TopicName.get(getName()).getPartitionedTopicName(); - String id = TopicName.get(base).getSchemaName(); + String id = getSchemaId(); return brokerService.pulsar() .getSchemaRegistryService() .checkConsumerCompatibility(id, schema, getSchemaCompatibilityStrategy()); @@ -937,15 +953,6 @@ protected void enableProducerReadForPublishRateLimiting() { } } - protected void enableProducerReadForPublishBufferLimiting() { - if (producers != null) { - producers.values().forEach(producer -> { - producer.getCnx().cancelPublishBufferLimiting(); - producer.getCnx().enableCnxAutoRead(); - }); - } - } - protected void disableProducerRead() { if (producers != null) { producers.values().forEach(producer -> producer.getCnx().disableCnxAutoRead()); @@ -960,7 +967,7 @@ protected void checkTopicFenced() throws BrokerServiceException { } protected void internalAddProducer(Producer producer) throws BrokerServiceException { - if (isProducersExceeded()) { + if (isProducersExceeded(producer)) { log.warn("[{}] Attempting to add producer to topic which reached max producers limit", topic); throw new BrokerServiceException.ProducerBusyException("Topic reached max producers limit"); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AnalyzeBacklogResult.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AnalyzeBacklogResult.java index d21412153334f..e227acf4e8f62 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AnalyzeBacklogResult.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AnalyzeBacklogResult.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java index 210c6f8767a06..bc2541c802e63 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java index 1def78e0266ef..c5f3d508a56db 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,6 +19,7 @@ package org.apache.pulsar.broker.service; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.bookkeeper.mledger.ManagedLedgerConfig.PROPERTY_SOURCE_TOPIC_KEY; import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun; import static org.apache.commons.collections4.CollectionUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -85,6 +86,7 @@ import org.apache.bookkeeper.mledger.ManagedLedgerFactory; import org.apache.bookkeeper.mledger.impl.NullLedgerOffloader; import org.apache.bookkeeper.mledger.util.Futures; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.bookie.rackawareness.IsolatedBookieEnsemblePlacementPolicy; import org.apache.pulsar.broker.PulsarServerException; @@ -127,6 +129,7 @@ import org.apache.pulsar.client.impl.ClientBuilderImpl; import org.apache.pulsar.client.impl.conf.ClientConfigurationData; import org.apache.pulsar.client.internal.PropertiesUtils; +import org.apache.pulsar.client.util.ExecutorProvider; import org.apache.pulsar.common.allocator.PulsarByteBufAllocator; import org.apache.pulsar.common.configuration.BindAddress; import org.apache.pulsar.common.configuration.FieldContext; @@ -311,13 +314,14 @@ public BrokerService(PulsarService pulsar, EventLoopGroup eventLoopGroup) throws this.topicOrderedExecutor = OrderedExecutor.newBuilder() .numThreads(pulsar.getConfiguration().getNumWorkerThreadsForNonPersistentTopic()) .name("broker-topic-workers").build(); - final DefaultThreadFactory acceptorThreadFactory = new DefaultThreadFactory("pulsar-acceptor"); + final DefaultThreadFactory acceptorThreadFactory = + new ExecutorProvider.ExtendedThreadFactory("pulsar-acceptor"); this.acceptorGroup = EventLoopUtil.newEventLoopGroup( pulsar.getConfiguration().getNumAcceptorThreads(), false, acceptorThreadFactory); this.workerGroup = eventLoopGroup; - this.statsUpdater = Executors - .newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-stats-updater")); + this.statsUpdater = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("pulsar-stats-updater")); this.authorizationService = new AuthorizationService( pulsar.getConfiguration(), pulsar().getPulsarResources()); if (!pulsar.getConfiguration().getEntryFilterNames().isEmpty()) { @@ -327,22 +331,22 @@ public BrokerService(PulsarService pulsar, EventLoopGroup eventLoopGroup) throws pulsar.getLocalMetadataStore().registerListener(this::handleMetadataChanges); pulsar.getConfigurationMetadataStore().registerListener(this::handleMetadataChanges); - this.inactivityMonitor = Executors - .newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-inactivity-monitor")); - this.messageExpiryMonitor = Executors - .newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-msg-expiry-monitor")); + this.inactivityMonitor = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("pulsar-inactivity-monitor")); + this.messageExpiryMonitor = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("pulsar-msg-expiry-monitor")); this.compactionMonitor = Executors.newSingleThreadScheduledExecutor( - new DefaultThreadFactory("pulsar-compaction-monitor")); - this.consumedLedgersMonitor = Executors - .newSingleThreadScheduledExecutor(new DefaultThreadFactory("consumed-Ledgers-monitor")); + new ExecutorProvider.ExtendedThreadFactory("pulsar-compaction-monitor")); + this.consumedLedgersMonitor = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("consumed-Ledgers-monitor")); this.topicPublishRateLimiterMonitor = new PublishRateLimiterMonitor("pulsar-topic-publish-rate-limiter-monitor"); this.brokerPublishRateLimiterMonitor = new PublishRateLimiterMonitor("pulsar-broker-publish-rate-limiter-monitor"); this.backlogQuotaManager = new BacklogQuotaManager(pulsar); - this.backlogQuotaChecker = Executors - .newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-backlog-quota-checker")); + this.backlogQuotaChecker = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("pulsar-backlog-quota-checker")); this.authenticationService = new AuthenticationService(pulsar.getConfiguration()); this.blockedDispatchers = ConcurrentOpenHashSet.newBuilder().build(); @@ -429,7 +433,8 @@ private void startProtocolHandler(String protocol, bootstrap.childOption(ChannelOption.RCVBUF_ALLOCATOR, new AdaptiveRecvByteBufAllocator(1024, 16 * 1024, 1 * 1024 * 1024)); EventLoopUtil.enableTriggeredMode(bootstrap); - DefaultThreadFactory defaultThreadFactory = new DefaultThreadFactory("pulsar-ph-" + protocol); + DefaultThreadFactory defaultThreadFactory = + new ExecutorProvider.ExtendedThreadFactory("pulsar-ph-" + protocol); EventLoopGroup dedicatedWorkerGroup = EventLoopUtil.newEventLoopGroup(configuration.getNumIOThreads(), false, defaultThreadFactory); bootstrap.channel(EventLoopUtil.getServerSocketChannelClass(dedicatedWorkerGroup)); @@ -551,7 +556,7 @@ protected void startDeduplicationSnapshotMonitor() { int interval = pulsar().getConfiguration().getBrokerDeduplicationSnapshotFrequencyInSeconds(); if (interval > 0 && pulsar().getConfiguration().isBrokerDeduplicationEnabled()) { this.deduplicationSnapshotMonitor = - Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory( + Executors.newSingleThreadScheduledExecutor(new ExecutorProvider.ExtendedThreadFactory( "deduplication-snapshot-monitor")); deduplicationSnapshotMonitor.scheduleAtFixedRate(safeRun(() -> forEachTopic( Topic::checkDeduplicationSnapshot)) @@ -685,7 +690,7 @@ synchronized void startOrUpdate(long tickTimeMs, Runnable checkTask, Runnable re stop(); } //start monitor. - scheduler = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory(name)); + scheduler = Executors.newSingleThreadScheduledExecutor(new ExecutorProvider.ExtendedThreadFactory(name)); // schedule task that sums up publish-rate across all cnx on a topic , // and check the rate limit exceeded or not. scheduler.scheduleAtFixedRate(safeRun(checkTask), tickTimeMs, tickTimeMs, TimeUnit.MILLISECONDS); @@ -966,7 +971,9 @@ public CompletableFuture> getTopicIfExists(final String topic) { } public CompletableFuture getOrCreateTopic(final String topic) { - return getTopic(topic, isAllowAutoTopicCreation(topic)).thenApply(Optional::get); + return isAllowAutoTopicCreationAsync(topic) + .thenCompose(isAllowed -> getTopic(topic, isAllowed)) + .thenApply(Optional::get); } public CompletableFuture> getTopic(final String topic, boolean createIfMissing) { @@ -1046,7 +1053,9 @@ public CompletableFuture> getTopic(final TopicName topicName, bo } public CompletableFuture deleteTopic(String topic, boolean forceDelete) { + TopicName topicName = TopicName.get(topic); Optional optTopic = getTopicReference(topic); + if (optTopic.isPresent()) { Topic t = optTopic.get(); if (forceDelete) { @@ -1073,9 +1082,8 @@ public CompletableFuture deleteTopic(String topic, boolean forceDelete) { return t.delete(); } - if (log.isDebugEnabled()) { - log.debug("Topic {} is not loaded, try to delete from metadata", topic); - } + log.info("Topic {} is not loaded, try to delete from metadata", topic); + // Topic is not loaded, though we still might be able to delete from metadata TopicName tn = TopicName.get(topic); if (!tn.isPersistent()) { @@ -1084,28 +1092,29 @@ public CompletableFuture deleteTopic(String topic, boolean forceDelete) { } CompletableFuture future = new CompletableFuture<>(); - CompletableFuture deleteTopicAuthenticationFuture = new CompletableFuture<>(); deleteTopicAuthenticationWithRetry(topic, deleteTopicAuthenticationFuture, 5); + deleteTopicAuthenticationFuture.whenComplete((v, ex) -> { if (ex != null) { future.completeExceptionally(ex); return; } - managedLedgerFactory.asyncDelete(tn.getPersistenceNamingEncoding(), new DeleteLedgerCallback() { - @Override - public void deleteLedgerComplete(Object ctx) { - future.complete(null); - } + CompletableFuture mlConfigFuture = getManagedLedgerConfig(topicName); + managedLedgerFactory.asyncDelete(tn.getPersistenceNamingEncoding(), + mlConfigFuture, new DeleteLedgerCallback() { + @Override + public void deleteLedgerComplete(Object ctx) { + future.complete(null); + } - @Override - public void deleteLedgerFailed(ManagedLedgerException exception, Object ctx) { - future.completeExceptionally(exception); - } - }, null); + @Override + public void deleteLedgerFailed(ManagedLedgerException exception, Object ctx) { + future.completeExceptionally(exception); + } + }, null); }); - return future; } @@ -1258,9 +1267,18 @@ public PulsarClient getReplicationClient(String cluster, Optional c : data.getServiceUrlTls(); if (data.isBrokerClientTlsEnabled()) { configTlsSettings(clientBuilder, serviceUrlTls, - data.isBrokerClientTlsEnabledWithKeyStore(), data.isTlsAllowInsecureConnection(), - data.getBrokerClientTlsTrustStoreType(), data.getBrokerClientTlsTrustStore(), - data.getBrokerClientTlsTrustStorePassword(), data.getBrokerClientTrustCertsFilePath()); + data.isBrokerClientTlsEnabledWithKeyStore(), + data.isTlsAllowInsecureConnection(), + data.getBrokerClientTlsTrustStoreType(), + data.getBrokerClientTlsTrustStore(), + data.getBrokerClientTlsTrustStorePassword(), + data.getBrokerClientTlsKeyStoreType(), + data.getBrokerClientTlsKeyStore(), + data.getBrokerClientTlsKeyStorePassword(), + data.getBrokerClientTrustCertsFilePath(), + data.getBrokerClientKeyFilePath(), + data.getBrokerClientCertificateFilePath() + ); } else if (pulsar.getConfiguration().isBrokerClientTlsEnabled()) { configTlsSettings(clientBuilder, serviceUrlTls, pulsar.getConfiguration().isBrokerClientTlsEnabledWithKeyStore(), @@ -1268,7 +1286,13 @@ public PulsarClient getReplicationClient(String cluster, Optional c pulsar.getConfiguration().getBrokerClientTlsTrustStoreType(), pulsar.getConfiguration().getBrokerClientTlsTrustStore(), pulsar.getConfiguration().getBrokerClientTlsTrustStorePassword(), - pulsar.getConfiguration().getBrokerClientTrustCertsFilePath()); + pulsar.getConfiguration().getBrokerClientTlsKeyStoreType(), + pulsar.getConfiguration().getBrokerClientTlsKeyStore(), + pulsar.getConfiguration().getBrokerClientTlsKeyStorePassword(), + pulsar.getConfiguration().getBrokerClientTrustCertsFilePath(), + pulsar.getConfiguration().getBrokerClientKeyFilePath(), + pulsar.getConfiguration().getBrokerClientCertificateFilePath() + ); } else { clientBuilder.serviceUrl( isNotBlank(data.getBrokerServiceUrl()) ? data.getBrokerServiceUrl() : data.getServiceUrl()); @@ -1294,18 +1318,25 @@ public PulsarClient getReplicationClient(String cluster, Optional c private void configTlsSettings(ClientBuilder clientBuilder, String serviceUrl, boolean brokerClientTlsEnabledWithKeyStore, boolean isTlsAllowInsecureConnection, String brokerClientTlsTrustStoreType, String brokerClientTlsTrustStore, - String brokerClientTlsTrustStorePassword, String brokerClientTrustCertsFilePath) { + String brokerClientTlsTrustStorePassword, String brokerClientTlsKeyStoreType, + String brokerClientTlsKeyStore, String brokerClientTlsKeyStorePassword, + String brokerClientTrustCertsFilePath, + String brokerClientKeyFilePath, String brokerClientCertificateFilePath) { clientBuilder .serviceUrl(serviceUrl) - .enableTls(true) .allowTlsInsecureConnection(isTlsAllowInsecureConnection); if (brokerClientTlsEnabledWithKeyStore) { clientBuilder.useKeyStoreTls(true) .tlsTrustStoreType(brokerClientTlsTrustStoreType) .tlsTrustStorePath(brokerClientTlsTrustStore) - .tlsTrustStorePassword(brokerClientTlsTrustStorePassword); + .tlsTrustStorePassword(brokerClientTlsTrustStorePassword) + .tlsKeyStoreType(brokerClientTlsKeyStoreType) + .tlsKeyStorePath(brokerClientTlsKeyStore) + .tlsKeyStorePassword(brokerClientTlsKeyStorePassword); } else { - clientBuilder.tlsTrustCertsFilePath(brokerClientTrustCertsFilePath); + clientBuilder.tlsTrustCertsFilePath(brokerClientTrustCertsFilePath) + .tlsKeyFilePath(brokerClientKeyFilePath) + .tlsCertificateFilePath(brokerClientCertificateFilePath); } } @@ -1423,8 +1454,17 @@ protected CompletableFuture> fetchTopicPropertiesAsync(Topic if (metadata.partitions == PartitionedTopicMetadata.NON_PARTITIONED) { return managedLedgerFactory.getManagedLedgerPropertiesAsync( topicName.getPersistenceNamingEncoding()); + } else { + // Check if the partitioned topic is a ShadowTopic + if (MapUtils.getString(metadata.properties, PROPERTY_SOURCE_TOPIC_KEY) != null) { + String sourceTopic = metadata.properties.get(PROPERTY_SOURCE_TOPIC_KEY); + Map result = new HashMap<>(); + result.put(PROPERTY_SOURCE_TOPIC_KEY, TopicName.getTopicPartitionNameString( + sourceTopic, topicName.getPartitionIndex())); + return CompletableFuture.completedFuture(result); + } + return CompletableFuture.completedFuture(null); } - return CompletableFuture.completedFuture(metadata.properties); }); } } @@ -1444,6 +1484,7 @@ private void checkOwnershipAndCreatePersistentTopic(final String topic, boolean propertiesFuture = CompletableFuture.completedFuture(properties); } propertiesFuture.thenAccept(finalProperties -> + //TODO add topicName in properties? createPersistentTopic(topic, createIfMissing, topicFuture, finalProperties) ).exceptionally(throwable -> { log.warn("[{}] Read topic property failed", topic, throwable); @@ -1499,6 +1540,10 @@ private void createPersistentTopic(final String topic, boolean createIfMissing, } managedLedgerConfig.setCreateIfMissing(createIfMissing); managedLedgerConfig.setProperties(properties); + String shadowSource = managedLedgerConfig.getShadowSource(); + if (shadowSource != null) { + managedLedgerConfig.setShadowSourceName(TopicName.get(shadowSource).getPersistenceNamingEncoding()); + } // Once we have the configuration, we can proceed with the async open operation managedLedgerFactory.asyncOpen(topicName.getPersistenceNamingEncoding(), managedLedgerConfig, @@ -1750,7 +1795,6 @@ public CompletableFuture getManagedLedgerConfig(TopicName t serviceConfig.isAcknowledgmentAtBatchIndexLevelEnabled()); managedLedgerConfig.setNewEntriesCheckDelayInMillis( serviceConfig.getManagedLedgerNewEntriesCheckDelayInMillis()); - return managedLedgerConfig; }); } @@ -2884,30 +2928,38 @@ public CompletableFuture fetchPartitionedTopicMetadata if (metadata.partitions == 0 && !topicExists && !topicName.isPartitioned() - && pulsar.getBrokerService().isAllowAutoTopicCreation(topicName, policies) && pulsar.getBrokerService() .isDefaultTopicTypePartitioned(topicName, policies)) { - - pulsar.getBrokerService() - .createDefaultPartitionedTopicAsync(topicName, policies) - .thenAccept(md -> future.complete(md)) - .exceptionally(ex -> { - if (ex.getCause() - instanceof MetadataStoreException.AlreadyExistsException) { - // The partitioned topic might be created concurrently - fetchPartitionedTopicMetadataAsync(topicName) - .whenComplete((metadata2, ex2) -> { - if (ex2 == null) { - future.complete(metadata2); - } else { - future.completeExceptionally(ex2); - } - }); - } else { - future.completeExceptionally(ex); - } - return null; - }); + isAllowAutoTopicCreationAsync(topicName, policies).thenAccept(allowed -> { + if (allowed) { + pulsar.getBrokerService() + .createDefaultPartitionedTopicAsync(topicName, policies) + .thenAccept(md -> future.complete(md)) + .exceptionally(ex -> { + if (ex.getCause() + instanceof MetadataStoreException + .AlreadyExistsException) { + // The partitioned topic might be created concurrently + fetchPartitionedTopicMetadataAsync(topicName) + .whenComplete((metadata2, ex2) -> { + if (ex2 == null) { + future.complete(metadata2); + } else { + future.completeExceptionally(ex2); + } + }); + } else { + future.completeExceptionally(ex); + } + return null; + }); + } else { + future.complete(metadata); + } + }).exceptionally(ex -> { + future.completeExceptionally(ex); + return null; + }); } else { future.complete(metadata); } @@ -3101,34 +3153,46 @@ public Optional getListenPortTls() { } } - public boolean isAllowAutoTopicCreation(final String topic) { + public CompletableFuture isAllowAutoTopicCreationAsync(final String topic) { TopicName topicName = TopicName.get(topic); - return isAllowAutoTopicCreation(topicName); + return isAllowAutoTopicCreationAsync(topicName); } - public boolean isAllowAutoTopicCreation(final TopicName topicName) { + public CompletableFuture isAllowAutoTopicCreationAsync(final TopicName topicName) { Optional policies = pulsar.getPulsarResources().getNamespaceResources() .getPoliciesIfCached(topicName.getNamespaceObject()); - return isAllowAutoTopicCreation(topicName, policies); + return isAllowAutoTopicCreationAsync(topicName, policies); } - public boolean isAllowAutoTopicCreation(final TopicName topicName, final Optional policies) { + private CompletableFuture isAllowAutoTopicCreationAsync(final TopicName topicName, + final Optional policies) { if (policies.isPresent() && policies.get().deleted) { log.info("Preventing AutoTopicCreation on a namespace that is being deleted {}", topicName.getNamespaceObject()); - return false; + return CompletableFuture.completedFuture(false); } //System topic can always be created automatically if (pulsar.getConfiguration().isSystemTopicEnabled() && isSystemTopic(topicName)) { - return true; + return CompletableFuture.completedFuture(true); } + final boolean allowed; AutoTopicCreationOverride autoTopicCreationOverride = getAutoTopicCreationOverride(topicName, policies); if (autoTopicCreationOverride != null) { - return autoTopicCreationOverride.isAllowAutoTopicCreation(); + allowed = autoTopicCreationOverride.isAllowAutoTopicCreation(); + } else { + allowed = pulsar.getConfiguration().isAllowAutoTopicCreation(); + } + + if (allowed && topicName.isPartitioned()) { + // cannot re-create topic while it is being deleted + return pulsar.getPulsarResources().getNamespaceResources().getPartitionedTopicResources() + .isPartitionedTopicBeingDeletedAsync(topicName) + .thenApply(beingDeleted -> !beingDeleted); } else { - return pulsar.getConfiguration().isAllowAutoTopicCreation(); + return CompletableFuture.completedFuture(allowed); } + } public boolean isDefaultTopicTypePartitioned(final TopicName topicName, final Optional policies) { @@ -3175,6 +3239,11 @@ public boolean isAllowAutoSubscriptionCreation(final TopicName topicName) { } private AutoSubscriptionCreationOverride getAutoSubscriptionCreationOverride(final TopicName topicName) { + Optional topicPolicies = getTopicPolicies(topicName); + if (topicPolicies.isPresent() && topicPolicies.get().getAutoSubscriptionCreationOverride() != null) { + return topicPolicies.get().getAutoSubscriptionCreationOverride(); + } + Optional policies = pulsar.getPulsarResources().getNamespaceResources().getPoliciesIfCached(topicName.getNamespaceObject()); // If namespace policies have the field set, it will override the broker-level setting diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerServiceException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerServiceException.java index 6b3ab99595d31..eb073762f232f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerServiceException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerServiceException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelector.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelector.java index c8530e230c07c..30dc1248d0c7d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelector.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelector.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java index 29eb5f5eb53dc..494327ef28d40 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -395,10 +395,10 @@ public void doUnsubscribe(final long requestId) { subscription.doUnsubscribe(this).thenAccept(v -> { log.info("Unsubscribed successfully from {}", subscription); cnx.removedConsumer(this); - cnx.getCommandSender().sendSuccess(requestId); + cnx.getCommandSender().sendSuccessResponse(requestId); }).exceptionally(exception -> { log.warn("Unsubscribe failed for {}", subscription, exception); - cnx.getCommandSender().sendError(requestId, BrokerServiceException.getClientErrorCode(exception), + cnx.getCommandSender().sendErrorResponse(requestId, BrokerServiceException.getClientErrorCode(exception), exception.getCause().getMessage()); return null; }); @@ -425,19 +425,19 @@ public CompletableFuture messageAcked(CommandAck ack) { subscription, consumerId); return CompletableFuture.completedFuture(null); } - PositionImpl position = PositionImpl.EARLIEST; - if (ack.getMessageIdsCount() == 1) { - MessageIdData msgId = ack.getMessageIdAt(0); - if (msgId.getAckSetsCount() > 0) { - long[] ackSets = new long[msgId.getAckSetsCount()]; - for (int j = 0; j < msgId.getAckSetsCount(); j++) { - ackSets[j] = msgId.getAckSetAt(j); - } - position = PositionImpl.get(msgId.getLedgerId(), msgId.getEntryId(), ackSets); - } else { - position = PositionImpl.get(msgId.getLedgerId(), msgId.getEntryId()); + + PositionImpl position; + MessageIdData msgId = ack.getMessageIdAt(0); + if (msgId.getAckSetsCount() > 0) { + long[] ackSets = new long[msgId.getAckSetsCount()]; + for (int j = 0; j < msgId.getAckSetsCount(); j++) { + ackSets[j] = msgId.getAckSetAt(j); } + position = PositionImpl.get(msgId.getLedgerId(), msgId.getEntryId(), ackSets); + } else { + position = PositionImpl.get(msgId.getLedgerId(), msgId.getEntryId()); } + if (ack.hasTxnidMostBits() && ack.hasTxnidLeastBits()) { List positionsAcked = Collections.singletonList(position); future = transactionCumulativeAcknowledge(ack.getTxnidMostBits(), @@ -908,7 +908,7 @@ public CompletableFuture checkPermissionsAsync() { public boolean equals(Object obj) { if (obj instanceof Consumer) { Consumer other = (Consumer) obj; - return Objects.equals(cnx.clientAddress(), other.cnx.clientAddress()) && consumerId == other.consumerId; + return consumerId == other.consumerId && Objects.equals(cnx.clientAddress(), other.cnx.clientAddress()); } return false; } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Dispatcher.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Dispatcher.java index 86980ee340c96..48877ce53f801 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Dispatcher.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Dispatcher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/DistributedIdGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/DistributedIdGenerator.java index ac31fdceb64ab..5211d97b44093 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/DistributedIdGenerator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/DistributedIdGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java index 0bcd215f8be3c..70643d5de2a3f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcks.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcks.java index 4fa462808928e..eb5580b24fb62 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcks.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcks.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchSizes.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchSizes.java index 45c377ea6843f..aa7bb91a667b5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchSizes.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryBatchSizes.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java index 1acc3b23599ba..6c0f1f65c6968 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelector.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelector.java index 671a014b7f6eb..59b815197694e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelector.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelector.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelector.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelector.java index 7c496321d1d3a..45be6d65b09b4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelector.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelector.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/InMemoryRedeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/InMemoryRedeliveryTracker.java index 19e425799d612..df999ab139d8e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/InMemoryRedeliveryTracker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/InMemoryRedeliveryTracker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -38,9 +38,8 @@ public int incrementAndGetRedeliveryCount(Position position) { } @Override - public int getRedeliveryCount(Position position) { - PositionImpl positionImpl = (PositionImpl) position; - LongPair count = trackerCache.get(positionImpl.getLedgerId(), positionImpl.getEntryId()); + public int getRedeliveryCount(long ledgerId, long entryId) { + LongPair count = trackerCache.get(ledgerId, entryId); return (int) (count != null ? count.first : 0); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java index 67cc46d95fada..6e215b3b49515 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java index 902ba3ff19ad0..fe2249679a84c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import org.apache.bookkeeper.mledger.Position; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.service.BrokerServiceException.TopicClosedException; import org.apache.pulsar.broker.service.BrokerServiceException.TopicTerminatedException; @@ -85,6 +86,7 @@ public class Producer { private final boolean isRemote; private final String remoteCluster; private final boolean isNonPersistentTopic; + private final boolean isShadowTopic; private final boolean isEncrypted; private final ProducerAccessMode accessMode; @@ -116,6 +118,8 @@ public Producer(Topic topic, TransportCnx cnx, long producerId, String producerN this.chunkedMessageRate = new Rate(); this.isNonPersistentTopic = topic instanceof NonPersistentTopic; this.msgDrop = this.isNonPersistentTopic ? new Rate() : null; + this.isShadowTopic = + topic instanceof PersistentTopic && ((PersistentTopic) topic).getShadowSourceTopic().isPresent(); this.metadata = metadata != null ? metadata : Collections.emptyMap(); @@ -182,14 +186,14 @@ public boolean isSuccessorTo(Producer other) { } public void publishMessage(long producerId, long sequenceId, ByteBuf headersAndPayload, long batchSize, - boolean isChunked, boolean isMarker) { - if (checkAndStartPublish(producerId, sequenceId, headersAndPayload, batchSize)) { - publishMessageToTopic(headersAndPayload, sequenceId, batchSize, isChunked, isMarker); + boolean isChunked, boolean isMarker, Position position) { + if (checkAndStartPublish(producerId, sequenceId, headersAndPayload, batchSize, position)) { + publishMessageToTopic(headersAndPayload, sequenceId, batchSize, isChunked, isMarker, position); } } public void publishMessage(long producerId, long lowestSequenceId, long highestSequenceId, - ByteBuf headersAndPayload, long batchSize, boolean isChunked, boolean isMarker) { + ByteBuf headersAndPayload, long batchSize, boolean isChunked, boolean isMarker, Position position) { if (lowestSequenceId > highestSequenceId) { cnx.execute(() -> { cnx.getCommandSender().sendSendError(producerId, highestSequenceId, ServerError.MetadataError, @@ -198,13 +202,22 @@ public void publishMessage(long producerId, long lowestSequenceId, long highestS }); return; } - if (checkAndStartPublish(producerId, highestSequenceId, headersAndPayload, batchSize)) { + if (checkAndStartPublish(producerId, highestSequenceId, headersAndPayload, batchSize, position)) { publishMessageToTopic(headersAndPayload, lowestSequenceId, highestSequenceId, batchSize, isChunked, - isMarker); + isMarker, position); } } - public boolean checkAndStartPublish(long producerId, long sequenceId, ByteBuf headersAndPayload, long batchSize) { + public boolean checkAndStartPublish(long producerId, long sequenceId, ByteBuf headersAndPayload, long batchSize, + Position position) { + if (isShadowTopic && position == null || !isShadowTopic && position != null) { + cnx.execute(() -> { + cnx.getCommandSender().sendSendError(producerId, sequenceId, ServerError.NotAllowedError, + "Only shadow topic supports sending messages with messageId"); + cnx.completedSendOperation(isNonPersistentTopic, headersAndPayload.readableBytes()); + }); + return false; + } if (isClosed) { cnx.execute(() -> { cnx.getCommandSender().sendSendError(producerId, sequenceId, ServerError.PersistenceError, @@ -246,20 +259,20 @@ public boolean checkAndStartPublish(long producerId, long sequenceId, ByteBuf he } private void publishMessageToTopic(ByteBuf headersAndPayload, long sequenceId, long batchSize, boolean isChunked, - boolean isMarker) { + boolean isMarker, Position position) { MessagePublishContext messagePublishContext = MessagePublishContext.get(this, sequenceId, msgIn, headersAndPayload.readableBytes(), - batchSize, isChunked, System.nanoTime(), isMarker); + batchSize, isChunked, System.nanoTime(), isMarker, position); this.cnx.getBrokerService().getInterceptor() .onMessagePublish(this, headersAndPayload, messagePublishContext); topic.publishMessage(headersAndPayload, messagePublishContext); } private void publishMessageToTopic(ByteBuf headersAndPayload, long lowestSequenceId, long highestSequenceId, - long batchSize, boolean isChunked, boolean isMarker) { + long batchSize, boolean isChunked, boolean isMarker, Position position) { MessagePublishContext messagePublishContext = MessagePublishContext.get(this, lowestSequenceId, highestSequenceId, msgIn, headersAndPayload.readableBytes(), batchSize, - isChunked, System.nanoTime(), isMarker); + isChunked, System.nanoTime(), isMarker, position); this.cnx.getBrokerService().getInterceptor() .onMessagePublish(this, headersAndPayload, messagePublishContext); topic.publishMessage(headersAndPayload, messagePublishContext); @@ -335,7 +348,10 @@ public TransportCnx getCnx() { return this.cnx; } - private static final class MessagePublishContext implements PublishContext, Runnable { + /** + * MessagePublishContext implements Position because that ShadowManagedLedger need to know the source position info. + */ + private static final class MessagePublishContext implements PublishContext, Runnable, Position { /* * To store context information built by message payload * processors (time duration, size etc), if any configured @@ -361,6 +377,21 @@ private static final class MessagePublishContext implements PublishContext, Runn private long entryTimestamp; + @Override + public Position getNext() { + return null; + } + + @Override + public long getLedgerId() { + return ledgerId; + } + + @Override + public long getEntryId() { + return entryId; + } + public String getProducerName() { return producer.getProducerName(); } @@ -505,7 +536,7 @@ public void run() { } static MessagePublishContext get(Producer producer, long sequenceId, Rate rateIn, int msgSize, - long batchSize, boolean chunked, long startTimeNs, boolean isMarker) { + long batchSize, boolean chunked, long startTimeNs, boolean isMarker, Position position) { MessagePublishContext callback = RECYCLER.get(); callback.producer = producer; callback.sequenceId = sequenceId; @@ -517,6 +548,8 @@ static MessagePublishContext get(Producer producer, long sequenceId, Rate rateIn callback.originalSequenceId = -1L; callback.startTimeNs = startTimeNs; callback.isMarker = isMarker; + callback.ledgerId = position == null ? -1 : position.getLedgerId(); + callback.entryId = position == null ? -1 : position.getEntryId(); if (callback.propertyMap != null) { callback.propertyMap.clear(); } @@ -524,7 +557,7 @@ static MessagePublishContext get(Producer producer, long sequenceId, Rate rateIn } static MessagePublishContext get(Producer producer, long lowestSequenceId, long highestSequenceId, Rate rateIn, - int msgSize, long batchSize, boolean chunked, long startTimeNs, boolean isMarker) { + int msgSize, long batchSize, boolean chunked, long startTimeNs, boolean isMarker, Position position) { MessagePublishContext callback = RECYCLER.get(); callback.producer = producer; callback.sequenceId = lowestSequenceId; @@ -537,6 +570,8 @@ static MessagePublishContext get(Producer producer, long lowestSequenceId, long callback.startTimeNs = startTimeNs; callback.chunked = chunked; callback.isMarker = isMarker; + callback.ledgerId = position == null ? -1 : position.getLedgerId(); + callback.entryId = position == null ? -1 : position.getEntryId(); if (callback.propertyMap != null) { callback.propertyMap.clear(); } @@ -757,10 +792,10 @@ public void checkEncryption() { public void publishTxnMessage(TxnID txnID, long producerId, long sequenceId, long highSequenceId, ByteBuf headersAndPayload, long batchSize, boolean isChunked, boolean isMarker) { - checkAndStartPublish(producerId, sequenceId, headersAndPayload, batchSize); + checkAndStartPublish(producerId, sequenceId, headersAndPayload, batchSize, null); MessagePublishContext messagePublishContext = MessagePublishContext.get(this, sequenceId, highSequenceId, msgIn, - headersAndPayload.readableBytes(), batchSize, isChunked, System.nanoTime(), isMarker); + headersAndPayload.readableBytes(), batchSize, isChunked, System.nanoTime(), isMarker, null); this.cnx.getBrokerService().getInterceptor() .onMessagePublish(this, headersAndPayload, messagePublishContext); topic.publishTxnMessage(txnID, headersAndPayload, messagePublishContext); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java index 931f35cfa1bd4..fde2e7cb56dce 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java index 72c8132128e19..fdc13ed8f4e31 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java index f1646684b82cb..1947acd87fc66 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java index 16a42d67c4105..a96625af4686c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSender.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSender.java index d2775c19ab78e..50579b3d741ab 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSender.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSender.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -72,10 +72,6 @@ void sendLookupResponse(String brokerServiceUrl, String brokerServiceUrlTls, boo void sendActiveConsumerChange(long consumerId, boolean isActive); - void sendSuccess(long requestId); - - void sendError(long requestId, ServerError error, String message); - void sendReachedEndOfTopic(long consumerId); boolean sendTopicMigrated(ResourceType type, long resourceId, String brokerUrl, String brokerUrlTls); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSenderImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSenderImpl.java index 7bc26072ffa75..2bc933e75fd88 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSenderImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSenderImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -22,11 +22,11 @@ import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.Entry; -import org.apache.bookkeeper.mledger.impl.PositionImpl; import org.apache.pulsar.broker.intercept.BrokerInterceptor; import org.apache.pulsar.client.api.transaction.TxnID; import org.apache.pulsar.common.api.proto.BaseCommand; @@ -201,16 +201,6 @@ public void sendActiveConsumerChange(long consumerId, boolean isActive) { cnx.ctx().voidPromise()); } - @Override - public void sendSuccess(long requestId) { - cnx.ctx().writeAndFlush(Commands.newSuccess(requestId), cnx.ctx().voidPromise()); - } - - @Override - public void sendError(long requestId, ServerError error, String message) { - cnx.ctx().writeAndFlush(Commands.newError(requestId, error, message), cnx.ctx().voidPromise()); - } - @Override public void sendReachedEndOfTopic(long consumerId) { // Only send notification if the client understand the command @@ -240,6 +230,10 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName, final ChannelHandlerContext ctx = cnx.ctx(); final ChannelPromise writePromise = ctx.newPromise(); ctx.channel().eventLoop().execute(() -> { + // this list is always accessed in the same thread (the eventLoop here) + // and in the completion of the writePromise + // it is safe to use a simple ArrayList + List entriesToRelease = new ArrayList<>(entries.size()); for (int i = 0; i < entries.size(); i++) { Entry entry = entries.get(i); if (entry == null) { @@ -281,18 +275,27 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName, } int redeliveryCount = redeliveryTracker - .getRedeliveryCount(PositionImpl.get(entry.getLedgerId(), entry.getEntryId())); + .getRedeliveryCount(entry.getLedgerId(), entry.getEntryId()); ctx.write( cnx.newMessageAndIntercept(consumerId, entry.getLedgerId(), entry.getEntryId(), partitionIdx, redeliveryCount, metadataAndPayload, batchIndexesAcks == null ? null : batchIndexesAcks.getAckSet(i), topicName, epoch), ctx.voidPromise()); - entry.release(); + entriesToRelease.add(entry); } // Use an empty write here so that we can just tie the flush with the write promise for last entry ctx.writeAndFlush(Unpooled.EMPTY_BUFFER, writePromise); + writePromise.addListener((future) -> { + // release the entries only after flushing the channel + // + // InflightReadsLimiter tracks the amount of memory retained by in-flight data to the + // consumer. It counts the memory as being released when the entry is deallocated + // that is that it reaches refcnt=0. + // so we need to call release only when we are sure that Netty released the internal ByteBuf + entriesToRelease.forEach(Entry::release); + }); batchSizes.recyle(); if (batchIndexesAcks != null) { batchIndexesAcks.recycle(); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarMetadataEventSynchronizer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarMetadataEventSynchronizer.java index 234097ee7cafc..80743e44ab7d2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarMetadataEventSynchronizer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarMetadataEventSynchronizer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java index 0babf2fe01223..aa734ce73dbc0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTracker.java index 8fffaa4890d0d..0c0287988bff3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTracker.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTracker.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -25,7 +25,7 @@ public interface RedeliveryTracker { int incrementAndGetRedeliveryCount(Position position); - int getRedeliveryCount(Position position); + int getRedeliveryCount(long ledgerId, long entryId); void remove(Position position); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTrackerDisabled.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTrackerDisabled.java index 2c119fe37140b..0903d76f9ed3d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTrackerDisabled.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/RedeliveryTrackerDisabled.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -33,7 +33,7 @@ public int incrementAndGetRedeliveryCount(Position position) { } @Override - public int getRedeliveryCount(Position position) { + public int getRedeliveryCount(long ledgerId, long entryId) { return 0; } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Replicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Replicator.java index eea90efb88371..b8d13256d225a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Replicator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Replicator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SendMessageInfo.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SendMessageInfo.java index 4637ffcc535b2..a03417acbfbbc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SendMessageInfo.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SendMessageInfo.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java index 668998a6c5f2a..15842f4598549 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,6 +19,8 @@ package org.apache.pulsar.broker.service; import static com.google.common.base.Preconditions.checkArgument; +import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.pulsar.broker.admin.impl.PersistentTopicsBase.unsafeGetPartitionedTopicMetadataAsync; @@ -572,10 +574,15 @@ protected void handlePartitionMetadataRequest(CommandPartitionedTopicMetadata pa } else { log.warn("Failed to get Partitioned Metadata [{}] {}: {}", remoteAddress, topicName, ex.getMessage(), ex); - ServerError error = (ex instanceof RestException) - && ((RestException) ex).getResponse().getStatus() < 500 - ? ServerError.MetadataError - : ServerError.ServiceNotReady; + ServerError error = ServerError.ServiceNotReady; + if (ex instanceof RestException restException){ + int responseCode = restException.getResponse().getStatus(); + if (responseCode == NOT_FOUND.getStatusCode()){ + error = ServerError.TopicNotFound; + } else if (responseCode < INTERNAL_SERVER_ERROR.getStatusCode()){ + error = ServerError.MetadataError; + } + } commandSender.sendPartitionMetadataResponse(error, ex.getMessage(), requestId); } } @@ -1081,9 +1088,6 @@ protected void handleSubscribe(final CommandSubscribe subscribe) { return null; } - boolean createTopicIfDoesNotExist = forceTopicCreation - && service.isAllowAutoTopicCreation(topicName.toString()); - final long consumerEpoch; if (subscribe.hasConsumerEpoch()) { consumerEpoch = subscribe.getConsumerEpoch(); @@ -1092,7 +1096,10 @@ protected void handleSubscribe(final CommandSubscribe subscribe) { } Optional> subscriptionProperties = SubscriptionOption.getPropertiesMap( subscribe.getSubscriptionPropertiesList()); - service.getTopic(topicName.toString(), createTopicIfDoesNotExist) + service.isAllowAutoTopicCreationAsync(topicName.toString()) + .thenApply(isAllowed -> forceTopicCreation && isAllowed) + .thenCompose(createTopicIfDoesNotExist -> + service.getTopic(topicName.toString(), createTopicIfDoesNotExist)) .thenCompose(optTopic -> { if (!optTopic.isPresent()) { return FutureUtil @@ -1589,13 +1596,17 @@ protected void handleSend(CommandSend send, ByteBuf headersAndPayload) { return; } + // This position is only used for shadow replicator + Position position = send.hasMessageId() + ? PositionImpl.get(send.getMessageId().getLedgerId(), send.getMessageId().getEntryId()) : null; + // Persist the message if (send.hasHighestSequenceId() && send.getSequenceId() <= send.getHighestSequenceId()) { producer.publishMessage(send.getProducerId(), send.getSequenceId(), send.getHighestSequenceId(), - headersAndPayload, send.getNumMessages(), send.isIsChunk(), send.isMarker()); + headersAndPayload, send.getNumMessages(), send.isIsChunk(), send.isMarker(), position); } else { producer.publishMessage(send.getProducerId(), send.getSequenceId(), headersAndPayload, - send.getNumMessages(), send.isIsChunk(), send.isMarker()); + send.getNumMessages(), send.isIsChunk(), send.isMarker(), position); } } @@ -2597,6 +2608,7 @@ protected void handleAddSubscriptionToTxn(CommandAddSubscriptionToTxn command) { })); } + @Override protected void handleCommandWatchTopicList(CommandWatchTopicList commandWatchTopicList) { checkArgument(state == State.Connected); final long requestId = commandWatchTopicList.getRequestId(); @@ -2647,6 +2659,7 @@ protected void handleCommandWatchTopicList(CommandWatchTopicList commandWatchTop } } + @Override protected void handleCommandWatchTopicListClose(CommandWatchTopicListClose commandWatchTopicListClose) { checkArgument(state == State.Connected); topicListService.handleWatchTopicListClose(commandWatchTopicListClose); @@ -2666,6 +2679,7 @@ protected void interceptCommand(BaseCommand command) throws InterceptException { getBrokerService().getInterceptor().onPulsarCommand(command, this); } + @Override public void closeProducer(Producer producer) { // removes producer-connection from map and send close command to producer safelyRemoveProducer(producer); @@ -2975,6 +2989,7 @@ public SocketAddress getRemoteAddress() { return remoteAddress; } + @Override public BrokerService getBrokerService() { return service; } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SharedConsumerAssignor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SharedConsumerAssignor.java index e3fb531877ae9..2161e418dff00 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SharedConsumerAssignor.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SharedConsumerAssignor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StickyKeyConsumerSelector.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StickyKeyConsumerSelector.java index b129ef533df4e..511445da71dbe 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StickyKeyConsumerSelector.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StickyKeyConsumerSelector.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StreamingStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StreamingStats.java index 469c802b76a2c..5eecfe6d66627 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StreamingStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/StreamingStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java index 2736f407ebf0b..1f418a6e9f85f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SubscriptionOption.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SubscriptionOption.java index d7503f6e90d4a..d375c539e550e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SubscriptionOption.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SubscriptionOption.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java index 4bd3a0952f022..a24b1eeee101a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -123,7 +123,8 @@ private CompletableFuture sendTopicPolicyEvent(TopicName topicName, Action } else { PulsarEvent event = getPulsarEvent(topicName, actionType, policies); CompletableFuture actionFuture = - ActionType.DELETE.equals(actionType) ? writer.deleteAsync(event) : writer.writeAsync(event); + ActionType.DELETE.equals(actionType) ? writer.deleteAsync(getEventKey(event), event) + : writer.writeAsync(getEventKey(event), event); actionFuture.whenComplete(((messageId, e) -> { if (e != null) { result.completeExceptionally(e); @@ -455,7 +456,8 @@ private void refreshTopicPoliciesCache(Message msg) { SystemTopicClient systemTopicClient = namespaceEventsSystemTopicFactory .createTopicPoliciesSystemTopicClient(topicName.getNamespaceObject()); systemTopicClient.newWriterAsync().thenAccept(writer - -> writer.deleteAsync(getPulsarEvent(topicName, ActionType.DELETE, null)) + -> writer.deleteAsync(getEventKey(topicName), + getPulsarEvent(topicName, ActionType.DELETE, null)) .whenComplete((result, e) -> writer.closeAsync().whenComplete((res, ex) -> { if (ex != null) { log.error("close writer failed ", ex); @@ -539,6 +541,20 @@ private void fetchTopicPoliciesAsyncAndCloseReader(SystemTopicClient.Reader { - private final Map> clients; + protected final Map> clients; + protected final NamespaceEventsSystemTopicFactory namespaceEventsSystemTopicFactory; - private final NamespaceEventsSystemTopicFactory namespaceEventsSystemTopicFactory; + protected final Class schemaType; + protected final EventType systemTopicType; - public SystemTopicBaseTxnBufferSnapshotService(PulsarClient client) { + public SystemTopicTxnBufferSnapshotService(PulsarClient client, EventType systemTopicType, + Class schemaType) { this.namespaceEventsSystemTopicFactory = new NamespaceEventsSystemTopicFactory(client); + this.systemTopicType = systemTopicType; + this.schemaType = schemaType; this.clients = new ConcurrentHashMap<>(); } - @Override - public CompletableFuture> createWriter(TopicName topicName) { + public CompletableFuture> createWriter(TopicName topicName) { return getTransactionBufferSystemTopicClient(topicName).thenCompose(SystemTopicClient::newWriterAsync); } - private CompletableFuture> getTransactionBufferSystemTopicClient( - TopicName topicName) { - TopicName systemTopicName = NamespaceEventsSystemTopicFactory - .getSystemTopicName(topicName.getNamespaceObject(), EventType.TRANSACTION_BUFFER_SNAPSHOT); - if (systemTopicName == null) { - return FutureUtil.failedFuture( - new InvalidTopicNameException("Can't create SystemTopicBaseTxnBufferSnapshotService, " - + "because the topicName is null!")); - } - return CompletableFuture.completedFuture(clients.computeIfAbsent(systemTopicName, - (v) -> namespaceEventsSystemTopicFactory - .createTransactionBufferSystemTopicClient(topicName.getNamespaceObject(), this))); - } - - @Override - public CompletableFuture> createReader(TopicName topicName) { + public CompletableFuture> createReader(TopicName topicName) { return getTransactionBufferSystemTopicClient(topicName).thenCompose(SystemTopicClient::newReaderAsync); } - @Override - public void removeClient(TopicName topicName, - TransactionBufferSystemTopicClient transactionBufferSystemTopicClient) { + public void removeClient(TopicName topicName, SystemTopicClientBase transactionBufferSystemTopicClient) { if (transactionBufferSystemTopicClient.getReaders().size() == 0 && transactionBufferSystemTopicClient.getWriters().size() == 0) { clients.remove(topicName); } } - @Override + protected CompletableFuture> getTransactionBufferSystemTopicClient(TopicName topicName) { + TopicName systemTopicName = NamespaceEventsSystemTopicFactory + .getSystemTopicName(topicName.getNamespaceObject(), systemTopicType); + if (systemTopicName == null) { + return FutureUtil.failedFuture( + new PulsarClientException + .InvalidTopicNameException("Can't create SystemTopicBaseTxnBufferSnapshotIndexService, " + + "because the topicName is null!")); + } + return CompletableFuture.completedFuture(clients.computeIfAbsent(systemTopicName, + (v) -> namespaceEventsSystemTopicFactory + .createTransactionBufferSystemTopicClient(topicName.getNamespaceObject(), + this, schemaType))); + } + public void close() throws Exception { - for (Map.Entry> entry : clients.entrySet()) { + for (Map.Entry> entry : clients.entrySet()) { entry.getValue().close(); } } + } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java index 5b0a8c32fa906..3949df92ceca5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicFactory.java index d407a9cc61363..f8bac9d8134b0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicListService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicListService.java index 966e6d0fa30a3..7aa50057d73c9 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicListService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicListService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -197,7 +197,11 @@ public void initializeTopicsListWatcher(CompletableFuture watc if (exception != null) { watcherFuture.completeExceptionally(exception); } else { - watcherFuture.complete(watcher); + if (!watcherFuture.complete(watcher)) { + log.warn("[{}] Watcher future was already completed. Deregistering watcherId={}.", + connection.getRemoteAddress(), watcherId); + topicResources.deregisterPersistentTopicListener(watcher); + } } }); } @@ -207,7 +211,7 @@ public void handleWatchTopicListClose(CommandWatchTopicListClose commandWatchTop long requestId = commandWatchTopicListClose.getRequestId(); long watcherId = commandWatchTopicListClose.getWatcherId(); deleteTopicListWatcher(watcherId); - connection.getCommandSender().sendSuccess(requestId); + connection.getCommandSender().sendSuccessResponse(requestId); } public void deleteTopicListWatcher(Long watcherId) { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPoliciesService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPoliciesService.java index 9834afc4f2f4f..c4bcc0c39353c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPoliciesService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPoliciesService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPolicyListener.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPolicyListener.java index 0e39edba2b914..7f7fd154ab035 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPolicyListener.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TopicPolicyListener.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransactionBufferSnapshotService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransactionBufferSnapshotService.java deleted file mode 100644 index b090e8fe46a4f..0000000000000 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransactionBufferSnapshotService.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.pulsar.broker.service; - -import java.util.concurrent.CompletableFuture; -import org.apache.pulsar.broker.systopic.SystemTopicClient.Reader; -import org.apache.pulsar.broker.systopic.SystemTopicClient.Writer; -import org.apache.pulsar.broker.systopic.TransactionBufferSystemTopicClient; -import org.apache.pulsar.broker.transaction.buffer.matadata.TransactionBufferSnapshot; -import org.apache.pulsar.common.naming.TopicName; - -public interface TransactionBufferSnapshotService { - - /** - * Create a transaction buffer snapshot writer. - * - * @param topicName {@link TopicName} the topic name - * - * @return {@link CompletableFuture} return the future of writer - */ - CompletableFuture> createWriter(TopicName topicName); - - /** - * Create a transaction buffer snapshot reader. - * - * @param topicName {@link TopicName} the topic name - * - * @return {@link CompletableFuture} return the future of reader - */ - CompletableFuture> createReader(TopicName topicName); - - /** - * Remove a topic client from cache. - * - * @param topicName {@link TopicName} the topic name - * @param transactionBufferSystemTopicClient {@link TransactionBufferSystemTopicClient} the topic client - * - */ - void removeClient(TopicName topicName, TransactionBufferSystemTopicClient transactionBufferSystemTopicClient); - - /** - * Close transaction buffer snapshot service. - */ - void close() throws Exception; - -} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransactionBufferSnapshotServiceFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransactionBufferSnapshotServiceFactory.java new file mode 100644 index 0000000000000..4b8548fae47c7 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransactionBufferSnapshotServiceFactory.java @@ -0,0 +1,73 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.service; + +import org.apache.pulsar.broker.transaction.buffer.metadata.TransactionBufferSnapshot; +import org.apache.pulsar.broker.transaction.buffer.metadata.v2.TransactionBufferSnapshotIndexes; +import org.apache.pulsar.broker.transaction.buffer.metadata.v2.TransactionBufferSnapshotSegment; +import org.apache.pulsar.client.api.PulsarClient; +import org.apache.pulsar.common.events.EventType; + +public class TransactionBufferSnapshotServiceFactory { + + private SystemTopicTxnBufferSnapshotService txnBufferSnapshotService; + + private SystemTopicTxnBufferSnapshotService + txnBufferSnapshotSegmentService; + + private SystemTopicTxnBufferSnapshotService txnBufferSnapshotIndexService; + + public TransactionBufferSnapshotServiceFactory(PulsarClient pulsarClient) { + this.txnBufferSnapshotSegmentService = new SystemTopicTxnBufferSnapshotService<>(pulsarClient, + EventType.TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS, + TransactionBufferSnapshotSegment.class); + this.txnBufferSnapshotIndexService = new SystemTopicTxnBufferSnapshotService<>(pulsarClient, + EventType.TRANSACTION_BUFFER_SNAPSHOT_INDEXES, TransactionBufferSnapshotIndexes.class); + this.txnBufferSnapshotService = new SystemTopicTxnBufferSnapshotService<>(pulsarClient, + EventType.TRANSACTION_BUFFER_SNAPSHOT, TransactionBufferSnapshot.class); + } + + public SystemTopicTxnBufferSnapshotService getTxnBufferSnapshotIndexService() { + return this.txnBufferSnapshotIndexService; + } + + public SystemTopicTxnBufferSnapshotService + getTxnBufferSnapshotSegmentService() { + return this.txnBufferSnapshotSegmentService; + } + + public SystemTopicTxnBufferSnapshotService getTxnBufferSnapshotService() { + return this.txnBufferSnapshotService; + } + + public void close() throws Exception { + if (this.txnBufferSnapshotIndexService != null) { + this.txnBufferSnapshotIndexService.close(); + this.txnBufferSnapshotIndexService = null; + } + if (this.txnBufferSnapshotSegmentService != null) { + this.txnBufferSnapshotSegmentService.close(); + this.txnBufferSnapshotSegmentService = null; + } + if (this.txnBufferSnapshotService != null) { + this.txnBufferSnapshotService.close(); + this.txnBufferSnapshotService = null; + } + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransportCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransportCnx.java index cc0c559eaf22a..2abacf80ef3d2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransportCnx.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/TransportCnx.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcher.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcher.java index 818a249ed7e78..0a8f254f12189 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcher.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherMultipleConsumers.java index 9694584025597..f76fc09ba2ebe 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherMultipleConsumers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherMultipleConsumers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherSingleActiveConsumer.java index 3c9ecb74c75c2..25e3e2894daa1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherSingleActiveConsumer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentDispatcherSingleActiveConsumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java index 961ae5ddc17b9..7ad231926189b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumers.java index e5e5349651946..f26e1399be71d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java index 34e86ca761587..3af886a528153 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java index c15a7605ca179..cf46103cc357b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -1011,7 +1011,9 @@ private CompletableFuture tryToDeletePartitionedMetadata() { if (!partitionedTopicExist) { return CompletableFuture.completedFuture(null); } else { - return partitionedTopicResources.deletePartitionedTopicAsync(topicName); + return getBrokerService().pulsar().getPulsarResources().getNamespaceResources() + .getPartitionedTopicResources().runWithMarkDeleteAsync(topicName, + () -> partitionedTopicResources.deletePartitionedTopicAsync(topicName)); } }); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/package-info.java index f66048dcf5998..8c36835e56fcb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/package-info.java index 327391bddd4e1..a820c1f80215a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java index 8427acb48b11f..ec34aeffbec4c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java index d71dc4edade0f..5b8987580c412 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/GeoPersistentReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/GeoPersistentReplicator.java index be61f137d1635..c1c73e64f5210 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/GeoPersistentReplicator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/GeoPersistentReplicator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service.persistent; import io.netty.buffer.ByteBuf; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageDeduplication.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageDeduplication.java index 486f3d8540dad..030d74a014f29 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageDeduplication.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageDeduplication.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryController.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryController.java index 7aaba9a4e1023..d8667def5526d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryController.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryController.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,6 +21,7 @@ import com.google.common.collect.ComparisonChain; import java.util.ArrayList; import java.util.List; +import java.util.NavigableSet; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.bookkeeper.mledger.impl.PositionImpl; @@ -100,7 +101,7 @@ public boolean containsStickyKeyHashes(Set stickyKeyHashes) { return isContained.get(); } - public Set getMessagesToReplayNow(int maxMessagesToRead) { + public NavigableSet getMessagesToReplayNow(int maxMessagesToRead) { return messagesToRedeliver.items(maxMessagesToRead, PositionImpl::new); } } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java index 24d1d702e7dae..ca88f9751543b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -27,6 +27,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.NavigableSet; import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -93,7 +94,7 @@ public class PersistentDispatcherMultipleConsumers extends AbstractDispatcherMul protected volatile PositionImpl minReplayedPosition = null; protected boolean shouldRewindBeforeReadingOrReplaying = false; protected final String name; - protected boolean sendInProgress; + private boolean sendInProgress = false; protected static final AtomicIntegerFieldUpdater TOTAL_AVAILABLE_PERMITS_UPDATER = AtomicIntegerFieldUpdater.newUpdater(PersistentDispatcherMultipleConsumers.class, @@ -254,7 +255,7 @@ public void readMoreEntriesAsync() { } public synchronized void readMoreEntries() { - if (sendInProgress) { + if (isSendInProgress()) { // we cannot read more entries while sending the previous batch // otherwise we could re-read the same entries and send duplicates return; @@ -276,7 +277,7 @@ public synchronized void readMoreEntries() { return; } - Set messagesToReplayNow = getMessagesToReplayNow(messagesToRead); + NavigableSet messagesToReplayNow = getMessagesToReplayNow(messagesToRead); if (!messagesToReplayNow.isEmpty()) { if (log.isDebugEnabled()) { @@ -285,7 +286,7 @@ public synchronized void readMoreEntries() { } havePendingReplayRead = true; - minReplayedPosition = messagesToReplayNow.stream().min(PositionImpl::compareTo).orElse(null); + minReplayedPosition = messagesToReplayNow.first(); Set deletedMessages = topic.isDelayedDeliveryEnabled() ? asyncReplayEntriesInOrder(messagesToReplayNow) : asyncReplayEntries(messagesToReplayNow); // clear already acked positions from replay bucket @@ -309,11 +310,14 @@ public synchronized void readMoreEntries() { consumerList.size()); } havePendingRead = true; - Set toReplay = getMessagesToReplayNow(1); - minReplayedPosition = toReplay.stream().findFirst().orElse(null); - if (minReplayedPosition != null) { + NavigableSet toReplay = getMessagesToReplayNow(1); + if (!toReplay.isEmpty()) { + minReplayedPosition = toReplay.first(); redeliveryMessages.add(minReplayedPosition.getLedgerId(), minReplayedPosition.getEntryId()); + } else { + minReplayedPosition = null; } + cursor.asyncReadEntriesOrWait(messagesToRead, bytesToRead, this, ReadType.Normal, topic.getMaxReadPosition()); } else { @@ -545,31 +549,55 @@ public final synchronized void readEntriesComplete(List entries, Object c log.debug("[{}] Distributing {} messages to {} consumers", name, entries.size(), consumerList.size()); } + long size = entries.stream().mapToLong(Entry::getLength).sum(); + updatePendingBytesToDispatch(size); + // dispatch messages to a separate thread, but still in order for this subscription // sendMessagesToConsumers is responsible for running broker-side filters // that may be quite expensive if (serviceConfig.isDispatcherDispatchMessagesInSubscriptionThread()) { // setting sendInProgress here, because sendMessagesToConsumers will be executed // in a separate thread, and we want to prevent more reads - sendInProgress = true; + acquireSendInProgress(); dispatchMessagesThread.execute(safeRun(() -> { - if (sendMessagesToConsumers(readType, entries)) { + if (sendMessagesToConsumers(readType, entries, false)) { + updatePendingBytesToDispatch(-size); readMoreEntries(); + } else { + updatePendingBytesToDispatch(-size); } })); } else { - if (sendMessagesToConsumers(readType, entries)) { + if (sendMessagesToConsumers(readType, entries, true)) { + updatePendingBytesToDispatch(-size); readMoreEntriesAsync(); + } else { + updatePendingBytesToDispatch(-size); } } } - protected final synchronized boolean sendMessagesToConsumers(ReadType readType, List entries) { + protected synchronized void acquireSendInProgress() { sendInProgress = true; + } + + protected synchronized void releaseSendInProgress() { + sendInProgress = false; + } + + protected synchronized boolean isSendInProgress() { + return sendInProgress; + } + + protected final synchronized boolean sendMessagesToConsumers(ReadType readType, List entries, + boolean needAcquireSendInProgress) { + if (needAcquireSendInProgress) { + acquireSendInProgress(); + } try { return trySendMessagesToConsumers(readType, entries); } finally { - sendInProgress = false; + releaseSendInProgress(); } } @@ -1020,17 +1048,17 @@ public boolean trackDelayedDelivery(long ledgerId, long entryId, MessageMetadata } } - protected synchronized Set getMessagesToReplayNow(int maxMessagesToRead) { + protected synchronized NavigableSet getMessagesToReplayNow(int maxMessagesToRead) { if (!redeliveryMessages.isEmpty()) { return redeliveryMessages.getMessagesToReplayNow(maxMessagesToRead); } else if (delayedDeliveryTracker.isPresent() && delayedDeliveryTracker.get().hasMessageAvailable()) { delayedDeliveryTracker.get().resetTickTime(topic.getDelayedDeliveryTickTimeMillis()); - Set messagesAvailableNow = + NavigableSet messagesAvailableNow = delayedDeliveryTracker.get().getScheduledMessages(maxMessagesToRead); messagesAvailableNow.forEach(p -> redeliveryMessages.add(p.getLedgerId(), p.getEntryId())); return messagesAvailableNow; } else { - return Collections.emptySet(); + return Collections.emptyNavigableSet(); } } @@ -1116,6 +1144,10 @@ public long getDelayedTrackerMemoryUsage() { return 0; } + public ManagedCursor getCursor() { + return cursor; + } + protected int getStickyKeyHash(Entry entry) { return StickyKeyConsumerSelector.makeStickyKeyHash(peekStickyKey(entry.getDataBuffer())); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java index 385569cd8d8d6..03dce58af3a92 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -26,6 +26,7 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -61,6 +62,8 @@ public class PersistentDispatcherSingleActiveConsumer extends AbstractDispatcher private final AtomicBoolean isRescheduleReadInProgress = new AtomicBoolean(false); protected final PersistentTopic topic; + protected final Executor topicExecutor; + protected final String name; private Optional dispatchRateLimiter = Optional.empty(); @@ -77,6 +80,7 @@ public PersistentDispatcherSingleActiveConsumer(ManagedCursor cursor, SubType su super(subscriptionType, partitionIndex, topic.getName(), subscription, topic.getBrokerService().pulsar().getConfiguration(), cursor); this.topic = topic; + this.topicExecutor = topic.getBrokerService().getTopicOrderedExecutor().chooseThread(topicName); this.name = topic.getName() + " / " + (cursor.getName() != null ? Codec.decode(cursor.getName()) : ""/* NonDurableCursor doesn't have name */); this.readBatchSize = serviceConfig.getDispatcherMaxReadBatchSize(); @@ -145,7 +149,7 @@ protected void cancelPendingRead() { @Override public void readEntriesComplete(final List entries, Object obj) { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { internalReadEntriesComplete(entries, obj); })); } @@ -225,8 +229,7 @@ protected void dispatchEntriesToConsumer(Consumer currentConsumer, List e sendMessageInfo.getTotalMessages(), sendMessageInfo.getTotalBytes()); // Schedule a new read batch operation only after the previous batch has been written to the socket. - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, - SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { synchronized (PersistentDispatcherSingleActiveConsumer.this) { Consumer newConsumer = getActiveConsumer(); readMoreEntries(newConsumer); @@ -238,7 +241,7 @@ protected void dispatchEntriesToConsumer(Consumer currentConsumer, List e @Override public void consumerFlow(Consumer consumer, int additionalNumberOfMessages) { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { internalConsumerFlow(consumer); })); } @@ -269,7 +272,7 @@ private synchronized void internalConsumerFlow(Consumer consumer) { @Override public void redeliverUnacknowledgedMessages(Consumer consumer, long consumerEpoch) { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { internalRedeliverUnacknowledgedMessages(consumer, consumerEpoch); })); } @@ -463,7 +466,7 @@ protected Pair calculateToRead(Consumer consumer) { @Override public void readEntriesFailed(ManagedLedgerException exception, Object ctx) { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { internalReadEntriesFailed(exception, ctx); })); } @@ -513,7 +516,7 @@ private synchronized void internalReadEntriesFailed(ManagedLedgerException excep topic.getBrokerService().executor().schedule(() -> { // Jump again into dispatcher dedicated thread - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { synchronized (PersistentDispatcherSingleActiveConsumer.this) { Consumer currentConsumer = ACTIVE_CONSUMER_UPDATER.get(this); // we should retry the read if we have an active consumer and there is no pending read diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java index 4335762a21b82..bddcb1b334df1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageFinder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageFinder.java index 825bc546f4370..d2e6f6f5ff869 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageFinder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageFinder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java index 4f50a4c8fdc67..0c5097794fd7a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java index 5eb553106e679..f17a6832ef95a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -28,8 +28,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.NavigableSet; import java.util.Set; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.bookkeeper.mledger.Entry; import org.apache.bookkeeper.mledger.ManagedCursor; @@ -173,9 +173,10 @@ protected synchronized boolean trySendMessagesToConsumers(ReadType readType, Lis // A corner case that we have to retry a readMoreEntries in order to preserver order delivery. // This may happen when consumer closed. See issue #12885 for details. if (!allowOutOfOrderDelivery) { - Set messagesToReplayNow = this.getMessagesToReplayNow(1); + NavigableSet messagesToReplayNow = this.getMessagesToReplayNow(1); if (messagesToReplayNow != null && !messagesToReplayNow.isEmpty()) { - PositionImpl replayPosition = messagesToReplayNow.stream().findFirst().get(); + PositionImpl replayPosition = messagesToReplayNow.first(); + // We have received a message potentially from the delayed tracker and, since we're not using it // right now, it needs to be added to the redelivery tracker or we won't attempt anymore to // resend it (until we disconnect consumer). @@ -318,17 +319,9 @@ protected synchronized boolean trySendMessagesToConsumers(ReadType readType, Lis isDispatcherStuckOnReplays = true; stuckConsumers.addAll(nextStuckConsumers); } - // readMoreEntries should run regardless whether or not stuck is caused by - // stuckConsumers for avoid stopping dispatch. - sendInProgress = false; - topic.getBrokerService().executor().execute(safeRun(this::readMoreEntries)); + return true; } else if (currentThreadKeyNumber == 0) { - sendInProgress = false; - topic.getBrokerService().executor().schedule(safeRun(() -> { - synchronized (PersistentStickyKeyDispatcherMultipleConsumers.this) { - readMoreEntries(); - } - }), 100, TimeUnit.MILLISECONDS); + return true; } return false; } @@ -435,13 +428,13 @@ private boolean removeConsumersFromRecentJoinedConsumers() { } @Override - protected synchronized Set getMessagesToReplayNow(int maxMessagesToRead) { + protected synchronized NavigableSet getMessagesToReplayNow(int maxMessagesToRead) { if (isDispatcherStuckOnReplays) { // If we're stuck on replay, we want to move forward reading on the topic (until the overall max-unacked // messages kicks in), instead of keep replaying the same old messages, since the consumer that these // messages are routing to might be busy at the moment this.isDispatcherStuckOnReplays = false; - return Collections.emptySet(); + return Collections.emptyNavigableSet(); } else { return super.getMessagesToReplayNow(maxMessagesToRead); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherMultipleConsumers.java index b5cd52b7885d7..5df1fc2c6db26 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherMultipleConsumers.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherMultipleConsumers.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,6 +21,7 @@ import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun; import com.google.common.collect.Lists; import java.util.Set; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.Entry; @@ -44,12 +45,15 @@ public class PersistentStreamingDispatcherMultipleConsumers extends PersistentDispatcherMultipleConsumers implements StreamingDispatcher { + private int sendingTaskCounter = 0; private final StreamingEntryReader streamingEntryReader = new StreamingEntryReader((ManagedCursorImpl) cursor, this, topic); + private final Executor topicExecutor; public PersistentStreamingDispatcherMultipleConsumers(PersistentTopic topic, ManagedCursor cursor, Subscription subscription) { super(topic, cursor, subscription); + this.topicExecutor = topic.getBrokerService().getTopicOrderedExecutor().chooseThread(topic.getName()); } /** @@ -92,21 +96,27 @@ public synchronized void readEntryComplete(Entry entry, PendingReadEntryRequest cursor.seek(((ManagedLedgerImpl) cursor.getManagedLedger()) .getNextValidPosition((PositionImpl) entry.getPosition())); + long size = entry.getLength(); + updatePendingBytesToDispatch(size); // dispatch messages to a separate thread, but still in order for this subscription // sendMessagesToConsumers is responsible for running broker-side filters // that may be quite expensive if (serviceConfig.isDispatcherDispatchMessagesInSubscriptionThread()) { // setting sendInProgress here, because sendMessagesToConsumers will be executed // in a separate thread, and we want to prevent more reads - sendInProgress = true; + acquireSendInProgress(); dispatchMessagesThread.execute(safeRun(() -> { - if (sendMessagesToConsumers(readType, Lists.newArrayList(entry))) { + if (sendMessagesToConsumers(readType, Lists.newArrayList(entry), false)) { readMoreEntries(); + } else { + updatePendingBytesToDispatch(-size); } })); } else { - if (sendMessagesToConsumers(readType, Lists.newArrayList(entry))) { + if (sendMessagesToConsumers(readType, Lists.newArrayList(entry), true)) { readMoreEntriesAsync(); + } else { + updatePendingBytesToDispatch(-size); } } ctx.recycle(); @@ -119,7 +129,7 @@ public synchronized void readEntryComplete(Entry entry, PendingReadEntryRequest public void canReadMoreEntries(boolean withBackoff) { havePendingRead = false; topic.getBrokerService().executor().schedule(() -> { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topic.getName(), SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { synchronized (PersistentStreamingDispatcherMultipleConsumers.this) { if (!havePendingRead) { log.info("[{}] Scheduling read operation", name); @@ -152,9 +162,24 @@ protected void cancelPendingRead() { } } + @Override + protected synchronized void acquireSendInProgress() { + sendingTaskCounter++; + } + + @Override + protected synchronized void releaseSendInProgress() { + sendingTaskCounter--; + } + + @Override + protected synchronized boolean isSendInProgress() { + return sendingTaskCounter > 0; + } + @Override public synchronized void readMoreEntries() { - if (sendInProgress) { + if (isSendInProgress()) { // we cannot read more entries while sending the previous batch // otherwise we could re-read the same entries and send duplicates return; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherSingleActiveConsumer.java index 612d3f5796e73..9000850ed69ed 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherSingleActiveConsumer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherSingleActiveConsumer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,6 +21,7 @@ import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun; import static org.apache.pulsar.common.protocol.Commands.DEFAULT_CONSUMER_EPOCH; import com.google.common.collect.Lists; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.Entry; @@ -51,10 +52,13 @@ public class PersistentStreamingDispatcherSingleActiveConsumer extends Persisten private final StreamingEntryReader streamingEntryReader = new StreamingEntryReader((ManagedCursorImpl) cursor, this, topic); + private final Executor dispatcherExecutor; + public PersistentStreamingDispatcherSingleActiveConsumer(ManagedCursor cursor, SubType subscriptionType, int partitionIndex, PersistentTopic topic, Subscription subscription) { super(cursor, subscriptionType, partitionIndex, topic, subscription); + this.dispatcherExecutor = topic.getBrokerService().getTopicOrderedExecutor().chooseThread(name); } /** @@ -64,7 +68,7 @@ public PersistentStreamingDispatcherSingleActiveConsumer(ManagedCursor cursor, S public void canReadMoreEntries(boolean withBackoff) { havePendingRead = false; topic.getBrokerService().executor().schedule(() -> { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topicName, SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { synchronized (PersistentStreamingDispatcherSingleActiveConsumer.this) { Consumer currentConsumer = ACTIVE_CONSUMER_UPDATER.get(this); if (currentConsumer != null && !havePendingRead) { @@ -111,7 +115,7 @@ public String getName() { */ @Override public void readEntryComplete(Entry entry, PendingReadEntryRequest ctx) { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(name, safeRun(() -> { + dispatcherExecutor.execute(safeRun(() -> { internalReadEntryComplete(entry, ctx); })); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java index 681b617277543..f88ce03532414 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java index 647baf6bfca4a..7cf9ad722676a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -306,7 +306,7 @@ public PersistentTopic(String topic, ManagedLedger ledger, BrokerService brokerS } transactionBuffer.syncMaxReadPositionForNormalPublish((PositionImpl) ledger.getLastConfirmedEntry()); if (ledger instanceof ShadowManagedLedgerImpl) { - shadowSourceTopic = ((ShadowManagedLedgerImpl) ledger).getShadowSource(); + shadowSourceTopic = TopicName.get(ledger.getConfig().getShadowSource()); } else { shadowSourceTopic = null; } @@ -1044,10 +1044,12 @@ public CompletableFuture createSubscription(String subscriptionNam public CompletableFuture unsubscribe(String subscriptionName) { CompletableFuture unsubscribeFuture = new CompletableFuture<>(); + TopicName tn = TopicName.get(MLPendingAckStore + .getTransactionPendingAckStoreSuffix(topic, + Codec.encode(subscriptionName))); if (brokerService.pulsar().getConfiguration().isTransactionCoordinatorEnabled()) { - getBrokerService().getManagedLedgerFactory().asyncDelete(TopicName.get(MLPendingAckStore - .getTransactionPendingAckStoreSuffix(topic, - Codec.encode(subscriptionName))).getPersistenceNamingEncoding(), + getBrokerService().getManagedLedgerFactory().asyncDelete(tn.getPersistenceNamingEncoding(), + getBrokerService().getManagedLedgerConfig(tn), new AsyncCallbacks.DeleteLedgerCallback() { @Override public void deleteLedgerComplete(Object ctx) { @@ -1141,6 +1143,9 @@ public CompletableFuture deleteForcefully() { * Flag indicating whether delete should succeed if topic still has unconnected subscriptions. Set to * false when called from admin API (it will delete the subs too), and set to true when called from GC * thread + * @param failIfHasBacklogs + * Flag indicating whether delete should succeed if topic has backlogs. Set to false when called from + * admin API (it will delete the subs too), and set to true when called from GC thread * @param closeIfClientsConnected * Flag indicate whether explicitly close connected * producers/consumers/replicators before trying to delete topic. @@ -1152,33 +1157,55 @@ public CompletableFuture deleteForcefully() { private CompletableFuture delete(boolean failIfHasSubscriptions, boolean failIfHasBacklogs, boolean closeIfClientsConnected) { - CompletableFuture deleteFuture = new CompletableFuture<>(); lock.writeLock().lock(); try { if (isClosingOrDeleting) { log.warn("[{}] Topic is already being closed or deleted", topic); return FutureUtil.failedFuture(new TopicFencedException("Topic is already fenced")); - } else if (failIfHasSubscriptions && !subscriptions.isEmpty()) { - return FutureUtil.failedFuture( - new TopicBusyException("Topic has subscriptions: " + subscriptions.keys())); - } else if (failIfHasBacklogs && hasBacklogs()) { - List backlogSubs = - subscriptions.values().stream() - .filter(sub -> sub.getNumberOfEntriesInBacklog(false) > 0) - .map(PersistentSubscription::getName).toList(); - return FutureUtil.failedFuture( - new TopicBusyException("Topic has subscriptions did not catch up: " + backlogSubs)); + } + // We can proceed with the deletion if either: + // 1. No one is connected and no subscriptions + // 2. The topic have subscriptions but no backlogs for all subscriptions + // if delete_when_no_subscriptions is applied + // 3. We want to kick out everyone and forcefully delete the topic. + // In this case, we shouldn't care if the usageCount is 0 or not, just proceed + if (!closeIfClientsConnected) { + if (failIfHasSubscriptions && !subscriptions.isEmpty()) { + return FutureUtil.failedFuture( + new TopicBusyException("Topic has subscriptions: " + subscriptions.keys())); + } else if (failIfHasBacklogs) { + if (hasBacklogs()) { + List backlogSubs = + subscriptions.values().stream() + .filter(sub -> sub.getNumberOfEntriesInBacklog(false) > 0) + .map(PersistentSubscription::getName).toList(); + return FutureUtil.failedFuture( + new TopicBusyException("Topic has subscriptions did not catch up: " + backlogSubs)); + } else if (!producers.isEmpty()) { + return FutureUtil.failedFuture(new TopicBusyException( + "Topic has " + producers.size() + " connected producers")); + } + } else if (currentUsageCount() > 0) { + return FutureUtil.failedFuture(new TopicBusyException( + "Topic has " + currentUsageCount() + " connected producers/consumers")); + } } fenceTopicToCloseOrDelete(); // Avoid clients reconnections while deleting - CompletableFuture closeClientFuture = new CompletableFuture<>(); - if (closeIfClientsConnected) { + + return getBrokerService().getPulsar().getPulsarResources().getNamespaceResources() + .getPartitionedTopicResources().runWithMarkDeleteAsync(TopicName.get(topic), () -> { + CompletableFuture deleteFuture = new CompletableFuture<>(); + + CompletableFuture closeClientFuture = new CompletableFuture<>(); List> futures = new ArrayList<>(); - replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect())); - shadowReplicators.forEach((__, replicator) -> futures.add(replicator.disconnect())); - producers.values().forEach(producer -> futures.add(producer.disconnect())); subscriptions.forEach((s, sub) -> futures.add(sub.disconnect())); + if (closeIfClientsConnected) { + replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect())); + shadowReplicators.forEach((__, replicator) -> futures.add(replicator.disconnect())); + producers.values().forEach(producer -> futures.add(producer.disconnect())); + } FutureUtil.waitForAll(futures).thenRun(() -> { closeClientFuture.complete(null); }).exceptionally(ex -> { @@ -1187,86 +1214,87 @@ private CompletableFuture delete(boolean failIfHasSubscriptions, closeClientFuture.completeExceptionally(ex); return null; }); - } else { - closeClientFuture.complete(null); - } - closeClientFuture.thenAccept(delete -> { - // We can proceed with the deletion if either: - // 1. No one is connected - // 2. We want to kick out everyone and forcefully delete the topic. - // In this case, we shouldn't care if the usageCount is 0 or not, just proceed - if (currentUsageCount() == 0 || (closeIfClientsConnected && !failIfHasSubscriptions)) { + closeClientFuture.thenAccept(__ -> { CompletableFuture deleteTopicAuthenticationFuture = new CompletableFuture<>(); brokerService.deleteTopicAuthenticationWithRetry(topic, deleteTopicAuthenticationFuture, 5); - deleteTopicAuthenticationFuture.thenCompose(__ -> deleteSchema()) - .thenCompose(__ -> deleteTopicPolicies()) - .thenCompose(__ -> transactionBufferCleanupAndClose()) - .whenComplete((v, ex) -> { - if (ex != null) { - log.error("[{}] Error deleting topic", topic, ex); - unfenceTopicToResume(); - deleteFuture.completeExceptionally(ex); - } else { - List> subsDeleteFutures = new ArrayList<>(); - subscriptions.forEach((sub, p) -> subsDeleteFutures.add(unsubscribe(sub))); - - FutureUtil.waitForAll(subsDeleteFutures).whenComplete((f, e) -> { - if (e != null) { - log.error("[{}] Error deleting topic", topic, e); - unfenceTopicToResume(); - deleteFuture.completeExceptionally(e); - } else { - ledger.asyncDelete(new AsyncCallbacks.DeleteLedgerCallback() { - @Override - public void deleteLedgerComplete(Object ctx) { - brokerService.removeTopicFromCache(PersistentTopic.this); - - dispatchRateLimiter.ifPresent(DispatchRateLimiter::close); - - subscribeRateLimiter.ifPresent(SubscribeRateLimiter::close); - - unregisterTopicPolicyListener(); + deleteTopicAuthenticationFuture.thenCompose(ignore -> deleteSchema()) + .thenCompose(ignore -> { + if (!this.getBrokerService().getPulsar().getBrokerService() + .isSystemTopic(TopicName.get(topic))) { + return deleteTopicPolicies(); + } else { + return CompletableFuture.completedFuture(null); + } + }) + .thenCompose(ignore -> transactionBufferCleanupAndClose()) + .whenComplete((v, ex) -> { + if (ex != null) { + log.error("[{}] Error deleting topic", topic, ex); + unfenceTopicToResume(); + deleteFuture.completeExceptionally(ex); + } else { + List> subsDeleteFutures = new ArrayList<>(); + subscriptions.forEach((sub, p) -> subsDeleteFutures.add(unsubscribe(sub))); + + FutureUtil.waitForAll(subsDeleteFutures).whenComplete((f, e) -> { + if (e != null) { + log.error("[{}] Error deleting topic", topic, e); + unfenceTopicToResume(); + deleteFuture.completeExceptionally(e); + } else { + ledger.asyncDelete(new AsyncCallbacks.DeleteLedgerCallback() { + @Override + public void deleteLedgerComplete(Object ctx) { + brokerService.removeTopicFromCache(PersistentTopic.this); + + dispatchRateLimiter.ifPresent(DispatchRateLimiter::close); + + subscribeRateLimiter.ifPresent(SubscribeRateLimiter::close); + + unregisterTopicPolicyListener(); + + log.info("[{}] Topic deleted", topic); + deleteFuture.complete(null); + } - log.info("[{}] Topic deleted", topic); - deleteFuture.complete(null); - } + @Override + public void + deleteLedgerFailed(ManagedLedgerException exception, + Object ctx) { + if (exception.getCause() + instanceof MetadataStoreException.NotFoundException) { + log.info("[{}] Topic is already deleted {}", + topic, exception.getMessage()); + deleteLedgerComplete(ctx); + } else { + unfenceTopicToResume(); + log.error("[{}] Error deleting topic", + topic, exception); + deleteFuture.completeExceptionally( + new PersistenceException(exception)); + } + } + }, null); - @Override - public void deleteLedgerFailed(ManagedLedgerException exception, Object ctx) { - if (exception.getCause() - instanceof MetadataStoreException.NotFoundException) { - log.info("[{}] Topic is already deleted {}", - topic, exception.getMessage()); - deleteLedgerComplete(ctx); - } else { - unfenceTopicToResume(); - log.error("[{}] Error deleting topic", topic, exception); - deleteFuture.completeExceptionally(new PersistenceException(exception)); - } } - }, null); + }); } }); - } - }); - } else { + }).exceptionally(ex->{ unfenceTopicToResume(); - deleteFuture.completeExceptionally(new TopicBusyException( - "Topic has " + currentUsageCount() + " connected producers/consumers")); - } - }).exceptionally(ex->{ - unfenceTopicToResume(); - deleteFuture.completeExceptionally( - new TopicBusyException("Failed to close clients before deleting topic.")); - return null; - }); + deleteFuture.completeExceptionally( + new TopicBusyException("Failed to close clients before deleting topic.")); + return null; + }); + + return deleteFuture; + }); } finally { lock.writeLock().unlock(); } - return deleteFuture; } public CompletableFuture close() { @@ -1739,6 +1767,17 @@ public int getNumberOfSameAddressConsumers(final String clientAddress) { return getNumberOfSameAddressConsumers(clientAddress, subscriptions.values()); } + @Override + protected String getSchemaId() { + if (shadowSourceTopic == null) { + return super.getSchemaId(); + } else { + //reuse schema from shadow source. + String base = shadowSourceTopic.getPartitionedTopicName(); + return TopicName.get(base).getSchemaName(); + } + } + @Override public ConcurrentOpenHashMap getSubscriptions() { return subscriptions; @@ -2451,7 +2490,9 @@ private CompletableFuture tryToDeletePartitionedMetadata() { if (!partitionedTopicExist) { return CompletableFuture.completedFuture(null); } else { - return getBrokerService() + return getBrokerService().pulsar().getPulsarResources().getNamespaceResources() + .getPartitionedTopicResources().runWithMarkDeleteAsync(topicName, () -> + getBrokerService() .fetchPartitionedTopicMetadataAsync(topicName) .thenCompose((metadata -> { List> persistentTopicExists = @@ -2482,7 +2523,8 @@ private CompletableFuture tryToDeletePartitionedMetadata() { .deletePartitionedTopicAsync(topicName); } }); - })); + })) + ); } }); } @@ -3290,6 +3332,9 @@ public MessageDeduplication getMessageDeduplication() { } private boolean checkMaxSubscriptionsPerTopicExceed(String subscriptionName) { + if (isSystemTopic()) { + return false; + } //Existing subscriptions are not affected if (StringUtils.isNotEmpty(subscriptionName) && getSubscription(subscriptionName) != null) { return false; @@ -3321,8 +3366,8 @@ public PositionImpl getMaxReadPosition() { return this.transactionBuffer.getMaxReadPosition(); } - public boolean isTxnAborted(TxnID txnID) { - return this.transactionBuffer.isTxnAborted(txnID); + public boolean isTxnAborted(TxnID txnID, PositionImpl readPosition) { + return this.transactionBuffer.isTxnAborted(txnID, readPosition); } public TransactionInBufferStats getTransactionInBufferStats(TxnID txnID) { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCache.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCache.java index e280a336ccc5b..63af5a1e484af 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCache.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCache.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsController.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsController.java index cf46fac4a24a8..335f2cf8eec08 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsController.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsController.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilder.java index 38fcf7b39752b..53ba7193dc696 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilder.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ShadowReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ShadowReplicator.java index a7c56acbbfb5d..1aa0ccfba434d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ShadowReplicator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/ShadowReplicator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service.persistent; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SubscribeRateLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SubscribeRateLimiter.java index 89af6f6be882f..a052f1f6abf33 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SubscribeRateLimiter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SubscribeRateLimiter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java index 715a684902f1c..4a9d9b0b2d5bc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service.persistent; import java.util.concurrent.CompletableFuture; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/package-info.java index 582859854b018..5b72acd93de03 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilter.java index 7246a3b10897b..2e5a590fa1976 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinition.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinition.java index 5df3944e41dd2..36f39efa384e5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinition.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinition.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinitions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinitions.java index 9aa3113e177ae..384e7e2fcf486 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinitions.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterDefinitions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterMetaData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterMetaData.java index babaa80d5f60e..f2afb72583bec 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterMetaData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterMetaData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterProvider.java index 048b053464e22..f839c729d6cdf 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterWithClassLoader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterWithClassLoader.java index 8c2569ca6335b..29a5dea119be0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterWithClassLoader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/EntryFilterWithClassLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/FilterContext.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/FilterContext.java index edbe675816541..f2509ecada39f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/FilterContext.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/FilterContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/package-info.java index 05e54ca4831f8..7587746957b57 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/plugin/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AlwaysSchemaValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AlwaysSchemaValidator.java index 58146e3bd0b9a..0f1ee26809d17 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AlwaysSchemaValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AlwaysSchemaValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaBasedCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaBasedCompatibilityCheck.java index ce4bb2a49688c..1e75834a12988 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaBasedCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaBasedCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheck.java index 50f2792042f32..92c3a29541a94 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java index 9a78de6e30ba4..dc85a7146e84d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java index f3bf01000f0ec..2c84805584dae 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/DefaultSchemaRegistryService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/DefaultSchemaRegistryService.java index 89b04cdeea4c9..1f36419c815ff 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/DefaultSchemaRegistryService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/DefaultSchemaRegistryService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java index ea4b53775af6e..dc46032f1c67c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheck.java index 2bea472b8880d..666571e6c8363 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/NeverSchemaValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/NeverSchemaValidator.java index 6218892b2e866..1a34f1051245c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/NeverSchemaValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/NeverSchemaValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheck.java index 585453705659a..16b3b33ec7894 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheck.java index bc113958587e5..3be4c57853854 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaCompatibilityCheck.java index ade8e72778e75..d86a19ed0395a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaCompatibilityCheck.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaCompatibilityCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistry.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistry.java index 429c176167484..8e9831ae34242 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistry.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistry.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java index abf74cdc4503a..3c5e3aae7ff5d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java index 5fbe91e3bcd5d..c819d96114d81 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryStats.java index fd285ab7574da..32e9e36853026 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java index 483e3101e0e35..ec0021c1ea8d8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/IncompatibleSchemaException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/IncompatibleSchemaException.java index 759cc08e3ff5d..c1a2d9fd703fd 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/IncompatibleSchemaException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/IncompatibleSchemaException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/InvalidSchemaDataException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/InvalidSchemaDataException.java index a6a58082ff22e..811ae4c573c1b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/InvalidSchemaDataException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/InvalidSchemaDataException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/SchemaException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/SchemaException.java index e9267d6128281..917882811ef19 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/SchemaException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/SchemaException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/package-info.java index fb3858c9a92c8..c6acd6953ea4e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/exceptions/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/package-info.java index ac4b20872a7e5..08d735a051bdb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/PrimitiveSchemaDataValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/PrimitiveSchemaDataValidator.java index 346a6d0325803..7d49d45ac2f0c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/PrimitiveSchemaDataValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/PrimitiveSchemaDataValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/ProtobufNativeSchemaDataValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/ProtobufNativeSchemaDataValidator.java index b0ab159313665..79093fc022ed4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/ProtobufNativeSchemaDataValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/ProtobufNativeSchemaDataValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidator.java index 34a5f3447cf80..f402a45bc239b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidator.java index 496071eece968..b3032d5498f18 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StringSchemaDataValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StringSchemaDataValidator.java index 7ea7e638c2a0b..c08194a9c4ddc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StringSchemaDataValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StringSchemaDataValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StructSchemaDataValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StructSchemaDataValidator.java index c1d47a72108c7..983d0328d7d84 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StructSchemaDataValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/StructSchemaDataValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/package-info.java index f5db92f211ffb..7e39c040fd145 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/validator/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/PendingReadEntryRequest.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/PendingReadEntryRequest.java index 7989bbc304def..e98e5de07c165 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/PendingReadEntryRequest.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/PendingReadEntryRequest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingDispatcher.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingDispatcher.java index 814a381946f14..4e9e8befe0f9e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingDispatcher.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingDispatcher.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReader.java index 3f6f82200b0aa..0f75538ee88f0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -22,10 +22,10 @@ import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.AsyncCallbacks; import org.apache.bookkeeper.mledger.Entry; @@ -44,7 +44,6 @@ * Entry reader that fulfill read request by streamline the read instead of reading with micro batch. */ @Slf4j -@RequiredArgsConstructor public class StreamingEntryReader implements AsyncCallbacks.ReadEntryCallback, WaitingEntryCallBack { private final int maxRetry = 3; @@ -61,6 +60,10 @@ public class StreamingEntryReader implements AsyncCallbacks.ReadEntryCallback, W private final PersistentTopic topic; + private final Executor topicExecutor; + + private final Executor dispatcherExecutor; + private AtomicInteger currentReadSizeByte = new AtomicInteger(0); private volatile State state; @@ -73,6 +76,14 @@ public class StreamingEntryReader implements AsyncCallbacks.ReadEntryCallback, W private final Backoff readFailureBackoff = new Backoff(10, TimeUnit.MILLISECONDS, 1, TimeUnit.SECONDS, 0, TimeUnit.MILLISECONDS); + public StreamingEntryReader(ManagedCursorImpl cursor, StreamingDispatcher dispatcher, PersistentTopic topic) { + this.cursor = cursor; + this.dispatcher = dispatcher; + this.topic = topic; + this.topicExecutor = topic.getBrokerService().getTopicOrderedExecutor().chooseThread(topic.getName()); + this.dispatcherExecutor = topic.getBrokerService().getTopicOrderedExecutor().chooseThread(dispatcher.getName()); + } + /** * Read entries in streaming way, that said instead of reading with micro batch and send entries to consumer after * all entries in the batch are read from ledger, this method will fire numEntriesToRead requests to managedLedger @@ -146,7 +157,7 @@ public synchronized void asyncReadEntries(int numEntriesToRead, long maxReadSize @Override public void readEntryComplete(Entry entry, Object ctx) { // Don't block caller thread, complete read entry with dispatcher dedicated thread. - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(dispatcher.getName(), SafeRun.safeRun(() -> { + dispatcherExecutor.execute(SafeRun.safeRun(() -> { internalReadEntryComplete(entry, ctx); })); } @@ -187,7 +198,7 @@ private void internalReadEntryComplete(Entry entry, Object ctx) { @Override public void readEntryFailed(ManagedLedgerException exception, Object ctx) { // Don't block caller thread, complete read entry fail with dispatcher dedicated thread. - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(dispatcher.getName(), SafeRun.safeRun(() -> { + dispatcherExecutor.execute(SafeRun.safeRun(() -> { internalReadEntryFailed(exception, ctx); })); } @@ -246,7 +257,7 @@ private void internalCancelReadRequests() { public boolean cancelReadRequests() { if (STATE_UPDATER.compareAndSet(this, State.Issued, State.Canceling)) { // Don't block caller thread, complete cancel read with dispatcher dedicated thread. - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(topic.getName(), SafeRun.safeRun(() -> { + topicExecutor.execute(SafeRun.safeRun(() -> { synchronized (StreamingEntryReader.this) { if (STATE_UPDATER.compareAndSet(this, State.Canceling, State.Canceled)) { internalCancelReadRequests(); @@ -271,8 +282,7 @@ private void cleanQueue(Queue queue) { private void retryReadRequest(PendingReadEntryRequest pendingReadEntryRequest, long delay) { topic.getBrokerService().executor().schedule(() -> { // Jump again into dispatcher dedicated thread - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(dispatcher.getName(), - SafeRun.safeRun(() -> { + dispatcherExecutor.execute(SafeRun.safeRun(() -> { ManagedLedgerImpl managedLedger = (ManagedLedgerImpl) cursor.getManagedLedger(); managedLedger.asyncReadEntry(pendingReadEntryRequest.position, this, pendingReadEntryRequest); })); @@ -281,9 +291,7 @@ private void retryReadRequest(PendingReadEntryRequest pendingReadEntryRequest, l @Override public void entriesAvailable() { - topic.getBrokerService().getTopicOrderedExecutor().executeOrdered(dispatcher.getName(), SafeRun.safeRun(() -> { - internalEntriesAvailable(); - })); + dispatcherExecutor.execute(SafeRun.safeRun(this::internalEntriesAvailable)); } private synchronized void internalEntriesAvailable() { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/package-info.java index 9a205ed252f09..4d576d9f437f3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/streamingdispatch/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java index 9e71fb7d46bfe..677b04d8a74ca 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java index c92693c0df4d8..6e02ec5a9f1df 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java index 3eb52c59a8b7a..909133338719f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ClusterReplicationMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ClusterReplicationMetrics.java index 6718f074c67b2..6b274b26b57fb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ClusterReplicationMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ClusterReplicationMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java index df6bdb39ed9e2..604265b554050 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java index 905db1c1e64ed..a487f655748d5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java index d8c518e9a5d4a..21dc3315e721b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java index d8047f1e13ea8..e531139d4212b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java index 0046218d7c2c2..a352bfe004bd0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/TimeWindow.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/TimeWindow.java index 7df8d1563a6cc..08730189322ee 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/TimeWindow.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/TimeWindow.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/WindowWrap.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/WindowWrap.java index 45bcb093e7405..12869b82921e5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/WindowWrap.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/WindowWrap.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java index e7e19c8ce3ba3..f87abcf495308 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java index 1f3b58a2590f4..424a7cb2f81ac 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java index 7bbef5379cbae..890a37aa2d877 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java index a8edbf3dd3e01..6d82ec682ea1a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/package-info.java index 0f16c778e7b53..18b9206a77669 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/package-info.java index 60eb3b56d2fde..4f31625b3084b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedConsumerStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedConsumerStats.java index 0a4bd317df5de..ed72e29946833 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedConsumerStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedConsumerStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java index 7e50da57c2561..be1daf92599d3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedProducerStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedProducerStats.java index d21e49d43486a..e9ac89da87bc6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedProducerStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedProducerStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedReplicationStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedReplicationStats.java index ca92d557143e5..78f33f874e998 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedReplicationStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedReplicationStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java index e3a56f5e33493..9b37f7d48c8e5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedTransactionCoordinatorStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedTransactionCoordinatorStats.java index 6fd75cbba3941..f417715ffd619 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedTransactionCoordinatorStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedTransactionCoordinatorStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/ManagedLedgerStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/ManagedLedgerStats.java index 9f124a47f9383..db807b51df49f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/ManagedLedgerStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/ManagedLedgerStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java index 3b4d4f78efad7..26aae969aab42 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -115,6 +115,8 @@ private static void aggregateTopicStats(TopicStats stats, SubscriptionStatsImpl AggregatedSubscriptionStats subsStats) { stats.subscriptionsCount++; stats.msgBacklog += subscriptionStats.msgBacklog; + subsStats.bytesOutCounter = subscriptionStats.bytesOutCounter; + subsStats.msgOutCounter = subscriptionStats.msgOutCounter; subsStats.msgBacklog = subscriptionStats.msgBacklog; subsStats.msgDelayed = subscriptionStats.msgDelayed; subsStats.msgRateExpired = subscriptionStats.msgRateExpired; @@ -126,6 +128,7 @@ private static void aggregateTopicStats(TopicStats stats, SubscriptionStatsImpl subsStats.lastConsumedTimestamp = subscriptionStats.lastConsumedTimestamp; subsStats.lastMarkDeleteAdvancedTimestamp = subscriptionStats.lastMarkDeleteAdvancedTimestamp; subsStats.consumersCount = subscriptionStats.consumers.size(); + subsStats.blockedSubscriptionOnUnackedMsgs = subscriptionStats.blockedSubscriptionOnUnackedMsgs; subscriptionStats.consumers.forEach(cStats -> { stats.consumersCount++; subsStats.unackedMessages += cStats.unackedMessages; @@ -133,11 +136,6 @@ private static void aggregateTopicStats(TopicStats stats, SubscriptionStatsImpl subsStats.msgRateOut += cStats.msgRateOut; subsStats.messageAckRate += cStats.messageAckRate; subsStats.msgThroughputOut += cStats.msgThroughputOut; - subsStats.bytesOutCounter += cStats.bytesOutCounter; - subsStats.msgOutCounter += cStats.msgOutCounter; - if (!subsStats.blockedSubscriptionOnUnackedMsgs && cStats.blockedConsumerOnUnackedMsgs) { - subsStats.blockedSubscriptionOnUnackedMsgs = true; - } }); stats.rateOut += subsStats.msgRateOut; stats.throughputOut += subsStats.msgThroughputOut; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreams.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreams.java index c7e09b5df604f..df107b6d7d9c4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreams.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreams.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java index b217e02373363..5283215feaac6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PulsarPrometheusMetricsServlet.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PulsarPrometheusMetricsServlet.java index 62754f774bf1f..42bd2652883b6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PulsarPrometheusMetricsServlet.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PulsarPrometheusMetricsServlet.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java index 7372b5f7fa71e..754722c98be77 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TransactionAggregator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TransactionAggregator.java index 6889ed71fe3fe..3da061f6ffef2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TransactionAggregator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TransactionAggregator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesOpStatsLogger.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesOpStatsLogger.java index 70a2c5bc79429..12f54ba48a4d4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesOpStatsLogger.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesOpStatsLogger.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesSummaryLogger.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesSummaryLogger.java index 7a5f92a97ff30..cc144e0eb692a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesSummaryLogger.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/DataSketchesSummaryLogger.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/LongAdderCounter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/LongAdderCounter.java index 39be12b35509b..ff9d9302456d1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/LongAdderCounter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/LongAdderCounter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/ObserverGauge.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/ObserverGauge.java index 21ff600f81ab5..b1a1856cf7182 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/ObserverGauge.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/ObserverGauge.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusMetricsProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusMetricsProvider.java index 0e59286861a40..73c0609c556a5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusMetricsProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusMetricsProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -20,7 +20,6 @@ import static org.apache.pulsar.common.util.Runnables.catchingAndLoggingThrowables; import com.google.common.annotations.VisibleForTesting; -import io.netty.util.concurrent.DefaultThreadFactory; import io.prometheus.client.Collector; import java.io.IOException; import java.io.Writer; @@ -34,6 +33,7 @@ import org.apache.bookkeeper.stats.StatsProvider; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.StringUtils; +import org.apache.pulsar.client.util.ExecutorProvider; /** * A Prometheus based {@link StatsProvider} implementation. @@ -90,7 +90,8 @@ public String getStatsName(String... statsComponents) { @Override public void start(Configuration conf) { - executor = Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("metrics")); + executor = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("metrics")); int latencyRolloverSeconds = conf.getInt(PROMETHEUS_STATS_LATENCY_ROLLOVER_SECONDS, DEFAULT_PROMETHEUS_STATS_LATENCY_ROLLOVER_SECONDS); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusStatsLogger.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusStatsLogger.java index 6ca3996424ced..9a267d42d596e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusStatsLogger.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusStatsLogger.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusTextFormatUtil.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusTextFormatUtil.java index d00093c5ad09e..b6a5d3f46ec9d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusTextFormatUtil.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusTextFormatUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/SimpleGauge.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/SimpleGauge.java index 612168a2d9143..cc2e51e0eb710 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/SimpleGauge.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/SimpleGauge.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/Summary.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/Summary.java index a50a994970998..ba6407612428b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/Summary.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/Summary.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/package-info.java index 5dc3276cd6a83..8085519c93157 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java index 3723fb4ff5c99..5289e0938e57b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/ManagedLedgerStorage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/ManagedLedgerStorage.java index efda2261f3978..0b5a102eed1e0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/ManagedLedgerStorage.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/ManagedLedgerStorage.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/package-info.java index 1e5ad0ca7971b..275127607a1a2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/storage/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicFactory.java index 9e162f741b2c3..8d30d1d140f5a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,7 +18,7 @@ */ package org.apache.pulsar.broker.systopic; -import org.apache.pulsar.broker.service.TransactionBufferSnapshotService; +import org.apache.pulsar.broker.service.SystemTopicTxnBufferSnapshotService; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.common.events.EventType; import org.apache.pulsar.common.naming.NamespaceName; @@ -43,25 +43,27 @@ public TopicPoliciesSystemTopicClient createTopicPoliciesSystemTopicClient(Names return new TopicPoliciesSystemTopicClient(client, topicName); } - public TransactionBufferSystemTopicClient createTransactionBufferSystemTopicClient(NamespaceName namespaceName, - TransactionBufferSnapshotService transactionBufferSnapshotService) { + public TransactionBufferSnapshotBaseSystemTopicClient createTransactionBufferSystemTopicClient( + NamespaceName namespaceName, SystemTopicTxnBufferSnapshotService + systemTopicTxnBufferSnapshotService, Class schemaType) { TopicName topicName = TopicName.get(TopicDomain.persistent.value(), namespaceName, SystemTopicNames.TRANSACTION_BUFFER_SNAPSHOT); log.info("Create transaction buffer snapshot client, topicName : {}", topicName.toString()); - return new TransactionBufferSystemTopicClient(client, topicName, transactionBufferSnapshotService); + return new TransactionBufferSnapshotBaseSystemTopicClient(client, topicName, + systemTopicTxnBufferSnapshotService, schemaType); } public static TopicName getSystemTopicName(NamespaceName namespaceName, EventType eventType) { - switch (eventType) { - case TOPIC_POLICY: - return TopicName.get(TopicDomain.persistent.value(), namespaceName, - SystemTopicNames.NAMESPACE_EVENTS_LOCAL_NAME); - case TRANSACTION_BUFFER_SNAPSHOT: - return TopicName.get(TopicDomain.persistent.value(), namespaceName, - SystemTopicNames.TRANSACTION_BUFFER_SNAPSHOT); - default: - return null; - } + return switch (eventType) { + case TOPIC_POLICY -> TopicName.get(TopicDomain.persistent.value(), namespaceName, + SystemTopicNames.NAMESPACE_EVENTS_LOCAL_NAME); + case TRANSACTION_BUFFER_SNAPSHOT -> TopicName.get(TopicDomain.persistent.value(), namespaceName, + SystemTopicNames.TRANSACTION_BUFFER_SNAPSHOT); + case TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS -> TopicName.get(TopicDomain.persistent.value(), namespaceName, + SystemTopicNames.TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS); + case TRANSACTION_BUFFER_SNAPSHOT_INDEXES -> TopicName.get(TopicDomain.persistent.value(), namespaceName, + SystemTopicNames.TRANSACTION_BUFFER_SNAPSHOT_INDEXES); + }; } private static final Logger log = LoggerFactory.getLogger(NamespaceEventsSystemTopicFactory.class); diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClient.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClient.java index 2bc740a41d48b..88ca099b4ca17 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClient.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClient.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -87,37 +87,42 @@ public interface SystemTopicClient { * Writer for system topic. */ interface Writer { + /** * Write event to the system topic. + * @param key the key of the event * @param t pulsar event * @return message id * @throws PulsarClientException exception while write event cause */ - MessageId write(T t) throws PulsarClientException; + MessageId write(String key, T t) throws PulsarClientException; /** * Async write event to the system topic. + * @param key the key of the event * @param t pulsar event * @return message id future */ - CompletableFuture writeAsync(T t); + CompletableFuture writeAsync(String key, T t); /** * Delete event in the system topic. + * @param key the key of the event * @param t pulsar event * @return message id * @throws PulsarClientException exception while write event cause */ - default MessageId delete(T t) throws PulsarClientException { + default MessageId delete(String key, T t) throws PulsarClientException { throw new UnsupportedOperationException("Unsupported operation"); } /** * Async delete event in the system topic. + * @param key the key of the event * @param t pulsar event * @return message id future */ - default CompletableFuture deleteAsync(T t) { + default CompletableFuture deleteAsync(String key, T t) { throw new UnsupportedOperationException("Unsupported operation"); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java index 98465d40f5730..8c0220a86df2d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TopicPoliciesSystemTopicClient.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TopicPoliciesSystemTopicClient.java index 4ad2137d80b73..3fd8921c15efa 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TopicPoliciesSystemTopicClient.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TopicPoliciesSystemTopicClient.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -85,41 +85,35 @@ private TopicPolicyWriter(Producer producer, SystemTopicClient builder = producer.newMessage().key(getEventKey(event)).value(event); + public MessageId write(String key, PulsarEvent event) throws PulsarClientException { + TypedMessageBuilder builder = producer.newMessage().key(key).value(event); setReplicateCluster(event, builder); return builder.send(); } @Override - public CompletableFuture writeAsync(PulsarEvent event) { - TypedMessageBuilder builder = producer.newMessage().key(getEventKey(event)).value(event); + public CompletableFuture writeAsync(String key, PulsarEvent event) { + TypedMessageBuilder builder = producer.newMessage().key(key).value(event); setReplicateCluster(event, builder); return builder.sendAsync(); } @Override - public MessageId delete(PulsarEvent event) throws PulsarClientException { - validateActionType(event); - TypedMessageBuilder builder = producer.newMessage().key(getEventKey(event)).value(null); + public MessageId delete(String key, PulsarEvent event) throws PulsarClientException { + TypedMessageBuilder builder = producer.newMessage().key(key).value(null); setReplicateCluster(event, builder); return builder.send(); } @Override - public CompletableFuture deleteAsync(PulsarEvent event) { + public CompletableFuture deleteAsync(String key, PulsarEvent event) { validateActionType(event); - TypedMessageBuilder builder = producer.newMessage().key(getEventKey(event)).value(null); + TypedMessageBuilder builder = producer.newMessage().key(key).value(null); setReplicateCluster(event, builder); return builder.sendAsync(); } - private String getEventKey(PulsarEvent event) { - return TopicName.get(event.getTopicPoliciesEvent().getDomain(), - event.getTopicPoliciesEvent().getTenant(), - event.getTopicPoliciesEvent().getNamespace(), - event.getTopicPoliciesEvent().getTopic()).toString(); - } + @Override public void close() throws IOException { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSnapshotBaseSystemTopicClient.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSnapshotBaseSystemTopicClient.java new file mode 100644 index 0000000000000..b18bf552c3004 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSnapshotBaseSystemTopicClient.java @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.systopic; + +import java.io.IOException; +import java.util.concurrent.CompletableFuture; +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.broker.service.SystemTopicTxnBufferSnapshotService; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.MessageId; +import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.api.PulsarClient; +import org.apache.pulsar.client.api.PulsarClientException; +import org.apache.pulsar.client.api.Schema; +import org.apache.pulsar.common.naming.TopicName; + +@Slf4j +public class TransactionBufferSnapshotBaseSystemTopicClient extends SystemTopicClientBase { + + protected final SystemTopicTxnBufferSnapshotService systemTopicTxnBufferSnapshotService; + protected final Class schemaType; + + public TransactionBufferSnapshotBaseSystemTopicClient(PulsarClient client, + TopicName topicName, + SystemTopicTxnBufferSnapshotService + systemTopicTxnBufferSnapshotService, + Class schemaType) { + super(client, topicName); + this.systemTopicTxnBufferSnapshotService = systemTopicTxnBufferSnapshotService; + this.schemaType = schemaType; + } + + protected void removeWriter(Writer writer) { + writers.remove(writer); + this.systemTopicTxnBufferSnapshotService.removeClient(topicName, this); + } + + protected void removeReader(Reader reader) { + readers.remove(reader); + this.systemTopicTxnBufferSnapshotService.removeClient(topicName, this); + } + + protected static class TransactionBufferSnapshotWriter implements Writer { + + protected final Producer producer; + protected final TransactionBufferSnapshotBaseSystemTopicClient + transactionBufferSnapshotBaseSystemTopicClient; + + protected TransactionBufferSnapshotWriter(Producer producer, + TransactionBufferSnapshotBaseSystemTopicClient + transactionBufferSnapshotBaseSystemTopicClient) { + this.producer = producer; + this.transactionBufferSnapshotBaseSystemTopicClient = transactionBufferSnapshotBaseSystemTopicClient; + } + + @Override + public MessageId write(String key, T t) + throws PulsarClientException { + return producer.newMessage().key(key) + .value(t).send(); + } + + @Override + public CompletableFuture writeAsync(String key, T t) { + return producer.newMessage() + .key(key) + .value(t).sendAsync(); + } + + @Override + public MessageId delete(String key, T t) + throws PulsarClientException { + return producer.newMessage() + .key(key) + .value(null) + .send(); + } + + @Override + public CompletableFuture deleteAsync(String key, T t) { + return producer.newMessage() + .key(key) + .value(null) + .sendAsync(); + } + + @Override + public void close() throws IOException { + this.closeAsync().join(); + } + + @Override + public CompletableFuture closeAsync() { + CompletableFuture completableFuture = new CompletableFuture<>(); + producer.closeAsync().whenComplete((v, e) -> { + // if close fail, also need remove the producer + transactionBufferSnapshotBaseSystemTopicClient.removeWriter(this); + if (e != null) { + completableFuture.completeExceptionally(e); + return; + } + completableFuture.complete(null); + }); + return completableFuture; + } + + @Override + public SystemTopicClient getSystemTopicClient() { + return transactionBufferSnapshotBaseSystemTopicClient; + } + } + + protected static class TransactionBufferSnapshotReader implements Reader { + + private final org.apache.pulsar.client.api.Reader reader; + private final TransactionBufferSnapshotBaseSystemTopicClient transactionBufferSnapshotBaseSystemTopicClient; + + protected TransactionBufferSnapshotReader( + org.apache.pulsar.client.api.Reader reader, + TransactionBufferSnapshotBaseSystemTopicClient transactionBufferSnapshotBaseSystemTopicClient) { + this.reader = reader; + this.transactionBufferSnapshotBaseSystemTopicClient = transactionBufferSnapshotBaseSystemTopicClient; + } + + @Override + public Message readNext() throws PulsarClientException { + return reader.readNext(); + } + + @Override + public CompletableFuture> readNextAsync() { + return reader.readNextAsync(); + } + + @Override + public boolean hasMoreEvents() throws PulsarClientException { + return reader.hasMessageAvailable(); + } + + @Override + public CompletableFuture hasMoreEventsAsync() { + return reader.hasMessageAvailableAsync(); + } + + @Override + public void close() throws IOException { + this.closeAsync().join(); + } + + @Override + public CompletableFuture closeAsync() { + CompletableFuture completableFuture = new CompletableFuture<>(); + reader.closeAsync().whenComplete((v, e) -> { + // if close fail, also need remove the reader + transactionBufferSnapshotBaseSystemTopicClient.removeReader(this); + if (e != null) { + completableFuture.completeExceptionally(e); + return; + } + completableFuture.complete(null); + }); + return completableFuture; + } + + @Override + public SystemTopicClient getSystemTopic() { + return transactionBufferSnapshotBaseSystemTopicClient; + } + } + + @Override + protected CompletableFuture> newWriterAsyncInternal() { + return client.newProducer(Schema.AVRO(schemaType)) + .topic(topicName.toString()) + .createAsync().thenApply(producer -> { + if (log.isDebugEnabled()) { + log.debug("[{}] A new {} writer is created", topicName, schemaType.getName()); + } + return new TransactionBufferSnapshotWriter<>(producer, this); + }); + } + + @Override + protected CompletableFuture> newReaderAsyncInternal() { + return client.newReader(Schema.AVRO(schemaType)) + .topic(topicName.toString()) + .startMessageId(MessageId.earliest) + .readCompacted(true) + .createAsync() + .thenApply(reader -> { + if (log.isDebugEnabled()) { + log.debug("[{}] A new {} reader is created", topicName, schemaType.getName()); + } + return new TransactionBufferSnapshotReader<>(reader, this); + }); + } + +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSystemTopicClient.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSystemTopicClient.java deleted file mode 100644 index aaab858ab1ee2..0000000000000 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSystemTopicClient.java +++ /dev/null @@ -1,208 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.pulsar.broker.systopic; - -import java.io.IOException; -import java.util.concurrent.CompletableFuture; -import lombok.extern.slf4j.Slf4j; -import org.apache.pulsar.broker.service.TransactionBufferSnapshotService; -import org.apache.pulsar.broker.transaction.buffer.matadata.TransactionBufferSnapshot; -import org.apache.pulsar.client.api.Message; -import org.apache.pulsar.client.api.MessageId; -import org.apache.pulsar.client.api.Producer; -import org.apache.pulsar.client.api.PulsarClient; -import org.apache.pulsar.client.api.PulsarClientException; -import org.apache.pulsar.client.api.Schema; -import org.apache.pulsar.common.naming.TopicName; - -@Slf4j -public class TransactionBufferSystemTopicClient extends SystemTopicClientBase { - private TransactionBufferSnapshotService transactionBufferSnapshotService; - - public TransactionBufferSystemTopicClient(PulsarClient client, TopicName topicName, - TransactionBufferSnapshotService transactionBufferSnapshotService) { - super(client, topicName); - this.transactionBufferSnapshotService = transactionBufferSnapshotService; - } - - @Override - protected CompletableFuture> newWriterAsyncInternal() { - return client.newProducer(Schema.AVRO(TransactionBufferSnapshot.class)) - .topic(topicName.toString()) - .createAsync().thenCompose(producer -> { - if (log.isDebugEnabled()) { - log.debug("[{}] A new transactionBufferSnapshot writer is created", topicName); - } - return CompletableFuture.completedFuture( - new TransactionBufferSnapshotWriter(producer, this)); - }); - } - - @Override - protected CompletableFuture> newReaderAsyncInternal() { - return client.newReader(Schema.AVRO(TransactionBufferSnapshot.class)) - .topic(topicName.toString()) - .startMessageId(MessageId.earliest) - .readCompacted(true) - .createAsync() - .thenCompose(reader -> { - if (log.isDebugEnabled()) { - log.debug("[{}] A new transactionBufferSnapshot buffer reader is created", topicName); - } - return CompletableFuture.completedFuture( - new TransactionBufferSnapshotReader(reader, this)); - }); - } - - protected void removeWriter(TransactionBufferSnapshotWriter writer) { - writers.remove(writer); - this.transactionBufferSnapshotService.removeClient(topicName, this); - } - - protected void removeReader(TransactionBufferSnapshotReader reader) { - readers.remove(reader); - this.transactionBufferSnapshotService.removeClient(topicName, this); - } - - private static class TransactionBufferSnapshotWriter implements Writer { - - private final Producer producer; - private final TransactionBufferSystemTopicClient transactionBufferSystemTopicClient; - - private TransactionBufferSnapshotWriter(Producer producer, - TransactionBufferSystemTopicClient transactionBufferSystemTopicClient) { - this.producer = producer; - this.transactionBufferSystemTopicClient = transactionBufferSystemTopicClient; - } - - @Override - public MessageId write(TransactionBufferSnapshot transactionBufferSnapshot) throws PulsarClientException { - return producer.newMessage().key(transactionBufferSnapshot.getTopicName()) - .value(transactionBufferSnapshot).send(); - } - - @Override - public CompletableFuture writeAsync(TransactionBufferSnapshot transactionBufferSnapshot) { - return producer.newMessage().key(transactionBufferSnapshot.getTopicName()) - .value(transactionBufferSnapshot).sendAsync(); - } - - @Override - public MessageId delete(TransactionBufferSnapshot transactionBufferSnapshot) throws PulsarClientException { - return producer.newMessage() - .key(transactionBufferSnapshot.getTopicName()) - .value(null) - .send(); - } - - @Override - public CompletableFuture deleteAsync(TransactionBufferSnapshot transactionBufferSnapshot) { - return producer.newMessage() - .key(transactionBufferSnapshot.getTopicName()) - .value(null) - .sendAsync(); - } - - @Override - public void close() throws IOException { - this.producer.close(); - transactionBufferSystemTopicClient.removeWriter(this); - } - - @Override - public CompletableFuture closeAsync() { - CompletableFuture completableFuture = new CompletableFuture<>(); - producer.closeAsync().whenComplete((v, e) -> { - // if close fail, also need remove the producer - transactionBufferSystemTopicClient.removeWriter(this); - if (e != null) { - completableFuture.completeExceptionally(e); - return; - } - completableFuture.complete(null); - }); - return completableFuture; - } - - @Override - public SystemTopicClient getSystemTopicClient() { - return transactionBufferSystemTopicClient; - } - } - - private static class TransactionBufferSnapshotReader implements Reader { - - private final org.apache.pulsar.client.api.Reader reader; - private final TransactionBufferSystemTopicClient transactionBufferSystemTopicClient; - - private TransactionBufferSnapshotReader(org.apache.pulsar.client.api.Reader reader, - TransactionBufferSystemTopicClient transactionBufferSystemTopicClient) { - this.reader = reader; - this.transactionBufferSystemTopicClient = transactionBufferSystemTopicClient; - } - - @Override - public Message readNext() throws PulsarClientException { - return reader.readNext(); - } - - @Override - public CompletableFuture> readNextAsync() { - return reader.readNextAsync(); - } - - @Override - public boolean hasMoreEvents() throws PulsarClientException { - return reader.hasMessageAvailable(); - } - - @Override - public CompletableFuture hasMoreEventsAsync() { - return reader.hasMessageAvailableAsync(); - } - - @Override - public void close() throws IOException { - this.reader.close(); - transactionBufferSystemTopicClient.removeReader(this); - } - - @Override - public CompletableFuture closeAsync() { - CompletableFuture completableFuture = new CompletableFuture<>(); - reader.closeAsync().whenComplete((v, e) -> { - // if close fail, also need remove the reader - transactionBufferSystemTopicClient.removeReader(this); - if (e != null) { - completableFuture.completeExceptionally(e); - return; - } - completableFuture.complete(null); - }); - return completableFuture; - } - - @Override - public SystemTopicClient getSystemTopic() { - return transactionBufferSystemTopicClient; - } - } -} - diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/package-info.java index 89ea32ff23510..bbeedb4056918 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/BrokerTool.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/BrokerTool.java index b710f22aec018..2a479ce4b90c8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/BrokerTool.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/BrokerTool.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/GenerateDocsCommand.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/GenerateDocsCommand.java index afc570fd30767..1819a56baa12a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/GenerateDocsCommand.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/GenerateDocsCommand.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/LoadReportCommand.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/LoadReportCommand.java index 34340c3b0c5f9..935e3a9f2fa1a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/LoadReportCommand.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/LoadReportCommand.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -32,6 +32,7 @@ import org.apache.pulsar.broker.loadbalance.impl.GenericBrokerHostUsageImpl; import org.apache.pulsar.broker.loadbalance.impl.LinuxBrokerHostUsageImpl; import org.apache.pulsar.broker.tools.LoadReportCommand.Flags; +import org.apache.pulsar.client.util.ExecutorProvider; import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage; import org.apache.pulsar.policies.data.loadbalancer.SystemResourceUsage; @@ -88,7 +89,8 @@ private boolean apply(Flags flags) { spec.console().println("--------------------------------------"); spec.console().println(); - ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); + ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor( + new ExecutorProvider.ExtendedThreadFactory("load-report")); BrokerHostUsage hostUsage; try { if (isLinux) { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/package-info.java index f552025ac7e37..605459e0d0172 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/tools/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/AbortedTxnProcessor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/AbortedTxnProcessor.java new file mode 100644 index 0000000000000..e436e1df24972 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/AbortedTxnProcessor.java @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer; + +import java.util.concurrent.CompletableFuture; +import org.apache.bookkeeper.mledger.Position; +import org.apache.bookkeeper.mledger.impl.PositionImpl; +import org.apache.pulsar.client.api.transaction.TxnID; + + +public interface AbortedTxnProcessor { + + /** + * After the transaction buffer writes a transaction aborted marker to the topic, + * the transaction buffer will put the aborted txnID and the aborted marker position to AbortedTxnProcessor. + * @param txnID aborted transaction ID. + * @param position the position of the abort txnID + */ + void putAbortedTxnAndPosition(TxnID txnID, PositionImpl position); + + /** + * Clean up invalid aborted transactions. + */ + void trimExpiredAbortedTxns(); + + /** + * Check whether the transaction ID is an aborted transaction ID. + * @param txnID the transaction ID that needs to be checked. + * @param readPosition the read position of the transaction message, can be used to find the segment. + * @return a boolean, whether the transaction ID is an aborted transaction ID. + */ + boolean checkAbortedTransaction(TxnID txnID, Position readPosition); + + /** + * Recover transaction buffer by transaction buffer snapshot. + * @return a Position (startReadCursorPosition) determiner where to start to recover in the original topic. + */ + + CompletableFuture recoverFromSnapshot(); + + /** + * Delete the transaction buffer aborted transaction snapshot. + * @return a completableFuture. + */ + CompletableFuture deleteAbortedTxnSnapshot(); + + /** + * Take aborted transactions snapshot. + * @return a completableFuture. + */ + CompletableFuture takeAbortedTxnsSnapshot(PositionImpl maxReadPosition); + + /** + * Get the lastSnapshotTimestamps. + * @return the lastSnapshotTimestamps. + */ + long getLastSnapshotTimestamps(); + + CompletableFuture closeAsync(); + +} \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBuffer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBuffer.java index ab1270ef0e67f..99093e42fd74c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBuffer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBuffer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -141,9 +141,10 @@ public interface TransactionBuffer { /** * Close the buffer asynchronously. * @param txnID {@link TxnID} txnId. + * @param readPosition the persitent position of the txn message. * @return the txnId is aborted. */ - boolean isTxnAborted(TxnID txnID); + boolean isTxnAborted(TxnID txnID, PositionImpl readPosition); /** * Sync max read position for normal publish. diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientStats.java index 5c91b4e13a2fd..8fda233ff1dfa 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferProvider.java index 0141ae45b33c5..7cf6b17172b64 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferReader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferReader.java index 54dafd55410a1..cf8547c1a7043 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferReader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferReader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionCursor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionCursor.java index 56ca326afc6e4..c0f03b871a0a0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionCursor.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionCursor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntry.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntry.java index 587236445fe9b..609d74156f03b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntry.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntry.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionMeta.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionMeta.java index 347ab74564780..8b69233594f8d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionMeta.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/TransactionMeta.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBuffer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBuffer.java index c4a9fc2b77407..56b49f98efe8e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBuffer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBuffer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -360,7 +360,7 @@ public CompletableFuture closeAsync() { } @Override - public boolean isTxnAborted(TxnID txnID) { + public boolean isTxnAborted(TxnID txnID, PositionImpl readPosition) { return false; } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferProvider.java index d14116b18c148..bf0789c404874 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferReader.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferReader.java index d81ce02aebe7b..10a00ff314fab 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferReader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/InMemTransactionBufferReader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/SingleSnapshotAbortedTxnProcessorImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/SingleSnapshotAbortedTxnProcessorImpl.java new file mode 100644 index 0000000000000..a13dd0499a6bc --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/SingleSnapshotAbortedTxnProcessorImpl.java @@ -0,0 +1,182 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.Position; +import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; +import org.apache.bookkeeper.mledger.impl.PositionImpl; +import org.apache.commons.collections4.map.LinkedMap; +import org.apache.pulsar.broker.service.persistent.PersistentTopic; +import org.apache.pulsar.broker.systopic.SystemTopicClient; +import org.apache.pulsar.broker.transaction.buffer.AbortedTxnProcessor; +import org.apache.pulsar.broker.transaction.buffer.metadata.AbortTxnMetadata; +import org.apache.pulsar.broker.transaction.buffer.metadata.TransactionBufferSnapshot; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.transaction.TxnID; +import org.apache.pulsar.common.naming.TopicName; +import org.apache.pulsar.common.util.FutureUtil; + +@Slf4j +public class SingleSnapshotAbortedTxnProcessorImpl implements AbortedTxnProcessor { + private final PersistentTopic topic; + private final CompletableFuture> takeSnapshotWriter; + /** + * Aborts, map for jude message is aborted, linked for remove abort txn in memory when this + * position have been deleted. + */ + private final LinkedMap aborts = new LinkedMap<>(); + + private volatile long lastSnapshotTimestamps; + + public SingleSnapshotAbortedTxnProcessorImpl(PersistentTopic topic) { + this.topic = topic; + this.takeSnapshotWriter = this.topic.getBrokerService().getPulsar() + .getTransactionBufferSnapshotServiceFactory() + .getTxnBufferSnapshotService().createWriter(TopicName.get(topic.getName())); + } + + @Override + public void putAbortedTxnAndPosition(TxnID abortedTxnId, PositionImpl position) { + aborts.put(abortedTxnId, position); + } + + //In this implementation we clear the invalid aborted txn ID one by one. + @Override + public void trimExpiredAbortedTxns() { + while (!aborts.isEmpty() && !((ManagedLedgerImpl) topic.getManagedLedger()) + .ledgerExists(aborts.get(aborts.firstKey()).getLedgerId())) { + if (log.isDebugEnabled()) { + log.debug("[{}] Topic transaction buffer clear aborted transaction, TxnId : {}, Position : {}", + topic.getName(), aborts.firstKey(), aborts.get(aborts.firstKey())); + } + aborts.remove(aborts.firstKey()); + } + } + + @Override + public boolean checkAbortedTransaction(TxnID txnID, Position readPosition) { + return aborts.containsKey(txnID); + } + + + @Override + public CompletableFuture recoverFromSnapshot() { + return topic.getBrokerService().getPulsar().getTransactionBufferSnapshotServiceFactory() + .getTxnBufferSnapshotService() + .createReader(TopicName.get(topic.getName())).thenComposeAsync(reader -> { + PositionImpl startReadCursorPosition = null; + try { + while (reader.hasMoreEvents()) { + Message message = reader.readNext(); + if (topic.getName().equals(message.getKey())) { + TransactionBufferSnapshot transactionBufferSnapshot = message.getValue(); + if (transactionBufferSnapshot != null) { + handleSnapshot(transactionBufferSnapshot); + startReadCursorPosition = PositionImpl.get( + transactionBufferSnapshot.getMaxReadPositionLedgerId(), + transactionBufferSnapshot.getMaxReadPositionEntryId()); + } + } + } + closeReader(reader); + return CompletableFuture.completedFuture(startReadCursorPosition); + } catch (Exception ex) { + log.error("[{}] Transaction buffer recover fail when read " + + "transactionBufferSnapshot!", topic.getName(), ex); + closeReader(reader); + return FutureUtil.failedFuture(ex); + } + + }, topic.getBrokerService().getPulsar().getTransactionExecutorProvider() + .getExecutor(this)); + } + + @Override + public CompletableFuture deleteAbortedTxnSnapshot() { + return this.takeSnapshotWriter.thenCompose(writer -> { + TransactionBufferSnapshot snapshot = new TransactionBufferSnapshot(); + snapshot.setTopicName(topic.getName()); + return writer.deleteAsync(snapshot.getTopicName(), snapshot); + }).thenRun(() -> { + log.info("[{}] Successes to delete the aborted transaction snapshot", this.topic); + }); + } + + @Override + public CompletableFuture takeAbortedTxnsSnapshot(PositionImpl maxReadPosition) { + return takeSnapshotWriter.thenCompose(writer -> { + TransactionBufferSnapshot snapshot = new TransactionBufferSnapshot(); + snapshot.setTopicName(topic.getName()); + snapshot.setMaxReadPositionLedgerId(maxReadPosition.getLedgerId()); + snapshot.setMaxReadPositionEntryId(maxReadPosition.getEntryId()); + List list = new ArrayList<>(); + aborts.forEach((k, v) -> { + AbortTxnMetadata abortTxnMetadata = new AbortTxnMetadata(); + abortTxnMetadata.setTxnIdMostBits(k.getMostSigBits()); + abortTxnMetadata.setTxnIdLeastBits(k.getLeastSigBits()); + abortTxnMetadata.setLedgerId(v.getLedgerId()); + abortTxnMetadata.setEntryId(v.getEntryId()); + list.add(abortTxnMetadata); + }); + snapshot.setAborts(list); + return writer.writeAsync(snapshot.getTopicName(), snapshot).thenAccept(messageId -> { + this.lastSnapshotTimestamps = System.currentTimeMillis(); + if (log.isDebugEnabled()) { + log.debug("[{}]Transaction buffer take snapshot success! " + + "messageId : {}", topic.getName(), messageId); + } + }).exceptionally(e -> { + log.warn("[{}]Transaction buffer take snapshot fail! ", topic.getName(), e.getCause()); + return null; + }); + }); + } + + @Override + public long getLastSnapshotTimestamps() { + return this.lastSnapshotTimestamps; + } + + @Override + public CompletableFuture closeAsync() { + return takeSnapshotWriter.thenCompose(SystemTopicClient.Writer::closeAsync); + } + + private void closeReader(SystemTopicClient.Reader reader) { + reader.closeAsync().exceptionally(e -> { + log.error("[{}]Transaction buffer reader close error!", topic.getName(), e); + return null; + }); + } + + private void handleSnapshot(TransactionBufferSnapshot snapshot) { + if (snapshot.getAborts() != null) { + snapshot.getAborts().forEach(abortTxnMetadata -> + aborts.put(new TxnID(abortTxnMetadata.getTxnIdMostBits(), + abortTxnMetadata.getTxnIdLeastBits()), + PositionImpl.get(abortTxnMetadata.getLedgerId(), + abortTxnMetadata.getEntryId()))); + } + } + +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java index ad778137001e3..f3bf4f95923cd 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -23,7 +23,6 @@ import io.netty.util.Timeout; import io.netty.util.Timer; import io.netty.util.TimerTask; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; @@ -38,23 +37,20 @@ import org.apache.bookkeeper.mledger.ManagedCursor; import org.apache.bookkeeper.mledger.ManagedLedgerException; import org.apache.bookkeeper.mledger.Position; -import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; import org.apache.bookkeeper.mledger.impl.PositionImpl; import org.apache.commons.collections4.map.LinkedMap; import org.apache.pulsar.broker.service.BrokerServiceException; import org.apache.pulsar.broker.service.BrokerServiceException.PersistenceException; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.broker.systopic.SystemTopicClient; +import org.apache.pulsar.broker.transaction.buffer.AbortedTxnProcessor; import org.apache.pulsar.broker.transaction.buffer.TransactionBuffer; import org.apache.pulsar.broker.transaction.buffer.TransactionBufferReader; import org.apache.pulsar.broker.transaction.buffer.TransactionMeta; -import org.apache.pulsar.broker.transaction.buffer.matadata.AbortTxnMetadata; -import org.apache.pulsar.broker.transaction.buffer.matadata.TransactionBufferSnapshot; -import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.broker.transaction.buffer.metadata.TransactionBufferSnapshot; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.transaction.TxnID; import org.apache.pulsar.common.api.proto.MessageMetadata; -import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.policies.data.TransactionBufferStats; import org.apache.pulsar.common.policies.data.TransactionInBufferStats; import org.apache.pulsar.common.protocol.Commands; @@ -79,14 +75,6 @@ public class TopicTransactionBuffer extends TopicTransactionBufferState implemen */ private final LinkedMap ongoingTxns = new LinkedMap<>(); - /** - * Aborts, map for jude message is aborted, linked for remove abort txn in memory when this - * position have been deleted. - */ - private final LinkedMap aborts = new LinkedMap<>(); - - private final CompletableFuture> takeSnapshotWriter; - // when add abort or change max read position, the count will +1. Take snapshot will set 0 into it. private final AtomicLong changeMaxReadPositionAndAddAbortTimes = new AtomicLong(); @@ -100,8 +88,6 @@ public class TopicTransactionBuffer extends TopicTransactionBufferState implemen private final int takeSnapshotIntervalTime; - private volatile long lastSnapshotTimestamps; - private final CompletableFuture transactionBufferFuture = new CompletableFuture<>(); /** @@ -113,17 +99,18 @@ public class TopicTransactionBuffer extends TopicTransactionBufferState implemen private final Semaphore handleLowWaterMark = new Semaphore(1); + private final AbortedTxnProcessor snapshotAbortedTxnProcessor; + public TopicTransactionBuffer(PersistentTopic topic) { super(State.None); this.topic = topic; - this.takeSnapshotWriter = this.topic.getBrokerService().getPulsar() - .getTransactionBufferSnapshotService().createWriter(TopicName.get(topic.getName())); this.timer = topic.getBrokerService().getPulsar().getTransactionTimer(); this.takeSnapshotIntervalNumber = topic.getBrokerService().getPulsar() .getConfiguration().getTransactionBufferSnapshotMaxTransactionCount(); this.takeSnapshotIntervalTime = topic.getBrokerService().getPulsar() .getConfiguration().getTransactionBufferSnapshotMinTimeInMillis(); this.maxReadPosition = (PositionImpl) topic.getManagedLedger().getLastConfirmedEntry(); + this.snapshotAbortedTxnProcessor = new SingleSnapshotAbortedTxnProcessorImpl(topic); this.recover(); } @@ -134,9 +121,6 @@ private void recover() { @Override public void recoverComplete() { synchronized (TopicTransactionBuffer.this) { - // sync maxReadPosition change to LAC when TopicTransaction buffer have not recover - // completely the normal message have been sent to broker and state is - // not Ready can't sync maxReadPosition when no ongoing transactions if (ongoingTxns.isEmpty()) { maxReadPosition = (PositionImpl) topic.getManagedLedger().getLastConfirmedEntry(); } @@ -159,9 +143,6 @@ public void recoverComplete() { @Override public void noNeedToRecover() { synchronized (TopicTransactionBuffer.this) { - // sync maxReadPosition change to LAC when TopicTransaction buffer have not recover - // completely the normal message have been sent to broker and state is - // not NoSnapshot can't sync maxReadPosition maxReadPosition = (PositionImpl) topic.getManagedLedger().getLastConfirmedEntry(); if (!changeToNoSnapshotState()) { log.error("[{}]Transaction buffer recover fail", topic.getName()); @@ -171,20 +152,6 @@ public void noNeedToRecover() { } } } - - @Override - public void handleSnapshot(TransactionBufferSnapshot snapshot) { - maxReadPosition = PositionImpl.get(snapshot.getMaxReadPositionLedgerId(), - snapshot.getMaxReadPositionEntryId()); - if (snapshot.getAborts() != null) { - snapshot.getAborts().forEach(abortTxnMetadata -> - aborts.put(new TxnID(abortTxnMetadata.getTxnIdMostBits(), - abortTxnMetadata.getTxnIdLeastBits()), - PositionImpl.get(abortTxnMetadata.getLedgerId(), - abortTxnMetadata.getEntryId()))); - } - } - @Override public void handleTxnEntry(Entry entry) { ByteBuf metadataAndPayload = entry.getDataBuffer(); @@ -196,7 +163,7 @@ public void handleTxnEntry(Entry entry) { PositionImpl position = PositionImpl.get(entry.getLedgerId(), entry.getEntryId()); if (Markers.isTxnMarker(msgMetadata)) { if (Markers.isTxnAbortMarker(msgMetadata)) { - aborts.put(txnID, position); + snapshotAbortedTxnProcessor.putAbortedTxnAndPosition(txnID, position); } updateMaxReadPosition(txnID); } else { @@ -224,7 +191,7 @@ public void recoverExceptionally(Throwable e) { recoverTime.setRecoverEndTime(System.currentTimeMillis()); topic.close(true); } - }, this.topic, this, takeSnapshotWriter)); + }, this.topic, this, snapshotAbortedTxnProcessor)); } @Override @@ -240,7 +207,7 @@ public CompletableFuture checkIfTBRecoverCompletely(boolean isTxnEnabled) CompletableFuture completableFuture = new CompletableFuture<>(); transactionBufferFuture.thenRun(() -> { if (checkIfNoSnapshot()) { - takeSnapshot().thenRun(() -> { + snapshotAbortedTxnProcessor.takeAbortedTxnsSnapshot(maxReadPosition).thenRun(() -> { if (changeToReadyStateFromNoSnapshot()) { timer.newTimeout(TopicTransactionBuffer.this, takeSnapshotIntervalTime, TimeUnit.MILLISECONDS); @@ -307,7 +274,8 @@ public void addFailed(ManagedLedgerException exception, Object ctx) { } private void handleTransactionMessage(TxnID txnId, Position position) { - if (!ongoingTxns.containsKey(txnId) && !aborts.containsKey(txnId)) { + if (!ongoingTxns.containsKey(txnId) && !this.snapshotAbortedTxnProcessor + .checkAbortedTransaction(txnId, position)) { ongoingTxns.put(txnId, (PositionImpl) position); PositionImpl firstPosition = ongoingTxns.get(ongoingTxns.firstKey()); //max read position is less than first ongoing transaction message position, so entryId -1 @@ -315,7 +283,6 @@ private void handleTransactionMessage(TxnID txnId, Position position) { } } - @Override public CompletableFuture openTransactionBufferReader(TxnID txnID, long startSequenceId) { return null; @@ -338,7 +305,7 @@ public void addComplete(Position position, ByteBuf entryData, Object ctx) { synchronized (TopicTransactionBuffer.this) { updateMaxReadPosition(txnID); handleLowWaterMark(txnID, lowWaterMark); - clearAbortedTransactions(); + snapshotAbortedTxnProcessor.trimExpiredAbortedTxns(); takeSnapshotByChangeTimes(); } txnCommittedCounter.increment(); @@ -382,10 +349,9 @@ public CompletableFuture abortTxn(TxnID txnID, long lowWaterMark) { @Override public void addComplete(Position position, ByteBuf entryData, Object ctx) { synchronized (TopicTransactionBuffer.this) { - aborts.put(txnID, (PositionImpl) position); updateMaxReadPosition(txnID); - changeMaxReadPositionAndAddAbortTimes.getAndIncrement(); - clearAbortedTransactions(); + snapshotAbortedTxnProcessor.putAbortedTxnAndPosition(txnID, maxReadPosition); + snapshotAbortedTxnProcessor.trimExpiredAbortedTxns(); takeSnapshotByChangeTimes(); } txnAbortedCounter.increment(); @@ -453,60 +419,20 @@ private void handleLowWaterMark(TxnID txnID, long lowWaterMark) { private void takeSnapshotByChangeTimes() { if (changeMaxReadPositionAndAddAbortTimes.get() >= takeSnapshotIntervalNumber) { - takeSnapshot(); + this.changeMaxReadPositionAndAddAbortTimes.set(0); + this.snapshotAbortedTxnProcessor.takeAbortedTxnsSnapshot(this.maxReadPosition); } } private void takeSnapshotByTimeout() { if (changeMaxReadPositionAndAddAbortTimes.get() > 0) { - takeSnapshot(); + this.changeMaxReadPositionAndAddAbortTimes.set(0); + this.snapshotAbortedTxnProcessor.takeAbortedTxnsSnapshot(this.maxReadPosition); } this.timer.newTimeout(TopicTransactionBuffer.this, takeSnapshotIntervalTime, TimeUnit.MILLISECONDS); } - private CompletableFuture takeSnapshot() { - changeMaxReadPositionAndAddAbortTimes.set(0); - return takeSnapshotWriter.thenCompose(writer -> { - TransactionBufferSnapshot snapshot = new TransactionBufferSnapshot(); - synchronized (TopicTransactionBuffer.this) { - snapshot.setTopicName(topic.getName()); - snapshot.setMaxReadPositionLedgerId(maxReadPosition.getLedgerId()); - snapshot.setMaxReadPositionEntryId(maxReadPosition.getEntryId()); - List list = new ArrayList<>(); - aborts.forEach((k, v) -> { - AbortTxnMetadata abortTxnMetadata = new AbortTxnMetadata(); - abortTxnMetadata.setTxnIdMostBits(k.getMostSigBits()); - abortTxnMetadata.setTxnIdLeastBits(k.getLeastSigBits()); - abortTxnMetadata.setLedgerId(v.getLedgerId()); - abortTxnMetadata.setEntryId(v.getEntryId()); - list.add(abortTxnMetadata); - }); - snapshot.setAborts(list); - } - return writer.writeAsync(snapshot).thenAccept(messageId-> { - this.lastSnapshotTimestamps = System.currentTimeMillis(); - if (log.isDebugEnabled()) { - log.debug("[{}]Transaction buffer take snapshot success! " - + "messageId : {}", topic.getName(), messageId); - } - }).exceptionally(e -> { - log.warn("[{}]Transaction buffer take snapshot fail! ", topic.getName(), e); - return null; - }); - }); - } - private void clearAbortedTransactions() { - while (!aborts.isEmpty() && !((ManagedLedgerImpl) topic.getManagedLedger()) - .ledgerExists(aborts.get(aborts.firstKey()).getLedgerId())) { - if (log.isDebugEnabled()) { - aborts.firstKey(); - log.debug("[{}] Topic transaction buffer clear aborted transaction, TxnId : {}, Position : {}", - topic.getName(), aborts.firstKey(), aborts.get(aborts.firstKey())); - } - aborts.remove(aborts.firstKey()); - } - } void updateMaxReadPosition(TxnID txnID) { PositionImpl preMaxReadPosition = this.maxReadPosition; ongoingTxns.remove(txnID); @@ -529,22 +455,18 @@ public CompletableFuture purgeTxns(List dataLedgers) { @Override public CompletableFuture clearSnapshot() { - return this.takeSnapshotWriter.thenCompose(writer -> { - TransactionBufferSnapshot snapshot = new TransactionBufferSnapshot(); - snapshot.setTopicName(topic.getName()); - return writer.deleteAsync(snapshot); - }).thenCompose(__ -> CompletableFuture.completedFuture(null)); + return snapshotAbortedTxnProcessor.deleteAbortedTxnSnapshot(); } @Override public CompletableFuture closeAsync() { changeToCloseState(); - return this.takeSnapshotWriter.thenCompose(SystemTopicClient.Writer::closeAsync); + return this.snapshotAbortedTxnProcessor.closeAsync(); } @Override - public boolean isTxnAborted(TxnID txnID) { - return aborts.containsKey(txnID); + public boolean isTxnAborted(TxnID txnID, PositionImpl readPosition) { + return snapshotAbortedTxnProcessor.checkAbortedTransaction(txnID, readPosition); } @Override @@ -553,7 +475,7 @@ public void syncMaxReadPositionForNormalPublish(PositionImpl position) { // thread is the same tread, in this time the lastAddConfirm don't content transaction message. synchronized (TopicTransactionBuffer.this) { if (checkIfNoSnapshot()) { - maxReadPosition = position; + this.maxReadPosition = position; } else if (checkIfReady()) { if (ongoingTxns.isEmpty()) { maxReadPosition = position; @@ -575,7 +497,7 @@ public PositionImpl getMaxReadPosition() { @Override public TransactionInBufferStats getTransactionInBufferStats(TxnID txnID) { TransactionInBufferStats transactionInBufferStats = new TransactionInBufferStats(); - transactionInBufferStats.aborted = isTxnAborted(txnID); + transactionInBufferStats.aborted = isTxnAborted(txnID, null); if (ongoingTxns.containsKey(txnID)) { transactionInBufferStats.startPosition = ongoingTxns.get(txnID).toString(); } @@ -585,7 +507,7 @@ public TransactionInBufferStats getTransactionInBufferStats(TxnID txnID) { @Override public TransactionBufferStats getStats(boolean lowWaterMarks) { TransactionBufferStats transactionBufferStats = new TransactionBufferStats(); - transactionBufferStats.lastSnapshotTimestamps = this.lastSnapshotTimestamps; + transactionBufferStats.lastSnapshotTimestamps = this.snapshotAbortedTxnProcessor.getLastSnapshotTimestamps(); transactionBufferStats.state = this.getState().name(); transactionBufferStats.maxReadPosition = this.maxReadPosition.toString(); if (lowWaterMarks) { @@ -601,7 +523,9 @@ public TransactionBufferStats getStats(boolean lowWaterMarks) { @Override public void run(Timeout timeout) { if (checkIfReady()) { - takeSnapshotByTimeout(); + synchronized (TopicTransactionBuffer.this) { + takeSnapshotByTimeout(); + } } } @@ -624,107 +548,76 @@ public static class TopicTransactionBufferRecover implements Runnable { private final TopicTransactionBuffer topicTransactionBuffer; - private final CompletableFuture> takeSnapshotWriter; + private final AbortedTxnProcessor abortedTxnProcessor; private TopicTransactionBufferRecover(TopicTransactionBufferRecoverCallBack callBack, PersistentTopic topic, - TopicTransactionBuffer transactionBuffer, CompletableFuture< - SystemTopicClient.Writer> takeSnapshotWriter) { + TopicTransactionBuffer transactionBuffer, + AbortedTxnProcessor abortedTxnProcessor) { this.topic = topic; this.callBack = callBack; this.entryQueue = new SpscArrayQueue<>(2000); this.topicTransactionBuffer = transactionBuffer; - this.takeSnapshotWriter = takeSnapshotWriter; + this.abortedTxnProcessor = abortedTxnProcessor; } @SneakyThrows @Override public void run() { - this.takeSnapshotWriter.thenRunAsync(() -> { - if (!this.topicTransactionBuffer.changeToInitializingState()) { - log.warn("TransactionBuffer {} of topic {} can not change state to Initializing", - this, topic.getName()); + if (!this.topicTransactionBuffer.changeToInitializingState()) { + log.warn("TransactionBuffer {} of topic {} can not change state to Initializing", + this, topic.getName()); + return; + } + abortedTxnProcessor.recoverFromSnapshot().thenAcceptAsync(startReadCursorPosition -> { + //Transaction is not use for this topic, so just make maxReadPosition as LAC. + if (startReadCursorPosition == null) { + callBack.noNeedToRecover(); + return; + } else { + this.startReadCursorPosition = startReadCursorPosition; + } + ManagedCursor managedCursor; + try { + managedCursor = topic.getManagedLedger() + .newNonDurableCursor(this.startReadCursorPosition, SUBSCRIPTION_NAME); + } catch (ManagedLedgerException e) { + callBack.recoverExceptionally(e); + log.error("[{}]Transaction buffer recover fail when open cursor!", topic.getName(), e); return; } - topic.getBrokerService().getPulsar().getTransactionBufferSnapshotService() - .createReader(TopicName.get(topic.getName())).thenAcceptAsync(reader -> { + PositionImpl lastConfirmedEntry = + (PositionImpl) topic.getManagedLedger().getLastConfirmedEntry(); + PositionImpl currentLoadPosition = (PositionImpl) this.startReadCursorPosition; + FillEntryQueueCallback fillEntryQueueCallback = new FillEntryQueueCallback(entryQueue, + managedCursor, TopicTransactionBufferRecover.this); + if (lastConfirmedEntry.getEntryId() != -1) { + while (lastConfirmedEntry.compareTo(currentLoadPosition) > 0 + && fillEntryQueueCallback.fillQueue()) { + Entry entry = entryQueue.poll(); + if (entry != null) { try { - boolean hasSnapshot = false; - while (reader.hasMoreEvents()) { - Message message = reader.readNext(); - if (topic.getName().equals(message.getKey())) { - TransactionBufferSnapshot transactionBufferSnapshot = message.getValue(); - if (transactionBufferSnapshot != null) { - hasSnapshot = true; - callBack.handleSnapshot(transactionBufferSnapshot); - this.startReadCursorPosition = PositionImpl.get( - transactionBufferSnapshot.getMaxReadPositionLedgerId(), - transactionBufferSnapshot.getMaxReadPositionEntryId()); - } - } - } - if (!hasSnapshot) { - closeReader(reader); - callBack.noNeedToRecover(); - return; - } - } catch (Exception ex) { - log.error("[{}] Transaction buffer recover fail when read " - + "transactionBufferSnapshot!", topic.getName(), ex); - callBack.recoverExceptionally(ex); - closeReader(reader); - return; + currentLoadPosition = PositionImpl.get(entry.getLedgerId(), + entry.getEntryId()); + callBack.handleTxnEntry(entry); + } finally { + entry.release(); } - closeReader(reader); - - ManagedCursor managedCursor; + } else { try { - managedCursor = topic.getManagedLedger() - .newNonDurableCursor(this.startReadCursorPosition, SUBSCRIPTION_NAME); - } catch (ManagedLedgerException e) { - callBack.recoverExceptionally(e); - log.error("[{}]Transaction buffer recover fail when open cursor!", topic.getName(), e); - return; - } - PositionImpl lastConfirmedEntry = - (PositionImpl) topic.getManagedLedger().getLastConfirmedEntry(); - PositionImpl currentLoadPosition = (PositionImpl) this.startReadCursorPosition; - FillEntryQueueCallback fillEntryQueueCallback = new FillEntryQueueCallback(entryQueue, - managedCursor, TopicTransactionBufferRecover.this); - if (lastConfirmedEntry.getEntryId() != -1) { - while (lastConfirmedEntry.compareTo(currentLoadPosition) > 0 - && fillEntryQueueCallback.fillQueue()) { - Entry entry = entryQueue.poll(); - if (entry != null) { - try { - currentLoadPosition = PositionImpl.get(entry.getLedgerId(), - entry.getEntryId()); - callBack.handleTxnEntry(entry); - } finally { - entry.release(); - } - } else { - try { - Thread.sleep(1); - } catch (InterruptedException e) { - //no-op - } - } - } + Thread.sleep(1); + } catch (InterruptedException e) { + //no-op } + } + } + } - closeCursor(SUBSCRIPTION_NAME); - callBack.recoverComplete(); - }, topic.getBrokerService().getPulsar().getTransactionExecutorProvider() - .getExecutor(this)).exceptionally(e -> { - callBack.recoverExceptionally(e.getCause()); - log.error("[{}]Transaction buffer new snapshot reader fail!", topic.getName(), e); - return null; - }); + closeCursor(SUBSCRIPTION_NAME); + callBack.recoverComplete(); }, topic.getBrokerService().getPulsar().getTransactionExecutorProvider() .getExecutor(this)).exceptionally(e -> { callBack.recoverExceptionally(e.getCause()); - log.error("[{}]Transaction buffer create snapshot writer fail!", - topic.getName(), e); + log.error("[{}]Transaction buffer failed to recover snapshot!", topic.getName(), e); return null; }); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferProvider.java index e5737f4704449..d32e701bbca36 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferRecoverCallBack.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferRecoverCallBack.java index 87b8e930a2792..7dedb2cb6b7be 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferRecoverCallBack.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferRecoverCallBack.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,6 @@ package org.apache.pulsar.broker.transaction.buffer.impl; import org.apache.bookkeeper.mledger.Entry; -import org.apache.pulsar.broker.transaction.buffer.matadata.TransactionBufferSnapshot; public interface TopicTransactionBufferRecoverCallBack { @@ -34,13 +33,6 @@ public interface TopicTransactionBufferRecoverCallBack { */ void noNeedToRecover(); - /** - * Handle transactionBufferSnapshot. - * - * @param snapshot the transaction buffer snapshot - */ - void handleSnapshot(TransactionBufferSnapshot snapshot); - /** * Handle transaction entry beyond the snapshot. * diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferState.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferState.java index f8f7705229871..92ab1d07b690d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferState.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBufferState.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientImpl.java index bc7c1db2e041f..382d640ca8658 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientStatsImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientStatsImpl.java index 73c2078e186b1..a447f70789311 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientStatsImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferClientStatsImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferDisable.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferDisable.java index d700195416c1f..22ba8e2d2e8ef 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferDisable.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferDisable.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -79,7 +79,7 @@ public CompletableFuture closeAsync() { } @Override - public boolean isTxnAborted(TxnID txnID) { + public boolean isTxnAborted(TxnID txnID, PositionImpl readPosition) { return false; } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java index 3f9a083787bb5..48dcf259edb1b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionEntryImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionEntryImpl.java index 40de24a4c4023..ab18373d859d8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionEntryImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionEntryImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/package-info.java index e707675f38ed2..790c51ae65450 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/AbortTxnMetadata.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/AbortTxnMetadata.java similarity index 94% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/AbortTxnMetadata.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/AbortTxnMetadata.java index 5e532d6bff76f..2afcd685ffb04 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/AbortTxnMetadata.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/AbortTxnMetadata.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.transaction.buffer.matadata; +package org.apache.pulsar.broker.transaction.buffer.metadata; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/TransactionBufferSnapshot.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/TransactionBufferSnapshot.java similarity index 94% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/TransactionBufferSnapshot.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/TransactionBufferSnapshot.java index 59b851e73970e..f3bd25d16e7d8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/TransactionBufferSnapshot.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/TransactionBufferSnapshot.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.transaction.buffer.matadata; +package org.apache.pulsar.broker.transaction.buffer.metadata; import java.util.List; import lombok.AllArgsConstructor; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/package-info.java similarity index 92% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/package-info.java index f32853a7d86a7..4cf5549ffd52c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/matadata/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,4 +19,4 @@ /** * The transaction buffer snapshot metadata. */ -package org.apache.pulsar.broker.transaction.buffer.matadata; +package org.apache.pulsar.broker.transaction.buffer.metadata; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndex.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndex.java new file mode 100644 index 0000000000000..118472397adda --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndex.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.metadata.v2; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransactionBufferSnapshotIndex { + public long sequenceID; + public long maxReadPositionLedgerID; + public long maxReadPositionEntryID; + public long persistentPositionLedgerID; + public long persistentPositionEntryID; +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndexes.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndexes.java new file mode 100644 index 0000000000000..d548835ed8f9c --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndexes.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.metadata.v2; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@AllArgsConstructor +@NoArgsConstructor +@Getter +@Setter +@Builder +public class TransactionBufferSnapshotIndexes { + private String topicName; + + private List indexList; + + private TransactionBufferSnapshotIndexesMetadata snapshot; + +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndexesMetadata.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndexesMetadata.java new file mode 100644 index 0000000000000..9a468d250bbbf --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotIndexesMetadata.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.metadata.v2; + +import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransactionBufferSnapshotIndexesMetadata { + private long maxReadPositionLedgerId; + private long maxReadPositionEntryId; + private Set aborts; +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotSegment.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotSegment.java new file mode 100644 index 0000000000000..77bb546880dbe --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TransactionBufferSnapshotSegment.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.metadata.v2; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TransactionBufferSnapshotSegment { + private String topicName; + private long sequenceId; + private long maxReadPositionLedgerId; + private long maxReadPositionEntryId; + private List aborts; +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TxnIDData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TxnIDData.java new file mode 100644 index 0000000000000..a3bff6dffd322 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/TxnIDData.java @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.metadata.v2; + +import java.util.Objects; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TxnIDData { + /* + * The most significant 64 bits of this TxnID. + * + * @serial + */ + private long mostSigBits; + + /* + * The least significant 64 bits of this TxnID. + * + * @serial + */ + private long leastSigBits; + + @Override + public String toString() { + return "(" + mostSigBits + "," + leastSigBits + ")"; + } + + @Override + public int hashCode() { + return Objects.hash(mostSigBits, leastSigBits); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof TxnIDData other) { + return mostSigBits == other.mostSigBits + && leastSigBits == other.leastSigBits; + } + + return false; + } +} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/package-info.java new file mode 100644 index 0000000000000..87b9a921cf608 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/metadata/v2/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.transaction.buffer.metadata.v2; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/package-info.java index acde304e2c181..c588a1319f03c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/TransactionException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/TransactionException.java index f81fc8a724d5a..28cc5e5306407 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/TransactionException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/TransactionException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/TransactionBufferException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/TransactionBufferException.java index ab301c9017dda..b1c4fdd1dbc25 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/TransactionBufferException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/TransactionBufferException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/package-info.java index 60bb5ee2a0245..2264a08ab08d1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/buffer/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/TransactionCoordinatorException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/TransactionCoordinatorException.java index 8da04ac174eb2..cc2ae11b68c3f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/TransactionCoordinatorException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/TransactionCoordinatorException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/package-info.java index ceaff6ac80311..54fee91d16e1f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/coordinator/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/package-info.java index 222d871178629..3c329cf0ed55e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/TransactionPendingAckException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/TransactionPendingAckException.java index 74999bf1cb7ab..e79dc8ad38798 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/TransactionPendingAckException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/TransactionPendingAckException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/package-info.java index 0d0df63bd7673..37b05827db204 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/exception/pendingack/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandle.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandle.java index d8e16dd40156c..29bd7e79e3b19 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandle.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandle.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandleStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandleStats.java index 94102f365904b..7f01b9b69f95f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandleStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckHandleStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckReplyCallBack.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckReplyCallBack.java index fed9add15657a..ec7e731ac8bdd 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckReplyCallBack.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckReplyCallBack.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckStore.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckStore.java index 2f85d2430dbbd..dba8d207704bd 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckStore.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckStore.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/TransactionPendingAckStoreProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/TransactionPendingAckStoreProvider.java index fae38ee6a8e89..043fd85f2edae 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/TransactionPendingAckStoreProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/TransactionPendingAckStoreProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/exceptions/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/exceptions/package-info.java index 314cceec797fd..0a970f2a96228 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/exceptions/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/exceptions/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /** * The implementation for pending ack exceptions. */ diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStore.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStore.java index 44c9fbe039b0b..0840e2c2f45dd 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStore.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStore.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStoreProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStoreProvider.java index bd7e31f80316d..66e5ef56bbd03 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStoreProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/InMemoryPendingAckStoreProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckReplyCallBack.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckReplyCallBack.java index 53de549f69fcd..9900d29725f21 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckReplyCallBack.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckReplyCallBack.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStore.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStore.java index 8b1e0a4e94123..4dce8b9a0fcf4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStore.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStore.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreProvider.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreProvider.java index 130b485694f67..ed3d79a92d0a4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreProvider.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleDisabled.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleDisabled.java index e34628da887e9..70fb6972cd92d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleDisabled.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleDisabled.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleImpl.java index a565a20b6649d..07a0c0c8b57fc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleState.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleState.java index 278f9ff106420..96653244b7642 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleState.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleState.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleStatsImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleStatsImpl.java index f882cef956ab6..f30c233af5993 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleStatsImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/PendingAckHandleStatsImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/package-info.java index c61e5f3a84163..4315a5d0a01c7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/impl/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /** * The implementation for processing pending acks in transactions. */ diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/package-info.java index 7c00cea5d5dab..95520028df4a9 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/pendingack/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /** * Component for processing pending acks for transactions. */ diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerImpl.java index 05b61fd637019..409c6b314c7e3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/package-info.java index 9b99bb6f94876..bb07ed283ec94 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/recover/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerFactoryImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerFactoryImpl.java index 8158c3c723a54..b55e4fea2a76a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerFactoryImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerFactoryImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java index 4256b77be7057..7b3bf744a82ed 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/package-info.java index 0d164228f0e19..7949c4359e92c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/LogIndexLagBackoff.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/LogIndexLagBackoff.java index 145381814ba61..0773a48fb232d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/LogIndexLagBackoff.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/LogIndexLagBackoff.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/package-info.java index 58cb1c24b19e6..004767e258c2e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/util/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/TransactionBatchedWriteValidator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/TransactionBatchedWriteValidator.java index 4ce8d0ea4529d..a93dd3c69acc1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/TransactionBatchedWriteValidator.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/TransactionBatchedWriteValidator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/package-info.java index 334589b62d38b..da3ddb183b7e3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/validator/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ExceptionHandler.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ExceptionHandler.java index 8b200a8b9f6e7..16eda7fc58c22 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ExceptionHandler.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ExceptionHandler.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java index 9b35a63a79f94..29411b7d273c3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/NoSwaggerDocumentation.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/NoSwaggerDocumentation.java index d4a175153946f..0f5e8d832a2b4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/NoSwaggerDocumentation.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/NoSwaggerDocumentation.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PreInterceptFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PreInterceptFilter.java index e4e7bbc67ca69..e760c64d986f8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PreInterceptFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PreInterceptFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java index 5e1b33ecc0cb9..c7ceeae019173 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java index 93182d58fbc0c..58b9436e6bf5c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -822,8 +822,9 @@ protected void validateGlobalNamespaceOwnership(NamespaceName namespace) { } catch (WebApplicationException e) { throw e; } catch (Exception e) { - if (e.getCause() instanceof WebApplicationException) { - throw (WebApplicationException) e.getCause(); + Throwable throwable = FutureUtil.unwrapCompletionException(e); + if (throwable instanceof WebApplicationException webApplicationException) { + throw webApplicationException; } throw new RestException(Status.SERVICE_UNAVAILABLE, String.format( "Failed to validate global cluster configuration : ns=%s emsg=%s", namespace, e.getMessage())); @@ -875,7 +876,7 @@ public static CompletableFuture checkLocalOrGetPeerReplicationC if (!allowDeletedNamespace && policies.deleted) { String msg = String.format("Namespace %s is deleted", namespace.toString()); log.warn(msg); - validationFuture.completeExceptionally(new RestException(Status.PRECONDITION_FAILED, + validationFuture.completeExceptionally(new RestException(Status.NOT_FOUND, "Namespace is deleted")); } else if (policies.replication_clusters.isEmpty()) { String msg = String.format( diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RequestWrapper.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RequestWrapper.java index 8c3147645e23a..16d87baedbe3c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RequestWrapper.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RequestWrapper.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java index 4c5f3e2eab4fb..9cc3bf109bfb3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java index dcdd69f90c2d1..b18aa1c787a7f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebExecutorStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebExecutorStats.java index 1c89318305b35..585df813027d7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebExecutorStats.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebExecutorStats.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java index 95fed118b0634..1bbcf0db78f69 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/package-info.java index 8dc7b10616f41..b1bef1fcdf108 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarService.java index 23037ddf31093..3e0dc4420b55b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarService.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java index 7da276a0e6a35..a18427a4fa6db 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawMessage.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawMessage.java index 4a3f1962369cd..2aecda2b7758d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawMessage.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawMessage.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java index fe068f2f9435f..92a2c89f9bc9c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/package-info.java index ea2f9949fb293..7e806deb43f54 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawBatchConverter.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawBatchConverter.java index 2521bc9e754ac..4d718f71a2e23 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawBatchConverter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawBatchConverter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawMessageImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawMessageImpl.java index 8923f1a008b17..fa8b5f80c14ce 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawMessageImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawMessageImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java index 331a353b9bd1f..255df22580be3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/package-info.java index 6c9e1b7c98529..8f9eee901fb13 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/BundleSplitOption.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/BundleSplitOption.java index 8246f0ee5940d..59795a1db3dd3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/BundleSplitOption.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/BundleSplitOption.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithm.java index 010d725c5ea68..56b988f08cd2b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithm.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithm.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitOption.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitOption.java index eba043ef290a3..f11c15ae0fd14 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitOption.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitOption.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java index 750f7625db9ab..0b7e09fee2cec 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java index 97de409ffcdda..f0f7deb940da1 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java index 6c54483244ce7..01a61d8166563 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java index 79bc88028eab9..cb7e135662c01 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/PartitionedManagedLedgerInfo.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/PartitionedManagedLedgerInfo.java index 56c6e90270b1a..42334d992ca58 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/PartitionedManagedLedgerInfo.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/PartitionedManagedLedgerInfo.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java index e4b3bcf142c18..5611dbf98b263 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithm.java index 7f75ef0df2da3..6c341f185ca60 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithm.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithm.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java index 2be8392a0afa3..0f4baf0793eb2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/package-info.java index 0648f368b3bfb..59cadb23c4da7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopic.java index 9e50fc07152f8..e1a10b3bbb212 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopic.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicContext.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicContext.java index 76b0642dcb3dd..30aaedcd3c0de 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicContext.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.compaction; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java index 113c5ec6ca327..c8114f9adb652 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionRecord.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionRecord.java index b6ae55b00b84b..09f9f9b00abab 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionRecord.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionRecord.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/Compactor.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/Compactor.java index cb631e29f6343..522618f9d6a39 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/Compactor.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/Compactor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBean.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBean.java index 7786e1939369d..94c42efd17f4a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBean.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBean.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBeanImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBeanImpl.java index 7b63127133e91..64b91d17d2508 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBeanImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorMXBeanImpl.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorTool.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorTool.java index 91c079b27becc..b2bb22a9b4bbc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorTool.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactorTool.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java index 650739cf15658..84107190fd305 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/package-info.java index c891067af8631..425945cdff3e0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/package-info.java index c3c204d01c4f9..06ab1683a422d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java b/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java index b298db12087ee..ebf58562e57c3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.stats; import lombok.experimental.UtilityClass; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java index 1173684225d27..a7fd90a63ade2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdGenerateDocumentation.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdGenerateDocumentation.java index c784ff84408d1..4a8639c060603 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdGenerateDocumentation.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdGenerateDocumentation.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdUtility.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdUtility.java index df34ffdb0d1ff..f0f88562953e5 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdUtility.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/CmdUtility.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSet.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSet.java index c9f1c65daca37..e42cae2580b78 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSet.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSet.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -22,7 +22,6 @@ import java.util.Map; import java.util.NavigableMap; import java.util.NavigableSet; -import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.locks.ReadWriteLock; @@ -95,7 +94,8 @@ public void removeUpTo(long item1, long item2) { } - public Set items(int numberOfItems, LongPairSet.LongPairFunction longPairConverter) { + public > NavigableSet items(int numberOfItems, + LongPairSet.LongPairFunction longPairConverter) { NavigableSet items = new TreeSet<>(); lock.readLock().lock(); try { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/PulsarKeyException.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/PulsarKeyException.java index 5bffddd99ab60..651ed6de78201 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/PulsarKeyException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/PulsarKeyException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/StatsOutputStream.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/StatsOutputStream.java index 134e049588a6d..1cd4afa650ec2 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/StatsOutputStream.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/StatsOutputStream.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java index 750a806fcc9a4..2477e1ad2bb1b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/package-info.java index c25950152efa5..70acc5f5e7085 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/package-info.java index 16a7b2873aff7..f7a6ff7dc123f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java index d9ca282e782f3..d73d1d7ed6bed 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - /* * This file is derived from LocalBookkeeperEnsemble from Apache BookKeeper * http://bookkeeper.apache.org diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java index 61f96f65b6ea0..91ff2e8f098c7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/main/proto/DelayedMessageIndexBucketSnapshotFormat.proto b/pulsar-broker/src/main/proto/DelayedMessageIndexBucketSnapshotFormat.proto index eda9a8f92e670..8414a583fe5b0 100644 --- a/pulsar-broker/src/main/proto/DelayedMessageIndexBucketSnapshotFormat.proto +++ b/pulsar-broker/src/main/proto/DelayedMessageIndexBucketSnapshotFormat.proto @@ -24,8 +24,8 @@ option optimize_for = SPEED; message DelayedIndex { required uint64 timestamp = 1; - required int64 ledger_id = 2; - required int64 entry_id = 3; + required uint64 ledger_id = 2; + required uint64 entry_id = 3; } message SnapshotSegmentMetadata { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java index 4765496cb3974..c6945169512b5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataSetupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataSetupTest.java index 4fde86fab40bc..6196f66698869 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataSetupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataSetupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataTeardownTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataTeardownTest.java index 8d6536591f537..f6a388dac76e3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataTeardownTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarClusterMetadataTeardownTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarInitialNamespaceSetupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarInitialNamespaceSetupTest.java index e5e5783bd3748..c1ad8c621c46d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarInitialNamespaceSetupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarInitialNamespaceSetupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java index 7061cb28b0f6d..357a8e1bd4b0f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,6 +18,7 @@ */ package org.apache.pulsar; +import static org.apache.commons.io.FileUtils.cleanDirectory; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.eq; @@ -26,6 +27,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.io.File; +import java.util.List; +import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.util.IOUtils; import org.apache.pulsar.client.admin.Namespaces; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.common.naming.NamespaceName; @@ -35,6 +40,7 @@ import org.apache.pulsar.broker.resources.NamespaceResources; import org.apache.pulsar.broker.resources.PulsarResources; import org.apache.pulsar.broker.resources.TenantResources; +import org.testng.Assert; import org.testng.annotations.Test; @Test(groups = "broker") @@ -91,4 +97,34 @@ public void testCreateNameSpace() throws Exception { verify(admin.namespaces(), times(1)).createNamespace(eq(ns.toString())); } + @Test(groups = "broker") + public void testStandaloneWithRocksDB() throws Exception { + String[] args = new String[]{"--config", + "./src/test/resources/configurations/pulsar_broker_test_standalone_with_rocksdb.conf"}; + final int bookieNum = 3; + final File tempDir = IOUtils.createTempDir("standalone", "test"); + + PulsarStandaloneStarter standalone = new PulsarStandaloneStarter(args); + standalone.setBkDir(tempDir.getAbsolutePath()); + standalone.setNumOfBk(bookieNum); + + standalone.startBookieWithMetadataStore(); + List firstBsConfs = standalone.bkCluster.getBsConfs(); + Assert.assertEquals(firstBsConfs.size(), bookieNum); + standalone.close(); + + // start twice, read cookie from local folder + standalone.startBookieWithMetadataStore(); + List secondBsConfs = standalone.bkCluster.getBsConfs(); + Assert.assertEquals(secondBsConfs.size(), bookieNum); + + for (int i = 0; i < bookieNum; i++) { + ServerConfiguration conf1 = firstBsConfs.get(i); + ServerConfiguration conf2 = secondBsConfs.get(i); + Assert.assertEquals(conf1.getBookiePort(), conf2.getBookiePort()); + } + standalone.close(); + cleanDirectory(tempDir); + } + } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetupTest.java index b55b8236a84dd..70c7c7bd62ee9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarTransactionCoordinatorMetadataSetupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarVersionStarterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarVersionStarterTest.java index f352dd2414d32..219e3b80cd308 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarVersionStarterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarVersionStarterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java index b9c32e91e4c18..14b81979652af 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerAdditionalServletTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerAdditionalServletTest.java index 4b4c8dbb98300..5952d7b4b2f36 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerAdditionalServletTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerAdditionalServletTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerMessageDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerMessageDeduplicationTest.java index f2d7a21a40f0b..50f8ac9594433 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerMessageDeduplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerMessageDeduplicationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerTestUtil.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerTestUtil.java index 7d7a3ebd2621d..bfb172d0711d4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerTestUtil.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BrokerTestUtil.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/ConfigHelper.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/ConfigHelper.java index 4ff6f02a3526d..3999ba3f173ea 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/ConfigHelper.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/ConfigHelper.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java index 4577ee74ae3f0..1bb985e20b921 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/EmbeddedPulsarCluster.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/EndToEndMetadataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/EndToEndMetadataTest.java index 0090ea08b1e3b..f472f8ff29864 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/EndToEndMetadataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/EndToEndMetadataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MockedBookKeeperClientFactory.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MockedBookKeeperClientFactory.java index 0ff0a03119d4d..6d65687a501df 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MockedBookKeeperClientFactory.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MockedBookKeeperClientFactory.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerBaseTest.java index 5b78a32dc37e5..b28e5995773f5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerBaseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerBaseTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java index e6cf86c05b5eb..7c4ab9cc73f00 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceCloseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceCloseTest.java index 1fbb40a6a5614..7683d79a2b0dd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceCloseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceCloseTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceMockSupport.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceMockSupport.java index e871919d88231..9aa53164ee708 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceMockSupport.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceMockSupport.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java index c207a6fcfe92f..1469500c87214 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -28,6 +28,7 @@ import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; +import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.functions.worker.WorkerConfig; import org.apache.pulsar.functions.worker.WorkerService; import org.testng.annotations.AfterMethod; @@ -84,22 +85,70 @@ public void testGetWorkerService() throws Exception { */ @Test public void testGetWorkerServiceException() throws Exception { + init(); ServiceConfiguration configuration = new ServiceConfiguration(); configuration.setMetadataStoreUrl("zk:localhost"); configuration.setClusterName("clusterName"); configuration.setFunctionsWorkerEnabled(false); configuration.setBrokerShutdownTimeoutMs(0L); configuration.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d)); - @Cleanup - PulsarService pulsarService = new PulsarService(configuration, new WorkerConfig(), - Optional.empty(), (exitCode) -> {}); + configuration.setBrokerServicePort(Optional.of(0)); + configuration.setBrokerServicePortTls(Optional.of(0)); + configuration.setWebServicePort(Optional.of(0)); + configuration.setWebServicePortTls(Optional.of(0)); + startBroker(configuration); String errorMessage = "Pulsar Function Worker is not enabled, probably functionsWorkerEnabled is set to false"; + + int thrownCnt = 0; try { - pulsarService.getWorkerService(); + pulsar.getWorkerService(); } catch (UnsupportedOperationException e) { + thrownCnt++; + assertEquals(e.getMessage(), errorMessage); + } + + try { + admin.sources().listSources("my", "test"); + } catch (PulsarAdminException e) { + thrownCnt++; + assertEquals(e.getStatusCode(), 409); assertEquals(e.getMessage(), errorMessage); } + + try { + admin.sinks().getSinkStatus("my", "test", "test"); + } catch (PulsarAdminException e) { + thrownCnt++; + assertEquals(e.getStatusCode(), 409); + assertEquals(e.getMessage(), errorMessage); + } + + try { + admin.functions().getFunction("my", "test", "test"); + } catch (PulsarAdminException e) { + thrownCnt++; + assertEquals(e.getStatusCode(), 409); + assertEquals(e.getMessage(), errorMessage); + } + + try { + admin.worker().getClusterLeader(); + } catch (PulsarAdminException e) { + thrownCnt++; + assertEquals(e.getStatusCode(), 409); + assertEquals(e.getMessage(), errorMessage); + } + + try { + admin.worker().getFunctionsStats(); + } catch (PulsarAdminException e) { + thrownCnt++; + assertEquals(e.getStatusCode(), 409); + assertEquals(e.getMessage(), errorMessage); + } + + assertEquals(thrownCnt, 6); } @Test diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java index 749eeb7da3c46..47949d7312b88 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/TimeAverageBrokerDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/TimeAverageBrokerDataTest.java index 1993c718aa542..30d7fd48ae558 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/TimeAverageBrokerDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/TimeAverageBrokerDataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java index 357b801d265dc..7bb35cc4d63a8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -164,7 +164,7 @@ public void resetClusters() throws Exception { pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); for (String tenant : admin.tenants().getTenants()) { for (String namespace : admin.namespaces().getNamespaces(tenant)) { - deleteNamespaceGraceFullyByMultiPulsars(namespace, true, admin, pulsar, + deleteNamespaceWithRetry(namespace, true, admin, pulsar, mockPulsarSetup.getPulsar()); } admin.tenants().deleteTenant(tenant, true); @@ -1515,7 +1515,7 @@ public void testDeleteTenant() throws Exception { assertFalse(admin.topics().getList(namespace).isEmpty()); try { - deleteNamespaceGraceFully(namespace, false); + admin.namespaces().deleteNamespace(namespace, false); fail("should have failed due to namespace not empty"); } catch (PulsarAdminException e) { // Expected: cannot delete non-empty tenant @@ -1526,7 +1526,7 @@ public void testDeleteTenant() throws Exception { assertTrue(admin.topics().getList(namespace).isEmpty()); // delete namespace - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); assertFalse(admin.namespaces().getNamespaces(tenant).contains(namespace)); assertTrue(admin.namespaces().getNamespaces(tenant).isEmpty()); @@ -1607,7 +1607,7 @@ public void testDeleteNamespace(NamespaceAttr namespaceAttr) throws Exception { assertFalse(admin.topics().getList(namespace).isEmpty()); try { - deleteNamespaceGraceFully(namespace, false); + admin.namespaces().deleteNamespace(namespace, false); fail("should have failed due to namespace not empty"); } catch (PulsarAdminException e) { // Expected: cannot delete non-empty tenant @@ -1618,7 +1618,7 @@ public void testDeleteNamespace(NamespaceAttr namespaceAttr) throws Exception { assertTrue(admin.topics().getList(namespace).isEmpty()); // delete namespace - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); assertFalse(admin.namespaces().getNamespaces(tenant).contains(namespace)); assertTrue(admin.namespaces().getNamespaces(tenant).isEmpty()); @@ -1667,7 +1667,7 @@ public void testDeleteNamespaceWithTopicPolicies() throws Exception { }); producer.close(); admin.topics().delete(topic); - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); Awaitility.await().untilAsserted(() -> { assertTrue(admin.namespaces().getNamespaces(tenant).isEmpty()); }); @@ -1880,7 +1880,7 @@ public void testForceDeleteNamespace() throws Exception { final String topic = "persistent://" + namespaceName + "/test" + UUID.randomUUID(); pulsarClient.newProducer(Schema.DOUBLE).topic(topic).create().close(); Awaitility.await().untilAsserted(() -> assertNotNull(admin.schemas().getSchemaInfo(topic))); - deleteNamespaceGraceFully(namespaceName, true); + deleteNamespaceWithRetry(namespaceName, true); try { admin.schemas().getSchemaInfo(topic); Assert.fail("fail"); @@ -2661,6 +2661,7 @@ public void testFailedUpdatePartitionedTopic() throws Exception { URL pulsarUrl = new URL(pulsar.getWebServiceAddress()); admin.topics().createPartitionedTopic(partitionedTopicName, startPartitions); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(pulsarUrl.toString()).build(); Consumer consumer1 = client.newConsumer().topic(partitionedTopicName).subscriptionName(subName1) .subscriptionType(SubscriptionType.Shared).subscribe(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java index 87521d617a5f5..13291eb962856 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDeliveryTest.java index 9f774895615a8..90af0e963fe8b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDeliveryTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDeliveryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDynamicConfigurationsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDynamicConfigurationsTest.java index 8f263091299c6..c9a07dc966de6 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDynamicConfigurationsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDynamicConfigurationsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java index d919958618185..3d2a6b934f847 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiGetLastMessageIdTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java index 1a2e2fd7f404a..a780f889de85f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessagesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessagesTest.java index a1a6421a0e674..4fb268fc9713f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessagesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessagesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java index 2cbff955ecff1..13cac6b5905e0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMultiBrokersTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,6 +18,7 @@ */ package org.apache.pulsar.broker.admin; +import static org.junit.Assert.assertFalse; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; @@ -26,6 +27,8 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; import org.apache.pulsar.broker.MultiBrokerBaseTest; @@ -33,9 +36,16 @@ import org.apache.pulsar.broker.loadbalance.LeaderBroker; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; +import org.apache.pulsar.client.admin.internal.TopicsImpl; +import org.apache.pulsar.client.api.Consumer; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.common.naming.TopicDomain; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride; +import org.apache.pulsar.common.policies.data.RetentionPolicies; +import org.apache.pulsar.common.policies.data.TenantInfoImpl; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -54,6 +64,7 @@ protected int numberOfAdditionalBrokers() { @Override protected void doInitConf() throws Exception { super.doInitConf(); + this.conf.setManagedLedgerMaxEntriesPerLedger(10); } @Override @@ -122,4 +133,80 @@ public void testTopicLookup(TopicDomain topicDomain, boolean isPartition) throws Assert.assertEquals(lookupResultSet.size(), 1); } + @Test + public void testForceDeletePartitionedTopicWithSub() throws Exception { + final int numPartitions = 10; + TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1", "role2"), Set.of("test")); + admin.tenants().createTenant("tenant-xyz", tenantInfo); + admin.namespaces().createNamespace("tenant-xyz/ns-abc", Set.of("test")); + + admin.namespaces().setAutoTopicCreation("tenant-xyz/ns-abc", + AutoTopicCreationOverride.builder() + .allowAutoTopicCreation(true) + .topicType("partitioned") + .defaultNumPartitions(5) + .build()); + + RetentionPolicies retention = new RetentionPolicies(10, 10); + admin.namespaces().setRetention("tenant-xyz/ns-abc", retention); + final String topic = "persistent://tenant-xyz/ns-abc/topic-" + + RandomStringUtils.randomAlphabetic(5) + + "-testDeletePartitionedTopicWithSub"; + final String subscriptionName = "sub"; + ((TopicsImpl) admin.topics()).createPartitionedTopicAsync(topic, numPartitions, true, null).get(); + + log.info("Creating producer and consumer"); + Consumer consumer = pulsarClient.newConsumer() + .topic(topic) + .subscriptionName(subscriptionName) + .subscribe(); + + Producer producer = pulsarClient.newProducer(Schema.STRING).enableBatching(false).topic(topic).create(); + + log.info("producing messages"); + for (int i = 0; i < numPartitions * 100; ++i) { + producer.newMessage() + .key("" + i) + .value("value-" + i) + .send(); + } + producer.flush(); + + log.info("consuming some messages"); + for (int i = 0; i < numPartitions * 5; i++) { + Message m = consumer.receive(1, TimeUnit.MINUTES); + } + + log.info("trying to delete the topic {}", topic); + admin.topics().deletePartitionedTopic(topic, true); + + log.info("closing producer and consumer"); + producer.close(); + consumer.close(); + + // topic autocreate might sneak in after the delete / before close + // but the topic metadata should be consistent to go through deletion again + if (admin.topics().getList("tenant-xyz/ns-abc") + .stream().anyMatch(t -> t.contains(topic))) { + try { + admin.topics().deletePartitionedTopic(topic, true); + } catch (PulsarAdminException.NotFoundException nfe) { + // pass + } + + assertEquals(0, admin.topics().getList("tenant-xyz/ns-abc") + .stream().filter(t -> t.contains(topic)).count()); + assertEquals(0, + pulsar.getPulsarResources().getTopicResources() + .getExistingPartitions(TopicName.getPartitionedTopicName(topic)) + .get() + .stream().filter(t -> t.contains(topic)).count()); + assertFalse(admin.topics() + .getPartitionedTopicList("tenant-xyz/ns-abc") + .contains(topic)); + } else { + log.info("trying to create the topic again"); + ((TopicsImpl) admin.topics()).createPartitionedTopicAsync(topic, numPartitions, true, null).get(); + } + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java index 38074112828f3..604bc437f1963 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ /** * Licensed to the Apache Software Foundation (ASF) under one @@ -168,12 +186,13 @@ public void testOffloadPolicies() throws Exception { String bucket = "test-bucket"; String endpoint = "test-endpoint"; long offloadThresholdInBytes = 0; + long offloadThresholdInSeconds = 100; long offloadDeletionLagInMillis = 100L; OffloadedReadPriority priority = OffloadedReadPriority.TIERED_STORAGE_FIRST; OffloadPolicies offload1 = OffloadPoliciesImpl.create( driver, region, bucket, endpoint, null, null, null, null, - 100, 100, offloadThresholdInBytes, offloadDeletionLagInMillis, priority); + 100, 100, offloadThresholdInBytes, offloadThresholdInSeconds, offloadDeletionLagInMillis, priority); admin.namespaces().setOffloadPolicies(namespaceName, offload1); OffloadPolicies offload2 = admin.namespaces().getOffloadPolicies(namespaceName); assertEquals(offload1, offload2); @@ -221,6 +240,7 @@ public void testOffloadPoliciesAppliedApi() throws Exception { OffloadPoliciesImpl namespacePolicies = new OffloadPoliciesImpl(); namespacePolicies.setManagedLedgerOffloadThresholdInBytes(100L); + namespacePolicies.setManagedLedgerOffloadThresholdInSeconds(100L); namespacePolicies.setManagedLedgerOffloadDeletionLagInMillis(200L); namespacePolicies.setManagedLedgerOffloadDriver("s3"); namespacePolicies.setManagedLedgerOffloadBucket("buck"); @@ -232,6 +252,7 @@ public void testOffloadPoliciesAppliedApi() throws Exception { OffloadPoliciesImpl topicPolicies = new OffloadPoliciesImpl(); topicPolicies.setManagedLedgerOffloadThresholdInBytes(200L); + topicPolicies.setManagedLedgerOffloadThresholdInSeconds(200L); topicPolicies.setManagedLedgerOffloadDeletionLagInMillis(400L); topicPolicies.setManagedLedgerOffloadDriver("s3"); topicPolicies.setManagedLedgerOffloadBucket("buck2"); @@ -249,6 +270,78 @@ public void testOffloadPoliciesAppliedApi() throws Exception { -> assertEquals(admin.topics().getOffloadPolicies(topicName, true), brokerPolicies)); } + + @Test + public void testSetNamespaceOffloadPolicies() throws Exception { + conf.setManagedLedgerOffloadThresholdInSeconds(100); + conf.setManagedLedgerOffloadAutoTriggerSizeThresholdBytes(100); + + OffloadPoliciesImpl policies = new OffloadPoliciesImpl(); + policies.setManagedLedgerOffloadThresholdInBytes(200L); + policies.setManagedLedgerOffloadThresholdInSeconds(200L); + policies.setManagedLedgerOffloadDeletionLagInMillis(400L); + policies.setManagedLedgerOffloadDriver("s3"); + policies.setManagedLedgerOffloadBucket("buck2"); + + admin.namespaces().setOffloadThresholdInSeconds(myNamespace, 300); + assertEquals(admin.namespaces().getOffloadThresholdInSeconds(myNamespace), 300); + + admin.namespaces().setOffloadPolicies(myNamespace, policies); + assertEquals(admin.namespaces().getOffloadPolicies(myNamespace), policies); + } + + @Test + public void testSetTopicOffloadPolicies() throws Exception { + conf.setManagedLedgerOffloadThresholdInSeconds(100); + conf.setManagedLedgerOffloadAutoTriggerSizeThresholdBytes(100); + + LedgerOffloader topicOffloader = mock(LedgerOffloader.class); + when(topicOffloader.getOffloadDriverName()).thenReturn("mock"); + doReturn(topicOffloader).when(pulsar).createManagedLedgerOffloader(any()); + + OffloadPoliciesImpl namespacePolicies = new OffloadPoliciesImpl(); + namespacePolicies.setManagedLedgerOffloadThresholdInBytes(200L); + namespacePolicies.setManagedLedgerOffloadThresholdInSeconds(200L); + namespacePolicies.setManagedLedgerOffloadDeletionLagInMillis(400L); + namespacePolicies.setManagedLedgerOffloadDriver("s3"); + namespacePolicies.setManagedLedgerOffloadBucket("buck2"); + + admin.namespaces().setOffloadThresholdInSeconds(myNamespace, 300); + assertEquals(admin.namespaces().getOffloadThresholdInSeconds(myNamespace), 300); + + admin.namespaces().setOffloadPolicies(myNamespace, namespacePolicies); + assertEquals(admin.namespaces().getOffloadPolicies(myNamespace), namespacePolicies); + + OffloadPoliciesImpl topicPolicies = new OffloadPoliciesImpl(); + topicPolicies.setManagedLedgerOffloadThresholdInBytes(500L); + topicPolicies.setManagedLedgerOffloadThresholdInSeconds(500L); + topicPolicies.setManagedLedgerOffloadDeletionLagInMillis(400L); + topicPolicies.setManagedLedgerOffloadDriver("s3"); + topicPolicies.setManagedLedgerOffloadBucket("buck2"); + + String topicName = testTopic + UUID.randomUUID(); + admin.topics().createNonPartitionedTopic(topicName); + admin.topicPolicies().setOffloadPolicies(topicName, topicPolicies); + + // Wait until broker update policies finished. + for (int a = 1; a <= 5; a++) { + try { + OffloadPolicies policies = admin.topicPolicies().getOffloadPolicies(topicName); + + assertEquals(policies.getManagedLedgerOffloadThresholdInSeconds(), + topicPolicies.getManagedLedgerOffloadThresholdInSeconds()); + assertEquals(policies.getManagedLedgerOffloadThresholdInBytes(), + topicPolicies.getManagedLedgerOffloadThresholdInBytes()); + } catch (Exception e) { + if (a == 5) { + throw e; + } else { + Thread.sleep(1000L); + } + } + } + } + @Test public void testTopicLevelOffloadPartitioned() throws Exception { testOffload(true); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java index 854bf83d4cd50..8dd998baadb30 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaAutoUpdateTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java index 3669f712943d4..37795438dbaf3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforcedTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforcedTest.java index 7dd192c070c09..180551d14ce2c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforcedTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaValidationEnforcedTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaWithAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaWithAuthTest.java index 4de4d905e49bb..5159d7b714195 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaWithAuthTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSchemaWithAuthTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSubscriptionTest.java index 411565521d9b8..994e0eb232589 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiSubscriptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java index baaf7d15c0de6..b303386c65ffd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -202,7 +202,7 @@ public void resetClusters() throws Exception { pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); for (String tenant : admin.tenants().getTenants()) { for (String namespace : admin.namespaces().getNamespaces(tenant)) { - deleteNamespaceGraceFully(namespace, true); + deleteNamespaceWithRetry(namespace, true); } admin.tenants().deleteTenant(tenant, true); } @@ -297,7 +297,7 @@ public void clusters() throws Exception { Awaitility.await() .untilAsserted(() -> assertEquals(admin.clusters().getClusters(), List.of("test"))); - deleteNamespaceGraceFully("prop-xyz/ns1", false); + deleteNamespaceWithRetry("prop-xyz/ns1", false); admin.clusters().deleteCluster("test"); assertEquals(admin.clusters().getClusters(), new ArrayList<>()); @@ -526,7 +526,7 @@ public void brokers() throws Exception { String.format("%s:%d", parts[0], pulsar.getListenPortHTTPS().get())); Assert.assertEquals(nsMap2.size(), 2); - deleteNamespaceGraceFully("prop-xyz/ns1", false); + deleteNamespaceWithRetry("prop-xyz/ns1", false); admin.clusters().deleteCluster("test"); assertEquals(admin.clusters().getClusters(), new ArrayList<>()); } @@ -757,7 +757,7 @@ public void properties() throws Exception { assertEquals(e.getStatusCode(), 409); assertEquals(e.getMessage(), "The tenant still has active namespaces"); } - deleteNamespaceGraceFully("prop-xyz/ns1", false); + deleteNamespaceWithRetry("prop-xyz/ns1", false); admin.tenants().deleteTenant("prop-xyz"); assertEquals(admin.tenants().getTenants(), new ArrayList<>()); @@ -786,7 +786,7 @@ public void namespaces() throws Exception { assertEquals(admin.namespaces().getPolicies("prop-xyz/ns3").bundles.getNumBundles(), 4); assertEquals(admin.namespaces().getPolicies("prop-xyz/ns3").bundles.getBoundaries().size(), 5); - deleteNamespaceGraceFully("prop-xyz/ns3", false); + deleteNamespaceWithRetry("prop-xyz/ns3", false); try { admin.namespaces().createNamespace("non-existing/ns1"); @@ -860,7 +860,7 @@ public void namespaces() throws Exception { } assertTrue(i < 10); - deleteNamespaceGraceFully("prop-xyz/ns1", false); + deleteNamespaceWithRetry("prop-xyz/ns1", false); assertEquals(admin.namespaces().getNamespaces("prop-xyz"), List.of("prop-xyz/ns2")); try { @@ -1289,7 +1289,7 @@ public void testGetPartitionedStatsInternal() throws Exception { @Test(dataProvider = "numBundles") public void testDeleteNamespaceBundle(Integer numBundles) throws Exception { - deleteNamespaceGraceFully("prop-xyz/ns1", false); + deleteNamespaceWithRetry("prop-xyz/ns1", false); admin.namespaces().createNamespace("prop-xyz/ns1-bundles", numBundles); admin.namespaces().setNamespaceReplicationClusters("prop-xyz/ns1-bundles", Set.of("test")); @@ -1301,7 +1301,7 @@ public void testDeleteNamespaceBundle(Integer numBundles) throws Exception { assertEquals(admin.namespaces().getTopics("prop-xyz/ns1-bundles"), new ArrayList<>()); - deleteNamespaceGraceFully("prop-xyz/ns1-bundles", false); + deleteNamespaceWithRetry("prop-xyz/ns1-bundles", false); assertEquals(admin.namespaces().getNamespaces("prop-xyz", "test"), new ArrayList<>()); } @@ -1388,14 +1388,14 @@ public void testDeleteNamespaceForcefully() throws Exception { assertFalse(admin.topics().getList(namespace).isEmpty()); try { - deleteNamespaceGraceFully(namespace, false); + admin.namespaces().deleteNamespace(namespace, false); fail("should have failed due to namespace not empty"); } catch (PulsarAdminException e) { // Expected: cannot delete non-empty tenant } // delete namespace forcefully - deleteNamespaceGraceFully(namespace, true); + deleteNamespaceWithRetry(namespace, true); assertFalse(admin.namespaces().getNamespaces(tenant).contains(namespace)); assertTrue(admin.namespaces().getNamespaces(tenant).isEmpty()); @@ -2287,7 +2287,7 @@ public void testBackwardCompatibility() throws Exception { assertEquals(result.someNewIntField, 0); assertNull(result.someNewString); - deleteNamespaceGraceFully("prop-xyz/ns1", false); + deleteNamespaceWithRetry("prop-xyz/ns1", false); admin.tenants().deleteTenant("prop-xyz"); assertEquals(admin.tenants().getTenants(), new ArrayList<>()); } @@ -3202,9 +3202,9 @@ public void testSubscriptionExpiry() throws Exception { admin.topics().delete(topic1); admin.topics().delete(topic2); admin.topics().delete(topic3); - deleteNamespaceGraceFully(namespace1, false); - deleteNamespaceGraceFully(namespace2, false); - deleteNamespaceGraceFully(namespace3, false); + deleteNamespaceWithRetry(namespace1, false); + deleteNamespaceWithRetry(namespace2, false); + deleteNamespaceWithRetry(namespace3, false); } @Test @@ -3217,11 +3217,11 @@ public void testCreateAndDeleteNamespaceWithBundles() throws Exception { String ns = BrokerTestUtil.newUniqueName("prop-xyz/ns"); admin.namespaces().createNamespace(ns, 24); - deleteNamespaceGraceFully(ns, false); + deleteNamespaceWithRetry(ns, false); // Re-create and re-delete admin.namespaces().createNamespace(ns, 32); - deleteNamespaceGraceFully(ns, false); + deleteNamespaceWithRetry(ns, false); } @Test diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java index 26dc6163f9f72..bd23e0d7e4e85 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -459,7 +459,7 @@ public void testDeleteNamespace() throws Exception { admin.topics().delete("tenant1/ns1/foobar", true); log.info("Deleting namespace"); - deleteNamespaceGraceFully("tenant1/ns1", false, admin); + deleteNamespaceWithRetry("tenant1/ns1", false, admin); } } @@ -480,7 +480,7 @@ public void testCertRefreshForPulsarAdmin() throws Exception { .allowTlsInsecureConnection(false) .enableTlsHostnameVerification(false) .serviceHttpUrl(brokerUrlTls.toString()) - .autoCertRefreshTime(1, TimeUnit.SECONDS) + .autoCertRefreshTime(autoCertRefreshTimeSec, TimeUnit.SECONDS) .authentication("org.apache.pulsar.client.impl.auth.AuthenticationTls", String.format("tlsCertFile:%s,tlsKeyFile:%s", getTLSFile(adminUser + ".cert"), keyFile)) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminResourceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminResourceTest.java index 92717668ea9e5..68e1172f01d2e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminResourceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminResourceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminRestTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminRestTest.java index e35e96970bbc8..eb6083cebe1ed 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminRestTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminRestTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -35,7 +35,7 @@ import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; import org.apache.pulsar.common.policies.data.ClusterData; import org.apache.pulsar.common.policies.data.TenantInfoImpl; -import org.testcontainers.shaded.org.awaitility.Awaitility; +import org.awaitility.Awaitility; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -117,7 +117,7 @@ protected void setup() throws Exception { protected void cleanup() throws Exception { // cleanup. admin.topics().delete(topicName); - deleteNamespaceGraceFully(namespaceName, false); + deleteNamespaceWithRetry(namespaceName, false); admin.tenants().deleteTenant(tenantName); admin.clusters().deleteCluster(clusterName); // super cleanup. diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java index c1bfde505bf61..39d20990493e3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTopicApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTopicApiTest.java index a34d289caab74..02b04f205f2e7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTopicApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTopicApiTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java index ab568ac5eeccd..64b2a58ab86e8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java index e96991de8df74..7b9d4344a4ce5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java index 4cf97090a114c..2e0155182ae6b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerStatTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerStatTest.java index 58c934c544df1..c621c52228325 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerStatTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerStatTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java index b5d5ffc046705..2064559888286 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java index 1758e13d735b5..da753b07159e2 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java index 921aab3de0700..9a8e8fa5a5022 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MockServletContext.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MockServletContext.java index 799ad4bfdc201..cdd33da09b833 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MockServletContext.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MockServletContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java index a4f9fc3f52f19..05a86dc06e27e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -39,16 +39,21 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.ws.rs.BadRequestException; import javax.ws.rs.ClientErrorException; import javax.ws.rs.WebApplicationException; @@ -61,6 +66,7 @@ import org.apache.bookkeeper.mledger.LedgerOffloader; import org.apache.bookkeeper.mledger.ManagedLedgerConfig; import org.apache.bookkeeper.util.ZkUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.broker.BrokerTestUtil; import org.apache.pulsar.broker.admin.v1.Namespaces; import org.apache.pulsar.broker.admin.v1.PersistentTopics; @@ -70,12 +76,14 @@ import org.apache.pulsar.broker.namespace.NamespaceService; import org.apache.pulsar.broker.namespace.OwnershipCache; import org.apache.pulsar.broker.service.AbstractTopic; +import org.apache.pulsar.broker.service.SystemTopicBasedTopicPoliciesService; import org.apache.pulsar.broker.service.Topic; import org.apache.pulsar.broker.web.PulsarWebResource; import org.apache.pulsar.broker.web.RestException; import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.admin.PulsarAdminException.NotFoundException; import org.apache.pulsar.client.admin.internal.BaseResource; +import org.apache.pulsar.client.api.ClientBuilder; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.ConsumerBuilder; import org.apache.pulsar.client.api.Producer; @@ -85,6 +93,8 @@ import org.apache.pulsar.common.naming.NamespaceBundle; import org.apache.pulsar.common.naming.NamespaceBundles; import org.apache.pulsar.common.naming.NamespaceName; +import org.apache.pulsar.common.naming.SystemTopicNames; +import org.apache.pulsar.common.naming.TopicDomain; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.policies.data.AuthAction; import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride; @@ -112,9 +122,10 @@ import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @Test(groups = "broker-admin") @@ -139,8 +150,9 @@ public NamespacesTest() { super(); } + @Override @BeforeClass - public void initNamespace() throws Exception { + public void setup() throws Exception { testLocalNamespaces = new ArrayList<>(); testGlobalNamespaces = new ArrayList<>(); @@ -154,11 +166,37 @@ public void initNamespace() throws Exception { uriField = PulsarWebResource.class.getDeclaredField("uri"); uriField.setAccessible(true); uriInfo = mock(UriInfo.class); + + initAndStartBroker(); } @Override - @BeforeMethod - public void setup() throws Exception { + @AfterClass(alwaysRun = true) + public void cleanup() throws Exception { + super.internalCleanup(); + conf.setClusterName(testLocalCluster); + } + + @AfterMethod(alwaysRun = true) + public void cleanupAfterMethod() throws Exception{ + // cleanup. + Set existsNsSetAferSetup = Stream.concat(testLocalNamespaces.stream(), testGlobalNamespaces.stream()) + .map(Objects::toString).collect(Collectors.toSet()); + cleanupNamespaceByPredicate(this.testTenant, v -> !existsNsSetAferSetup.contains(v)); + cleanupNamespaceByPredicate(this.testOtherTenant, v -> !existsNsSetAferSetup.contains(v)); + } + + protected void customizeNewPulsarClientBuilder(ClientBuilder clientBuilder) { + // Make method "testMaxTopicsPerNamespace" run faster. + clientBuilder.operationTimeout(1, TimeUnit.SECONDS); + } + + private void resetBroker() throws Exception { + cleanup(); + initAndStartBroker(); + } + + private void initAndStartBroker() throws Exception { conf.setTopicLevelPoliciesEnabled(false); conf.setSystemTopicEnabled(false); conf.setClusterName(testLocalCluster); @@ -207,13 +245,6 @@ public void setup() throws Exception { nsSvc = pulsar.getNamespaceService(); } - @Override - @AfterMethod(alwaysRun = true) - public void cleanup() throws Exception { - super.internalCleanup(); - conf.setClusterName(testLocalCluster); - } - @Test public void testCreateNamespaces() throws Exception { try { @@ -646,6 +677,8 @@ public void testGlobalNamespaceReplicationConfiguration() throws Exception { assertEquals(e.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode()); } + // cleanup + resetBroker(); } @Test @@ -723,6 +756,9 @@ public boolean matches(NamespaceName nsname) { assertEquals(captor.getValue().getResponse().getStatus(), Status.TEMPORARY_REDIRECT.getStatusCode()); assertEquals(captor.getValue().getResponse().getLocation().toString(), UriBuilder.fromUri(uri).host("broker-usc.com").port(8080).toString()); + + // cleanup + resetBroker(); } @Test @@ -802,6 +838,9 @@ public void testDeleteNamespaces() throws Exception { responseCaptor = ArgumentCaptor.forClass(Response.class); verify(response, timeout(5000).times(1)).resume(responseCaptor.capture()); assertEquals(responseCaptor.getValue().getStatus(), Status.NO_CONTENT.getStatusCode()); + + // cleanup + resetBroker(); } @Test @@ -847,7 +886,7 @@ public boolean matches(NamespaceBundle bundle) { preconditionFailed.completeExceptionally(new PulsarAdminException.PreconditionFailedException(cee, httpError, statusCode)); doReturn(preconditionFailed).when(namespacesAdmin) - .deleteNamespaceBundleAsync(Mockito.anyString(), Mockito.anyString()); + .deleteNamespaceBundleAsync(Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean()); AsyncResponse response = mock(AsyncResponse.class); ArgumentCaptor captor = ArgumentCaptor.forClass(RestException.class); @@ -866,7 +905,8 @@ public boolean matches(NamespaceBundle bundle) { doReturn(Optional.of(localWebServiceUrl)).when(nsSvc).getWebServiceUrl(nsBundles.getBundles().get(0), optionsHttps); doReturn(true).when(nsSvc).isServiceUnitOwned(nsBundles.getBundles().get(0)); doReturn(CompletableFuture.completedFuture(null)).when(namespacesAdmin).deleteNamespaceBundleAsync( - testTenant + "/" + testLocalCluster + "/" + bundledNsLocal, "0x00000000_0x80000000"); + testTenant + "/" + testLocalCluster + "/" + bundledNsLocal, "0x00000000_0x80000000", + false); response = mock(AsyncResponse.class); namespaces.deleteNamespaceBundle(response, testTenant, testLocalCluster, bundledNsLocal, "0x80000000_0xffffffff", false, false); @@ -881,6 +921,9 @@ public boolean matches(NamespaceBundle bundle) { ArgumentCaptor captor2 = ArgumentCaptor.forClass(Response.class); verify(response, timeout(5000).times(1)).resume(captor2.capture()); assertEquals(captor2.getValue().getStatus(), Status.NO_CONTENT.getStatusCode()); + + // cleanup + resetBroker(); } @Test @@ -900,6 +943,9 @@ public void testUnloadNamespaces() throws Exception { ArgumentCaptor captor = ArgumentCaptor.forClass(Response.class); verify(response, timeout(5000).times(1)).resume(captor.capture()); assertEquals(captor.getValue().getStatus(), Status.NO_CONTENT.getStatusCode()); + + // cleanup + resetBroker(); } @Test @@ -939,6 +985,9 @@ public void testSplitBundles() throws Exception { } catch (RestException re) { assertEquals(re.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode()); } + + // cleanup + resetBroker(); } @Test @@ -966,6 +1015,9 @@ public void testSplitBundleWithUnDividedRange() throws Exception { "0x08375b1a_0x08375b1b", false, false, null); ArgumentCaptor captor = ArgumentCaptor.forClass(Response.class); verify(response, timeout(5000).times(1)).resume(any(RestException.class)); + + // cleanup + resetBroker(); } @Test @@ -997,6 +1049,9 @@ public void testUnloadNamespaceWithBundles() throws Exception { namespaces.unloadNamespaceBundle(response, testTenant, testLocalCluster, bundledNsLocal, "0x00000000_0x80000000", false); verify(response, timeout(5000).times(1)).resume(any(RestException.class)); + + // cleanup + resetBroker(); } private void createBundledTestNamespaces(String property, String cluster, String namespace, BundlesData bundle) @@ -1060,6 +1115,9 @@ public void testRetention() throws Exception { } catch (RestException e) { fail("ValidateNamespaceOwnershipWithBundles failed"); } + + // cleanup + resetBroker(); } @Test @@ -1132,6 +1190,9 @@ public void testValidateTopicOwnership() throws Exception { topics.validateTopicName(topicName.getTenant(), topicName.getCluster(), topicName.getNamespacePortion(), topicName.getEncodedLocalName()); topics.validateAdminOperationOnTopic(false); + + // cleanup + resetBroker(); } @Test @@ -1290,6 +1351,7 @@ public void testSubscribeRate() throws Exception { pulsarClient.updateServiceUrl(lookupUrl.toString()); Awaitility.await().untilAsserted(() -> assertTrue(consumer.isConnected())); pulsar.getConfiguration().setAuthorizationEnabled(true); + consumer.close(); admin.topics().deletePartitionedTopic(topicName, true); admin.namespaces().deleteNamespace(namespace); admin.tenants().deleteTenant("my-tenants"); @@ -1395,51 +1457,46 @@ public void testSetOffloadThreshold() throws Exception { TopicName topicName = TopicName.get("persistent", this.testTenant, "offload", "offload-topic"); String namespace = topicName.getNamespaceObject().toString(); System.out.println(namespace); - // set a default - pulsar.getConfiguration().setManagedLedgerOffloadAutoTriggerSizeThresholdBytes(1); // create the namespace admin.namespaces().createNamespace(namespace, Set.of(testLocalCluster)); admin.topics().createNonPartitionedTopic(topicName.toString()); admin.namespaces().setOffloadDeleteLag(namespace, 10000, TimeUnit.SECONDS); - assertEquals(-1, admin.namespaces().getOffloadThreshold(namespace)); - - // assert we get the default which indicates it will fall back to default - assertEquals(-1, admin.namespaces().getOffloadThreshold(namespace)); - // the ledger config should have the expected value - ManagedLedgerConfig ledgerConf = pulsar.getBrokerService().getManagedLedgerConfig(topicName).get(); - MockLedgerOffloader offloader = new MockLedgerOffloader(OffloadPoliciesImpl.create("S3", "", "", "", - null, null, - null, null, - OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, - OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, - admin.namespaces().getOffloadThreshold(namespace), - pulsar.getConfiguration().getManagedLedgerOffloadDeletionLagMs(), - OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY)); - ledgerConf.setLedgerOffloader(offloader); - assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes(), - Long.valueOf(-1)); + // assert we get -1 which indicates it will fall back to default + assertEquals(admin.namespaces().getOffloadThreshold(namespace), -1); + assertEquals(admin.namespaces().getOffloadThresholdInSeconds(namespace), -1); // set an override for the namespace admin.namespaces().setOffloadThreshold(namespace, 100); - assertEquals(100, admin.namespaces().getOffloadThreshold(namespace)); - ledgerConf = pulsar.getBrokerService().getManagedLedgerConfig(topicName).get(); + admin.namespaces().setOffloadThresholdInSeconds(namespace, 100); + Awaitility.await().untilAsserted(() -> { + assertEquals(admin.namespaces().getOffloadThreshold(namespace), 100); + assertEquals(admin.namespaces().getOffloadThresholdInSeconds(namespace), 100); + }); + ManagedLedgerConfig ledgerConf = pulsar.getBrokerService().getManagedLedgerConfig(topicName).get(); admin.namespaces().getOffloadPolicies(namespace); - offloader = new MockLedgerOffloader(OffloadPoliciesImpl.create("S3", "", "", "", + MockLedgerOffloader offloader = new MockLedgerOffloader(OffloadPoliciesImpl.create("S3", "", "", "", null, null, null, null, OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, admin.namespaces().getOffloadThreshold(namespace), + admin.namespaces().getOffloadThresholdInSeconds(namespace), pulsar.getConfiguration().getManagedLedgerOffloadDeletionLagMs(), OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY)); ledgerConf.setLedgerOffloader(offloader); assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes(), Long.valueOf(100)); + assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInSeconds(), + Long.valueOf(100)); // set another negative value to disable admin.namespaces().setOffloadThreshold(namespace, -2); - assertEquals(-2, admin.namespaces().getOffloadThreshold(namespace)); + admin.namespaces().setOffloadThresholdInSeconds(namespace, -2); + Awaitility.await().untilAsserted(() -> { + assertEquals(admin.namespaces().getOffloadThreshold(namespace), -2); + assertEquals(admin.namespaces().getOffloadThresholdInSeconds(namespace), -2); + }); ledgerConf = pulsar.getBrokerService().getManagedLedgerConfig(topicName).get(); offloader = new MockLedgerOffloader(OffloadPoliciesImpl.create("S3", "", "", "", null, null, @@ -1447,15 +1504,22 @@ public void testSetOffloadThreshold() throws Exception { OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, admin.namespaces().getOffloadThreshold(namespace), + admin.namespaces().getOffloadThresholdInSeconds(namespace), pulsar.getConfiguration().getManagedLedgerOffloadDeletionLagMs(), OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY)); ledgerConf.setLedgerOffloader(offloader); assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes(), Long.valueOf(-2)); + assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInSeconds(), + Long.valueOf(-2)); // set back to -1 and fall back to default admin.namespaces().setOffloadThreshold(namespace, -1); - assertEquals(-1, admin.namespaces().getOffloadThreshold(namespace)); + admin.namespaces().setOffloadThresholdInSeconds(namespace, -1); + Awaitility.await().untilAsserted(() -> { + assertEquals(admin.namespaces().getOffloadThreshold(namespace), -1); + assertEquals(admin.namespaces().getOffloadThresholdInSeconds(namespace), -1); + }); ledgerConf = pulsar.getBrokerService().getManagedLedgerConfig(topicName).get(); offloader = new MockLedgerOffloader(OffloadPoliciesImpl.create("S3", "", "", "", null, null, @@ -1463,11 +1527,14 @@ public void testSetOffloadThreshold() throws Exception { OffloadPoliciesImpl.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES, OffloadPoliciesImpl.DEFAULT_READ_BUFFER_SIZE_IN_BYTES, admin.namespaces().getOffloadThreshold(namespace), + admin.namespaces().getOffloadThresholdInSeconds(namespace), pulsar.getConfiguration().getManagedLedgerOffloadDeletionLagMs(), OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY)); ledgerConf.setLedgerOffloader(offloader); assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes(), Long.valueOf(-1)); + assertEquals(ledgerConf.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInSeconds(), + Long.valueOf(-1)); // cleanup admin.topics().delete(topicName.toString(), true); @@ -1564,7 +1631,7 @@ public void testRetentionPolicyValidation() throws Exception { public void testMaxTopicsPerNamespace() throws Exception { cleanup(); conf.setMaxTopicsPerNamespace(15); - setup(); + initAndStartBroker(); String namespace = BrokerTestUtil.newUniqueName("testTenant/ns1"); TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1", "role2"), @@ -1616,7 +1683,7 @@ public void testMaxTopicsPerNamespace() throws Exception { conf.setMaxTopicsPerNamespace(0); conf.setDefaultNumPartitions(3); conf.setAllowAutoTopicCreationType("partitioned"); - setup(); + initAndStartBroker(); admin.tenants().createTenant("testTenant", tenantInfo); admin.namespaces().createNamespace(namespace, Set.of("use")); @@ -1645,7 +1712,7 @@ public void testMaxTopicsPerNamespace() throws Exception { conf.setMaxTopicsPerNamespace(0); conf.setDefaultNumPartitions(1); conf.setAllowAutoTopicCreationType("non-partitioned"); - setup(); + initAndStartBroker(); admin.tenants().createTenant("testTenant", tenantInfo); admin.namespaces().createNamespace(namespace, Set.of("use")); @@ -1680,9 +1747,8 @@ public void testMaxTopicsPerNamespace() throws Exception { pulsarClient.newConsumer().topic(topic + "_c" + i).subscriptionName("test_sub").subscribe().close(); } - conf.setMaxTopicsPerNamespace(0); - conf.setDefaultNumPartitions(1); - conf.setAllowAutoTopicCreationType("non-partitioned"); + // cleanup + resetBroker(); } private void assertInvalidRetentionPolicy(String namespace, int retentionTimeInMinutes, int retentionSizeInMB) { @@ -1874,6 +1940,9 @@ public void testSplitBundleForMultiTimes() throws Exception{ } BundlesData bundles = admin.namespaces().getBundles(namespace); assertEquals(bundles.getNumBundles(), 14); + + // cleanup + resetBroker(); } @Test @@ -1911,5 +1980,93 @@ public void testOperationSubscriptionDispatchRate() throws Exception { assertEquals(e.getResponse().getStatus(), Status.NOT_FOUND.getStatusCode()); } } + /** + * see {@link #cleanupNamespaceByNsCollection(Collection)} + */ + private void cleanupNamespaceByPredicate(String tenant, Predicate predicate) throws Exception{ + cleanupNamespaceByNsCollection(admin.namespaces().getNamespaces(tenant).stream() + .filter(predicate).collect(Collectors.toSet())); + } + + /** + * Remove namespaces. + */ + private void cleanupNamespaceByNsCollection(Collection namespaces) + throws Exception{ + if (namespaces == null){ + return; + } + boolean forceDeleteNamespaceAllowedOriginalValue = pulsar.getConfiguration().isForceDeleteNamespaceAllowed(); + pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); + for (String ns : namespaces){ + if (StringUtils.isEmpty(ns)){ + continue; + } + deleteNamespaceWithRetry(ns, true); + } + pulsar.getConfiguration().setForceDeleteNamespaceAllowed(forceDeleteNamespaceAllowedOriginalValue); + } + @Test + public void testFinallyDeleteSystemTopicWhenDeleteNamespace() throws Exception { + String namespace = this.testTenant + "/delete-namespace"; + String topic = TopicName.get(TopicDomain.persistent.toString(), this.testTenant, "delete-namespace", + "testFinallyDeleteSystemTopicWhenDeleteNamespace").toString(); + + // 0. enable topic level polices and system topic + pulsar.getConfig().setTopicLevelPoliciesEnabled(true); + pulsar.getConfig().setSystemTopicEnabled(true); + pulsar.getConfig().setForceDeleteNamespaceAllowed(true); + Field policesService = pulsar.getClass().getDeclaredField("topicPoliciesService"); + policesService.setAccessible(true); + policesService.set(pulsar, new SystemTopicBasedTopicPoliciesService(pulsar)); + + // 1. create a test namespace. + admin.namespaces().createNamespace(namespace); + // 2. create a test topic. + admin.topics().createNonPartitionedTopic(topic); + // 3. change policy of the topic. + admin.topicPolicies().setMaxConsumers(topic, 5); + // 4. change the order of the topics in this namespace. + List topics = pulsar.getNamespaceService().getFullListOfTopics(NamespaceName.get(namespace)).get(); + Assert.assertTrue(topics.size() >= 2); + for (int i = 0; i < topics.size(); i++) { + if (topics.get(i).contains(SystemTopicNames.NAMESPACE_EVENTS_LOCAL_NAME)) { + String systemTopic = topics.get(i); + topics.set(i, topics.get(0)); + topics.set(0, systemTopic); + } + } + NamespaceService mockNamespaceService = spy(pulsar.getNamespaceService()); + Field namespaceServiceField = pulsar.getClass().getDeclaredField("nsService"); + namespaceServiceField.setAccessible(true); + namespaceServiceField.set(pulsar, mockNamespaceService); + doReturn(CompletableFuture.completedFuture(topics)).when(mockNamespaceService).getFullListOfTopics(any()); + // 5. delete the namespace + admin.namespaces().deleteNamespace(namespace, true); + // cleanup + resetBroker(); + } + + @Test + public void testNotClearTopicPolicesWhenDeleteSystemTopic() throws Exception { + String namespace = this.testTenant + "/delete-systemTopic"; + String topic = TopicName.get(TopicDomain.persistent.toString(), this.testTenant, "delete-systemTopic", + "testNotClearTopicPolicesWhenDeleteSystemTopic").toString(); + + // 0. enable topic level polices and system topic + pulsar.getConfig().setTopicLevelPoliciesEnabled(true); + pulsar.getConfig().setSystemTopicEnabled(true); + Field policesService = pulsar.getClass().getDeclaredField("topicPoliciesService"); + policesService.setAccessible(true); + policesService.set(pulsar, new SystemTopicBasedTopicPoliciesService(pulsar)); + // 1. create a test namespace. + admin.namespaces().createNamespace(namespace); + // 2. create a test topic. + admin.topics().createNonPartitionedTopic(topic); + // 3. change policy of the topic. + admin.topicPolicies().setMaxConsumers(topic, 5); + // 4. delete the policies topic and the topic wil not to clear topic polices + admin.topics().delete(namespace + "/" + SystemTopicNames.NAMESPACE_EVENTS_LOCAL_NAME, true); + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java index 91b0fdbf079a4..cec3076219445 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java index 5aef3644f2db4..d25bbc7bd07a9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -92,6 +92,7 @@ import org.apache.zookeeper.KeeperException; import org.awaitility.Awaitility; import org.mockito.ArgumentCaptor; +import org.mockito.internal.util.MockUtil; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; @@ -99,7 +100,7 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") +@Test(groups = "broker-admin") public class PersistentTopicsTest extends MockedPulsarServiceBaseTest { private PersistentTopics persistentTopics; @@ -192,6 +193,17 @@ public void testGetSubscriptions() { "Partitioned Topic not found: persistent://my-tenant/my-namespace/topic-not-found-partition-0 has " + "zero partitions"); + // Confirm that the namespace does not exist + String notExistNamespace = "not-exist-namespace"; + response = mock(AsyncResponse.class); + persistentTopics.getSubscriptions(response, testTenant, notExistNamespace, testLocalTopicName, + true); + errorCaptor = ArgumentCaptor.forClass(RestException.class); + verify(response, timeout(5000).times(1)).resume(errorCaptor.capture()); + Assert.assertEquals(errorCaptor.getValue().getResponse().getStatus(), + Response.Status.NOT_FOUND.getStatusCode()); + Assert.assertEquals(errorCaptor.getValue().getMessage(), "Namespace not found"); + // 3) Create the partitioned topic response = mock(AsyncResponse.class); ArgumentCaptor responseCaptor = ArgumentCaptor.forClass(Response.class); @@ -1501,6 +1513,8 @@ public void testDeleteTopic() throws Exception { verify(response, timeout(5000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); + MockUtil.resetMock(brokerService); + CompletableFuture deleteTopicFuture2 = new CompletableFuture<>(); ArgumentCaptor errorCaptor = ArgumentCaptor.forClass(RestException.class); deleteTopicFuture2.completeExceptionally(new MetadataStoreException("test exception")); @@ -1511,6 +1525,8 @@ public void testDeleteTopic() throws Exception { Assert.assertEquals(errorCaptor.getValue().getResponse().getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + MockUtil.resetMock(brokerService); + CompletableFuture deleteTopicFuture3 = new CompletableFuture<>(); response = mock(AsyncResponse.class); deleteTopicFuture3.completeExceptionally(new MetadataStoreException.NotFoundException()); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java index 39846367ea4e3..f2266d3ed5fe3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/ResourceGroupsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java index e8c0683569f95..1ed7c2f712110 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.admin; import static org.mockito.ArgumentMatchers.any; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java index d1fa01306f756..dce07218ee150 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -36,7 +36,7 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") +@Test(groups = "broker-admin") public class TopicMessageTTLTest extends MockedPulsarServiceBaseTest { private final String testTenant = "my-tenant"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesDisableTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesDisableTest.java index f1f83edc598b1..29c659a23dadc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesDisableTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesDisableTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java index 22670babcc6f6..d47c918cf6a7e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsAuthTest.java index 7686196d93b27..6fef3c8d03b60 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsAuthTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsAuthTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java index 49ead1c5fcbf2..5b1f43f5a1523 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java index 7dce82a3691d0..1aed0be31b199 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java index 9000527320165..3b43874f180e9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -183,7 +183,7 @@ public void reset() throws Exception { pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); for (String tenant : admin.tenants().getTenants()) { for (String namespace : admin.namespaces().getNamespaces(tenant)) { - deleteNamespaceGraceFullyByMultiPulsars(namespace, true, admin, pulsar, + deleteNamespaceWithRetry(namespace, true, admin, pulsar, mockPulsarSetup.getPulsar()); } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionMultiBrokerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionMultiBrokerTest.java index c9d554a2ca8d5..463a65fc8ae89 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionMultiBrokerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionMultiBrokerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -62,6 +62,9 @@ public void testRedirectOfGetCoordinatorInternalStats() throws Exception { new PartitionedTopicMetadata(NUM_PARTITIONS)); map = admin.lookups().lookupPartitionedTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN.toString()); } + if (pulsarClient != null) { + pulsarClient.shutdown(); + } //init tc stores pulsarClient = PulsarClient.builder() .serviceUrl(getPulsarServiceList().get(0).getBrokerServiceUrl()) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionTest.java index 8c002080abe18..019b7c11fd579 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AdminApiTransactionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -62,6 +62,7 @@ import org.apache.pulsar.common.policies.data.ManagedLedgerInternalStats; import org.apache.pulsar.common.policies.data.TenantInfoImpl; import org.apache.pulsar.common.policies.data.TransactionBufferStats; +import org.apache.pulsar.common.policies.data.TransactionCoordinatorInfo; import org.apache.pulsar.common.policies.data.TransactionCoordinatorInternalStats; import org.apache.pulsar.common.policies.data.TransactionCoordinatorStats; import org.apache.pulsar.common.policies.data.TransactionInBufferStats; @@ -109,6 +110,18 @@ protected void cleanup() throws Exception { super.internalCleanup(); } + @Test(timeOut = 20000) + public void testListTransactionCoordinators() throws Exception { + initTransaction(4); + final List result = admin + .transactions().listTransactionCoordinatorsAsync().get(); + assertEquals(result.size(), 4); + final String expectedUrl = pulsar.getBrokerServiceUrl(); + for (int i = 0; i < 4; i++) { + assertEquals(result.get(i).getBrokerServiceUrl(), expectedUrl); + } + } + @Test(timeOut = 20000) public void testGetTransactionCoordinatorStats() throws Exception { initTransaction(2); @@ -611,8 +624,9 @@ public void testUpdateTransactionCoordinatorNumber() throws Exception { } admin.transactions().scaleTransactionCoordinators(coordinatorSize * 2); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); + replacePulsarClient(PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true)); pulsarClient.close(); + pulsarClient = null; Awaitility.await().until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() == coordinatorSize * 2); pulsar.getConfiguration().setAuthenticationEnabled(true); @@ -808,11 +822,12 @@ private void initTransaction(int coordinatorSize) throws Exception { .createPartitionedTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN, new PartitionedTopicMetadata(coordinatorSize)); admin.lookups().lookupTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN.toString()); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); + replacePulsarClient(PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true)); pulsarClient.close(); + pulsarClient = null; Awaitility.await().until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() == coordinatorSize); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); + replacePulsarClient(PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true)); } private Transaction getTransaction() throws Exception { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AsyncResponseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AsyncResponseTest.java index 9c3e66fb574b6..33f7f81a297a0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AsyncResponseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/AsyncResponseTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.pulsar.broker.admin.v3; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiNotEnabledTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiNotEnabledTest.java index 2c39fbbaf8d3b..44409a942e085 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiNotEnabledTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiNotEnabledTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiTest.java index dd082681b2362..7085ed178fc28 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v3/PackagesApiTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java index d0243ecdef1dd..6ffcecbeb9f8b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -41,7 +41,7 @@ * However it is useful to see which logs are produced when there's an * failure or error in authentication. */ -@Test(groups = "flaky") +@Test(groups = "broker") public class AuthLogsTest extends MockedPulsarServiceBaseTest { private static final Logger log = LoggerFactory.getLogger(AuthLogsTest.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java index 24beb8f426a97..d9ef59afd1e22 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java index b533f8ce8b221..11afe889ee935 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -38,7 +38,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = "flaky") +@Test(groups = "broker") public class AuthorizationTest extends MockedPulsarServiceBaseTest { public AuthorizationTest() { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java index ccb401f74b348..b69ccc40607f1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/InvalidBrokerConfigForAuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/InvalidBrokerConfigForAuthorizationTest.java index 5e31ba27be3b0..fa43dabc590f0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/InvalidBrokerConfigForAuthorizationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/InvalidBrokerConfigForAuthorizationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthentication.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthentication.java index 4838a47d66226..0b1726617f71f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthentication.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthentication.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java index 3ef9b5ad2d63f..f896ecefbc9c7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java index 3af2568c95465..d8c884f353b01 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthorizationProvider.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java index 1ea11bb1ac4e4..1a558b6343355 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -27,7 +27,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import com.google.common.collect.Sets; -import com.google.common.io.Resources; import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.EventLoopGroup; import java.lang.reflect.Field; @@ -36,6 +35,7 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashSet; @@ -63,7 +63,6 @@ import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor; import org.apache.pulsar.broker.namespace.NamespaceService; import org.apache.pulsar.broker.service.BrokerTestBase; -import org.apache.pulsar.broker.service.CanPausedNamespaceService; import org.apache.pulsar.broker.service.PulsarMetadataEventSynchronizer; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminBuilder; @@ -79,6 +78,7 @@ import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended; import org.apache.pulsar.metadata.impl.ZKMetadataStore; import org.apache.pulsar.tests.TestRetrySupport; +import org.apache.pulsar.utils.ResourceUtils; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.MockZooKeeper; import org.apache.zookeeper.MockZooKeeperSession; @@ -87,26 +87,27 @@ import org.mockito.internal.util.MockUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.testcontainers.shaded.org.awaitility.Awaitility; /** * Base class for all tests that need a Pulsar instance without a ZK and BK cluster. */ public abstract class MockedPulsarServiceBaseTest extends TestRetrySupport { public final static String BROKER_KEYSTORE_FILE_PATH = - Resources.getResource("certificate-authority/jks/broker.keystore.jks").getPath(); + ResourceUtils.getAbsolutePath("certificate-authority/jks/broker.keystore.jks"); public final static String BROKER_TRUSTSTORE_FILE_PATH = - Resources.getResource("certificate-authority/jks/broker.truststore.jks").getPath(); + ResourceUtils.getAbsolutePath("certificate-authority/jks/broker.truststore.jks"); public final static String BROKER_TRUSTSTORE_NO_PASSWORD_FILE_PATH = - Resources.getResource("certificate-authority/jks/broker.truststore.nopassword.jks").getPath(); + ResourceUtils.getAbsolutePath("certificate-authority/jks/broker.truststore.nopassword.jks"); public final static String BROKER_KEYSTORE_PW = "111111"; public final static String BROKER_TRUSTSTORE_PW = "111111"; public final static String CLIENT_KEYSTORE_FILE_PATH = - Resources.getResource("certificate-authority/jks/client.keystore.jks").getPath(); + ResourceUtils.getAbsolutePath("certificate-authority/jks/client.keystore.jks"); public final static String CLIENT_TRUSTSTORE_FILE_PATH = - Resources.getResource("certificate-authority/jks/client.truststore.jks").getPath(); + ResourceUtils.getAbsolutePath("certificate-authority/jks/client.truststore.jks"); public final static String CLIENT_TRUSTSTORE_NO_PASSWORD_FILE_PATH = - Resources.getResource("certificate-authority/jks/client.truststore.nopassword.jks").getPath(); + ResourceUtils.getAbsolutePath("certificate-authority/jks/client.truststore.nopassword.jks"); public final static String CLIENT_KEYSTORE_PW = "111111"; public final static String CLIENT_TRUSTSTORE_PW = "111111"; @@ -384,7 +385,7 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { : createConfigurationMetadataStore()).when(pulsar).createConfigurationMetadataStore(any()); Supplier namespaceServiceSupplier = - () -> spyWithClassAndConstructorArgs(CanPausedNamespaceService.class, pulsar); + () -> spyWithClassAndConstructorArgs(NamespaceService.class, pulsar); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); doReturn(sameThreadOrderedSafeExecutor).when(pulsar).getOrderedExecutor(); @@ -669,27 +670,44 @@ public Map, Collection>> register(Object callback, Object... c } /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFully(String ns, boolean force) + protected void deleteNamespaceWithRetry(String ns, boolean force) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsar); + BrokerTestBase.deleteNamespaceWithRetry(ns, force, admin, pulsar); } /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFully(String ns, boolean force, PulsarAdmin admin) + protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsar); + BrokerTestBase.deleteNamespaceWithRetry(ns, force, admin, pulsar); } /** - * see see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFullyByMultiPulsars(String ns, boolean force, PulsarAdmin admin, - PulsarService...pulsars) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsars); + public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin, PulsarService...pulsars) + throws Exception { + deleteNamespaceWithRetry(ns, force, admin, Arrays.asList(pulsars)); + } + + /** + * 1. Pause system "__change_event" topic creates. + * 2. Do delete namespace with retry because maybe fail by race-condition with create topics. + */ + public static void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin, + Collection pulsars) throws Exception { + Awaitility.await().atMost(5, TimeUnit.SECONDS).until(() -> { + try { + // Maybe fail by race-condition with create topics, just retry. + admin.namespaces().deleteNamespace(ns, force); + return true; + } catch (Exception ex) { + return false; + } + }); } private static final Logger log = LoggerFactory.getLogger(MockedPulsarServiceBaseTest.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/PortForwarder.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/PortForwarder.java index b93d1e573e80f..a2238b41307c0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/PortForwarder.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/PortForwarder.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/SameThreadOrderedSafeExecutor.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/SameThreadOrderedSafeExecutor.java index f9f9881f1c474..5f6a32a61bd25 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/SameThreadOrderedSafeExecutor.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/SameThreadOrderedSafeExecutor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/BundlesQuotasTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/BundlesQuotasTest.java index d8fccfc0aedd9..d78e8c0914c7e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/BundlesQuotasTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/BundlesQuotasTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/AbstractDeliveryTrackerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/AbstractDeliveryTrackerTest.java new file mode 100644 index 0000000000000..1d166a8db5c9e --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/AbstractDeliveryTrackerTest.java @@ -0,0 +1,240 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed; + +import static org.mockito.Mockito.atMostOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import io.netty.util.HashedWheelTimer; +import io.netty.util.Timeout; +import io.netty.util.Timer; +import io.netty.util.TimerTask; +import io.netty.util.concurrent.DefaultThreadFactory; +import java.time.Clock; +import java.util.Collections; +import java.util.NavigableMap; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.bookkeeper.mledger.impl.PositionImpl; +import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; +import org.awaitility.Awaitility; +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + +public abstract class AbstractDeliveryTrackerTest { + + // Create a single shared timer for the test. + protected final Timer timer = + new HashedWheelTimer(new DefaultThreadFactory("pulsar-in-memory-delayed-delivery-test"), + 500, TimeUnit.MILLISECONDS); + protected PersistentDispatcherMultipleConsumers dispatcher; + protected Clock clock; + + protected AtomicLong clockTime; + + @AfterClass(alwaysRun = true) + public void cleanup() { + timer.stop(); + } + + @Test(dataProvider = "delayedTracker") + public void test(DelayedDeliveryTracker tracker) throws Exception { + assertFalse(tracker.hasMessageAvailable()); + + assertTrue(tracker.addMessage(1, 2, 20)); + assertTrue(tracker.addMessage(2, 1, 10)); + assertTrue(tracker.addMessage(3, 3, 30)); + assertTrue(tracker.addMessage(4, 5, 50)); + assertTrue(tracker.addMessage(5, 4, 40)); + + assertFalse(tracker.hasMessageAvailable()); + assertEquals(tracker.getNumberOfDelayedMessages(), 5); + + assertEquals(tracker.getScheduledMessages(10), Collections.emptySet()); + + // Move time forward + clockTime.set(15); + + // Message is rejected by tracker since it's already ready to send + assertFalse(tracker.addMessage(6, 6, 10)); + + assertEquals(tracker.getNumberOfDelayedMessages(), 5); + assertTrue(tracker.hasMessageAvailable()); + Set scheduled = tracker.getScheduledMessages(10); + assertEquals(scheduled.size(), 1); + + // Move time forward + clockTime.set(60); + + assertEquals(tracker.getNumberOfDelayedMessages(), 4); + assertTrue(tracker.hasMessageAvailable()); + scheduled = tracker.getScheduledMessages(1); + assertEquals(scheduled.size(), 1); + + assertEquals(tracker.getNumberOfDelayedMessages(), 3); + assertTrue(tracker.hasMessageAvailable()); + scheduled = tracker.getScheduledMessages(3); + assertEquals(scheduled.size(), 3); + + assertEquals(tracker.getNumberOfDelayedMessages(), 0); + assertFalse(tracker.hasMessageAvailable()); + assertEquals(tracker.getScheduledMessages(10), Collections.emptySet()); + + tracker.close(); + } + + @Test(dataProvider = "delayedTracker") + public void testWithTimer(DelayedDeliveryTracker tracker, NavigableMap tasks) throws Exception { + assertTrue(tasks.isEmpty()); + assertTrue(tracker.addMessage(2, 2, 20)); + assertEquals(tasks.size(), 1); + assertEquals(tasks.firstKey().longValue(), 20); + + assertTrue(tracker.addMessage(1, 1, 10)); + assertEquals(tasks.size(), 1); + assertEquals(tasks.firstKey().longValue(), 10); + + assertTrue(tracker.addMessage(3, 3, 30)); + assertEquals(tasks.size(), 1); + assertEquals(tasks.firstKey().longValue(), 10); + + clockTime.set(15); + + TimerTask task = tasks.pollFirstEntry().getValue(); + Timeout cancelledTimeout = mock(Timeout.class); + when(cancelledTimeout.isCancelled()).thenReturn(true); + task.run(cancelledTimeout); + verify(dispatcher, atMostOnce()).readMoreEntries(); + + task.run(mock(Timeout.class)); + verify(dispatcher).readMoreEntries(); + + tracker.close(); + } + + /** + * Adding a message that is about to expire within the tick time should lead + * to a rejection from the tracker when isDelayedDeliveryDeliverAtTimeStrict is false. + */ + @Test(dataProvider = "delayedTracker") + public void testAddWithinTickTime(DelayedDeliveryTracker tracker) { + clockTime.set(0); + + assertFalse(tracker.addMessage(1, 1, 10)); + assertFalse(tracker.addMessage(2, 2, 99)); + assertFalse(tracker.addMessage(3, 3, 100)); + assertTrue(tracker.addMessage(4, 4, 101)); + assertTrue(tracker.addMessage(5, 5, 200)); + + assertEquals(tracker.getNumberOfDelayedMessages(), 2); + + tracker.close(); + } + + @Test(dataProvider = "delayedTracker") + public void testAddMessageWithStrictDelay(DelayedDeliveryTracker tracker) { + clockTime.set(10); + + // Verify behavior for the less than, equal to, and greater than deliverAt times. + assertFalse(tracker.addMessage(1, 1, 9)); + assertFalse(tracker.addMessage(4, 4, 10)); + assertTrue(tracker.addMessage(1, 1, 11)); + + assertEquals(tracker.getNumberOfDelayedMessages(), 1); + assertFalse(tracker.hasMessageAvailable()); + + tracker.close(); + } + + /** + * In this test, the deliverAt time is after now, but the deliverAt time is too early to run another tick, so the + * tickTimeMillis determines the delay. + */ + @Test(dataProvider = "delayedTracker") + public void testAddMessageWithDeliverAtTimeAfterNowBeforeTickTimeFrequencyWithStrict(DelayedDeliveryTracker tracker) + throws Exception { + // Set clock time, then run tracker to inherit clock time as the last tick time. + clockTime.set(10000); + Timeout timeout = mock(Timeout.class); + when(timeout.isCancelled()).then(x -> false); + ((AbstractDelayedDeliveryTracker) tracker).run(timeout); + verify(dispatcher, times(1)).readMoreEntries(); + + // Add a message that has a delivery time just after the previous run. It will get delivered based on the + // tick delay plus the last tick run. + assertTrue(tracker.addMessage(1, 1, 10001)); + + // Wait longer than the tick time plus the HashedWheelTimer's tick time to ensure that enough time has + // passed where it would have been triggered if the tick time was doing the triggering. + Thread.sleep(600); + verify(dispatcher, times(1)).readMoreEntries(); + + // Not wait for the message delivery to get triggered. + Awaitility.await().atMost(10, TimeUnit.SECONDS) + .untilAsserted(() -> verify(dispatcher).readMoreEntries()); + + tracker.close(); + } + + /** + * In this test, the deliverAt time is after now, but before the (tickTimeMillis + now). Because there wasn't a + * recent tick run, the deliverAt time determines the delay. + */ + @Test(dataProvider = "delayedTracker") + public void testAddMessageWithDeliverAtTimeAfterNowAfterTickTimeFrequencyWithStrict( + DelayedDeliveryTracker tracker) { + clockTime.set(500000); + + assertTrue(tracker.addMessage(1, 1, 500005)); + + // Wait long enough for the runnable to run, but not longer than the tick time. The point is that the delivery + // should get scheduled early when the tick duration has passed since the last tick. + Awaitility.await().atMost(10, TimeUnit.SECONDS) + .untilAsserted(() -> verify(dispatcher).readMoreEntries()); + + tracker.close(); + } + + /** + * In this test, the deliverAt time is after now plus tickTimeMillis, so the tickTimeMillis determines the delay. + */ + @Test(dataProvider = "delayedTracker") + public void testAddMessageWithDeliverAtTimeAfterFullTickTimeWithStrict(DelayedDeliveryTracker tracker) + throws Exception { + clockTime.set(0); + + assertTrue(tracker.addMessage(1, 1, 2000)); + + // Wait longer than the tick time plus the HashedWheelTimer's tick time to ensure that enough time has + // passed where it would have been triggered if the tick time was doing the triggering. + Thread.sleep(1000); + + // Not wait for the message delivery to get triggered. + Awaitility.await().atMost(10, TimeUnit.SECONDS) + .untilAsserted(() -> verify(dispatcher).readMoreEntries()); + + tracker.close(); + } +} diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/BucketDelayedDeliveryTrackerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/BucketDelayedDeliveryTrackerTest.java new file mode 100644 index 0000000000000..331ceb83a9994 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/BucketDelayedDeliveryTrackerTest.java @@ -0,0 +1,159 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import io.netty.util.Timeout; +import io.netty.util.Timer; +import io.netty.util.TimerTask; +import java.lang.reflect.Method; +import java.time.Clock; +import java.util.NavigableMap; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.bookkeeper.mledger.impl.PositionImpl; +import org.apache.pulsar.broker.delayed.bucket.BucketDelayedDeliveryTracker; +import org.apache.pulsar.broker.delayed.bucket.BucketSnapshotStorage; +import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +@Test(groups = "broker") +public class BucketDelayedDeliveryTrackerTest extends AbstractDeliveryTrackerTest { + + private BucketSnapshotStorage bucketSnapshotStorage; + + @AfterMethod + public void clean() throws Exception { + if (bucketSnapshotStorage != null) { + bucketSnapshotStorage.close(); + } + } + + @DataProvider(name = "delayedTracker") + public Object[][] provider(Method method) throws Exception { + dispatcher = mock(PersistentDispatcherMultipleConsumers.class); + clock = mock(Clock.class); + clockTime = new AtomicLong(); + when(clock.millis()).then(x -> clockTime.get()); + + bucketSnapshotStorage = new MockBucketSnapshotStorage(); + bucketSnapshotStorage.start(); + ManagedCursor cursor = new MockManagedCursor("my_test_cursor"); + doReturn(cursor).when(dispatcher).getCursor(); + + final String methodName = method.getName(); + return switch (methodName) { + case "test" -> new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 1, clock, + false, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50) + }}; + case "testWithTimer" -> { + Timer timer = mock(Timer.class); + + AtomicLong clockTime = new AtomicLong(); + Clock clock = mock(Clock.class); + when(clock.millis()).then(x -> clockTime.get()); + + NavigableMap tasks = new TreeMap<>(); + + when(timer.newTimeout(any(), anyLong(), any())).then(invocation -> { + TimerTask task = invocation.getArgument(0, TimerTask.class); + long timeout = invocation.getArgument(1, Long.class); + TimeUnit unit = invocation.getArgument(2, TimeUnit.class); + long scheduleAt = clockTime.get() + unit.toMillis(timeout); + tasks.put(scheduleAt, task); + + Timeout t = mock(Timeout.class); + when(t.cancel()).then(i -> { + tasks.remove(scheduleAt, task); + return null; + }); + return t; + }); + + yield new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 1, clock, + false, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50), + tasks + }}; + } + case "testAddWithinTickTime" -> new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 100, clock, + false, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50) + }}; + case "testAddMessageWithStrictDelay" -> new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 100, clock, + true, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50) + }}; + case "testAddMessageWithDeliverAtTimeAfterNowBeforeTickTimeFrequencyWithStrict" -> new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 1000, clock, + true, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50) + }}; + case "testAddMessageWithDeliverAtTimeAfterNowAfterTickTimeFrequencyWithStrict", "testRecoverSnapshot" -> + new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 100000, clock, + true, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50) + }}; + case "testAddMessageWithDeliverAtTimeAfterFullTickTimeWithStrict", "testExistDelayedMessage" -> + new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 500, clock, + true, bucketSnapshotStorage, 5, TimeUnit.MILLISECONDS.toMillis(10), 50) + }}; + default -> new Object[][]{{ + new BucketDelayedDeliveryTracker(dispatcher, timer, 1, clock, + true, bucketSnapshotStorage, 1000, TimeUnit.MILLISECONDS.toMillis(100), 50) + }}; + }; + } + + @Test(dataProvider = "delayedTracker") + public void testContainsMessage(DelayedDeliveryTracker tracker) { + tracker.addMessage(1, 1, 10); + tracker.addMessage(2, 2, 20); + + assertTrue(tracker.containsMessage(1, 1)); + clockTime.set(20); + + Set scheduledMessages = tracker.getScheduledMessages(1); + assertEquals(scheduledMessages.stream().findFirst().get().getEntryId(), 1); + + tracker.addMessage(3, 3, 30); + + tracker.addMessage(4, 4, 30); + + tracker.addMessage(5, 5, 30); + + tracker.addMessage(6, 6, 30); + + assertTrue(tracker.containsMessage(3, 3)); + + tracker.close(); + } +} diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/InMemoryDeliveryTrackerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/InMemoryDeliveryTrackerTest.java index 11b681d80a640..6711aed924c20 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/InMemoryDeliveryTrackerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/InMemoryDeliveryTrackerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,13 +18,9 @@ */ package org.apache.pulsar.broker.delayed; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -35,297 +31,95 @@ import io.netty.util.Timer; import io.netty.util.TimerTask; import io.netty.util.concurrent.DefaultThreadFactory; +import java.lang.reflect.Method; import java.time.Clock; -import java.util.Collections; import java.util.NavigableMap; -import java.util.Set; import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import lombok.Cleanup; -import org.apache.bookkeeper.mledger.impl.PositionImpl; import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; -import org.awaitility.Awaitility; -import org.testng.annotations.AfterClass; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @Test(groups = "broker") -public class InMemoryDeliveryTrackerTest { +public class InMemoryDeliveryTrackerTest extends AbstractDeliveryTrackerTest { - // Create a single shared timer for the test. - private final Timer timer = new HashedWheelTimer(new DefaultThreadFactory("pulsar-in-memory-delayed-delivery-test"), - 500, TimeUnit.MILLISECONDS); - - @AfterClass(alwaysRun = true) - public void cleanup() { - timer.stop(); - } - - @Test - public void test() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); + @DataProvider(name = "delayedTracker") + public Object[][] provider(Method method) throws Exception { + dispatcher = mock(PersistentDispatcherMultipleConsumers.class); + clock = mock(Clock.class); + clockTime = new AtomicLong(); when(clock.millis()).then(x -> clockTime.get()); - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, - false, 0); - - assertFalse(tracker.hasMessageAvailable()); - - assertTrue(tracker.addMessage(2, 2, 20)); - assertTrue(tracker.addMessage(1, 1, 10)); - assertTrue(tracker.addMessage(3, 3, 30)); - assertTrue(tracker.addMessage(5, 5, 50)); - assertTrue(tracker.addMessage(4, 4, 40)); - - assertFalse(tracker.hasMessageAvailable()); - assertEquals(tracker.getNumberOfDelayedMessages(), 5); - - assertEquals(tracker.getScheduledMessages(10), Collections.emptySet()); - - // Move time forward - clockTime.set(15); - - // Message is rejected by tracker since it's already ready to send - assertFalse(tracker.addMessage(6, 6, 10)); - - assertEquals(tracker.getNumberOfDelayedMessages(), 5); - assertTrue(tracker.hasMessageAvailable()); - Set scheduled = tracker.getScheduledMessages(10); - assertEquals(scheduled.size(), 1); - - // Move time forward - clockTime.set(60); - - assertEquals(tracker.getNumberOfDelayedMessages(), 4); - assertTrue(tracker.hasMessageAvailable()); - scheduled = tracker.getScheduledMessages(1); - assertEquals(scheduled.size(), 1); - - assertEquals(tracker.getNumberOfDelayedMessages(), 3); - assertTrue(tracker.hasMessageAvailable()); - scheduled = tracker.getScheduledMessages(3); - assertEquals(scheduled.size(), 3); - - assertEquals(tracker.getNumberOfDelayedMessages(), 0); - assertFalse(tracker.hasMessageAvailable()); - assertEquals(tracker.getScheduledMessages(10), Collections.emptySet()); - } - - @Test - public void testWithTimer() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - Timer timer = mock(Timer.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - NavigableMap tasks = new TreeMap<>(); - - when(timer.newTimeout(any(), anyLong(), any())).then(invocation -> { - TimerTask task = invocation.getArgument(0, TimerTask.class); - long timeout = invocation.getArgument(1, Long.class); - TimeUnit unit = invocation.getArgument(2, TimeUnit.class); - long scheduleAt = clockTime.get() + unit.toMillis(timeout); - tasks.put(scheduleAt, task); - - Timeout t = mock(Timeout.class); - when(t.cancel()).then(i -> { - tasks.remove(scheduleAt, task); - return null; - }); - return t; - }); - - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, - false, 0); - - assertTrue(tasks.isEmpty()); - assertTrue(tracker.addMessage(2, 2, 20)); - assertEquals(tasks.size(), 1); - assertEquals(tasks.firstKey().longValue(), 20); - - assertTrue(tracker.addMessage(1, 1, 10)); - assertEquals(tasks.size(), 1); - assertEquals(tasks.firstKey().longValue(), 10); - - assertTrue(tracker.addMessage(3, 3, 30)); - assertEquals(tasks.size(), 1); - assertEquals(tasks.firstKey().longValue(), 10); - - clockTime.set(15); - - TimerTask task = tasks.pollFirstEntry().getValue(); - Timeout cancelledTimeout = mock(Timeout.class); - when(cancelledTimeout.isCancelled()).thenReturn(true); - task.run(cancelledTimeout); - verifyZeroInteractions(dispatcher); - - task.run(mock(Timeout.class)); - verify(dispatcher).readMoreEntries(); - } - - /** - * Adding a message that is about to expire within the tick time should lead - * to a rejection from the tracker when isDelayedDeliveryDeliverAtTimeStrict is false. - */ - @Test - public void testAddWithinTickTime() { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 100, clock, - false, 0); - - clockTime.set(0); - - assertFalse(tracker.addMessage(1, 1, 10)); - assertFalse(tracker.addMessage(2, 2, 99)); - assertFalse(tracker.addMessage(3, 3, 100)); - assertTrue(tracker.addMessage(4, 4, 101)); - assertTrue(tracker.addMessage(5, 5, 200)); - - assertEquals(tracker.getNumberOfDelayedMessages(), 2); - } - - public void testAddMessageWithStrictDelay() { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 100, clock, - true, 0); - - clockTime.set(10); - - // Verify behavior for the less than, equal to, and greater than deliverAt times. - assertFalse(tracker.addMessage(1, 1, 9)); - assertFalse(tracker.addMessage(4, 4, 10)); - assertTrue(tracker.addMessage(1, 1, 11)); - - assertEquals(tracker.getNumberOfDelayedMessages(), 1); - assertFalse(tracker.hasMessageAvailable()); - } - - /** - * In this test, the deliverAt time is after now, but the deliverAt time is too early to run another tick, so the - * tickTimeMillis determines the delay. - */ - public void testAddMessageWithDeliverAtTimeAfterNowBeforeTickTimeFrequencyWithStrict() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - // Use a short tick time to show that the timer task is run based on the deliverAt time in this scenario. - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, - 1000, clock, true, 0); - - // Set clock time, then run tracker to inherit clock time as the last tick time. - clockTime.set(10000); - Timeout timeout = mock(Timeout.class); - when(timeout.isCancelled()).then(x -> false); - tracker.run(timeout); - verify(dispatcher, times(1)).readMoreEntries(); - - // Add a message that has a delivery time just after the previous run. It will get delivered based on the - // tick delay plus the last tick run. - assertTrue(tracker.addMessage(1, 1, 10001)); - - // Wait longer than the tick time plus the HashedWheelTimer's tick time to ensure that enough time has - // passed where it would have been triggered if the tick time was doing the triggering. - Thread.sleep(600); - verify(dispatcher, times(1)).readMoreEntries(); - - // Not wait for the message delivery to get triggered. - Awaitility.await().atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> verify(dispatcher).readMoreEntries()); - } - - /** - * In this test, the deliverAt time is after now, but before the (tickTimeMillis + now). Because there wasn't a - * recent tick run, the deliverAt time determines the delay. - */ - public void testAddMessageWithDeliverAtTimeAfterNowAfterTickTimeFrequencyWithStrict() { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - // Use a large tick time to show that the message will get delivered earlier because there wasn't - // a previous tick run. - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, - 100000, clock, true, 0); - - clockTime.set(500000); - - assertTrue(tracker.addMessage(1, 1, 500005)); - - // Wait long enough for the runnable to run, but not longer than the tick time. The point is that the delivery - // should get scheduled early when the tick duration has passed since the last tick. - Awaitility.await().atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> verify(dispatcher).readMoreEntries()); - } - - /** - * In this test, the deliverAt time is after now plus tickTimeMillis, so the tickTimeMillis determines the delay. - */ - public void testAddMessageWithDeliverAtTimeAfterFullTickTimeWithStrict() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - // Use a short tick time to show that the timer task is run based on the deliverAt time in this scenario. - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, - 500, clock, true, 0); - - clockTime.set(0); - - assertTrue(tracker.addMessage(1, 1, 2000)); - - // Wait longer than the tick time plus the HashedWheelTimer's tick time to ensure that enough time has - // passed where it would have been triggered if the tick time was doing the triggering. - Thread.sleep(1000); - verifyNoInteractions(dispatcher); - - // Not wait for the message delivery to get triggered. - Awaitility.await().atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> verify(dispatcher).readMoreEntries()); + final String methodName = method.getName(); + return switch (methodName) { + case "test" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, + false, 0) + }}; + case "testWithTimer" -> { + Timer timer = mock(Timer.class); + + AtomicLong clockTime = new AtomicLong(); + Clock clock = mock(Clock.class); + when(clock.millis()).then(x -> clockTime.get()); + + NavigableMap tasks = new TreeMap<>(); + + when(timer.newTimeout(any(), anyLong(), any())).then(invocation -> { + TimerTask task = invocation.getArgument(0, TimerTask.class); + long timeout = invocation.getArgument(1, Long.class); + TimeUnit unit = invocation.getArgument(2, TimeUnit.class); + long scheduleAt = clockTime.get() + unit.toMillis(timeout); + tasks.put(scheduleAt, task); + + Timeout t = mock(Timeout.class); + when(t.cancel()).then(i -> { + tasks.remove(scheduleAt, task); + return null; + }); + return t; + }); + + yield new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, + false, 0), + tasks + }}; + } + case "testAddWithinTickTime" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 100, clock, + false, 0) + }}; + case "testAddMessageWithStrictDelay" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 100, clock, + true, 0) + }}; + case "testAddMessageWithDeliverAtTimeAfterNowBeforeTickTimeFrequencyWithStrict" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1000, clock, + true, 0) + }}; + case "testAddMessageWithDeliverAtTimeAfterNowAfterTickTimeFrequencyWithStrict" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 100000, clock, + true, 0) + }}; + case "testAddMessageWithDeliverAtTimeAfterFullTickTimeWithStrict" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 500, clock, + true, 0) + }}; + case "testWithFixedDelays", "testWithMixedDelays","testWithNoDelays" -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 500, clock, + true, 100) + }}; + default -> new Object[][]{{ + new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, + true, 0) + }}; + }; } - @Test - public void testWithFixedDelays() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - final long fixedDelayLookahead = 100; - - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, - true, fixedDelayLookahead); - + @Test(dataProvider = "delayedTracker") + public void testWithFixedDelays(InMemoryDelayedDeliveryTracker tracker) throws Exception { assertFalse(tracker.hasMessageAvailable()); assertTrue(tracker.addMessage(1, 1, 10)); @@ -338,15 +132,16 @@ public void testWithFixedDelays() throws Exception { assertEquals(tracker.getNumberOfDelayedMessages(), 5); assertFalse(tracker.shouldPauseAllDeliveries()); - for (int i = 6; i <= fixedDelayLookahead; i++) { + for (int i = 6; i <= tracker.getFixedDelayDetectionLookahead(); i++) { assertTrue(tracker.addMessage(i, i, i * 10)); } assertTrue(tracker.shouldPauseAllDeliveries()); - clockTime.set(fixedDelayLookahead * 10); + clockTime.set(tracker.getFixedDelayDetectionLookahead() * 10); tracker.getScheduledMessages(100); + assertFalse(tracker.shouldPauseAllDeliveries()); // Empty the tracker @@ -356,22 +151,12 @@ public void testWithFixedDelays() throws Exception { } while (removed > 0); assertFalse(tracker.shouldPauseAllDeliveries()); - } - - @Test - public void testWithMixedDelays() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - long fixedDelayLookahead = 100; - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, - true, fixedDelayLookahead); + tracker.close(); + } + @Test(dataProvider = "delayedTracker") + public void testWithMixedDelays(InMemoryDelayedDeliveryTracker tracker) throws Exception { assertFalse(tracker.hasMessageAvailable()); assertTrue(tracker.addMessage(1, 1, 10)); @@ -382,32 +167,22 @@ public void testWithMixedDelays() throws Exception { assertFalse(tracker.shouldPauseAllDeliveries()); - for (int i = 6; i <= fixedDelayLookahead; i++) { + for (int i = 6; i <= tracker.getFixedDelayDetectionLookahead(); i++) { assertTrue(tracker.addMessage(i, i, i * 10)); } assertTrue(tracker.shouldPauseAllDeliveries()); // Add message with earlier delivery time - assertTrue(tracker.addMessage(5, 5, 5)); + assertTrue(tracker.addMessage(5, 6, 5)); assertFalse(tracker.shouldPauseAllDeliveries()); - } - - @Test - public void testWithNoDelays() throws Exception { - PersistentDispatcherMultipleConsumers dispatcher = mock(PersistentDispatcherMultipleConsumers.class); - - AtomicLong clockTime = new AtomicLong(); - Clock clock = mock(Clock.class); - when(clock.millis()).then(x -> clockTime.get()); - - long fixedDelayLookahead = 100; - @Cleanup - InMemoryDelayedDeliveryTracker tracker = new InMemoryDelayedDeliveryTracker(dispatcher, timer, 1, clock, - true, fixedDelayLookahead); + tracker.close(); + } + @Test(dataProvider = "delayedTracker") + public void testWithNoDelays(InMemoryDelayedDeliveryTracker tracker) throws Exception { assertFalse(tracker.hasMessageAvailable()); assertTrue(tracker.addMessage(1, 1, 10)); @@ -418,16 +193,18 @@ public void testWithNoDelays() throws Exception { assertFalse(tracker.shouldPauseAllDeliveries()); - for (int i = 6; i <= fixedDelayLookahead; i++) { + for (int i = 6; i <= tracker.getFixedDelayDetectionLookahead(); i++) { assertTrue(tracker.addMessage(i, i, i * 10)); } assertTrue(tracker.shouldPauseAllDeliveries()); // Add message with no-delay - assertFalse(tracker.addMessage(5, 5, -1L)); + assertFalse(tracker.addMessage(5, 6, -1L)); assertFalse(tracker.shouldPauseAllDeliveries()); + + tracker.close(); } @Test @@ -471,5 +248,4 @@ public void run(Timeout timeout) throws Exception { timer.stop(); } - } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/MockBucketSnapshotStorage.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/MockBucketSnapshotStorage.java new file mode 100644 index 0000000000000..89831a1d5e771 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/MockBucketSnapshotStorage.java @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed; + +import com.google.protobuf.InvalidProtocolBufferException; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.PooledByteBufAllocator; +import io.netty.util.concurrent.DefaultThreadFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.broker.delayed.bucket.BucketSnapshotStorage; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.SnapshotMetadata; +import org.apache.pulsar.broker.delayed.proto.DelayedMessageIndexBucketSnapshotFormat.SnapshotSegment; + +@Slf4j +public class MockBucketSnapshotStorage implements BucketSnapshotStorage { + + private final AtomicLong maxBucketId; + + private final Map> bucketSnapshots; + + private final ExecutorService executorService = + new ThreadPoolExecutor(10, 20, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), + new DefaultThreadFactory("bucket-snapshot-storage-io")); + + public MockBucketSnapshotStorage() { + this.bucketSnapshots = new ConcurrentHashMap<>(); + this.maxBucketId = new AtomicLong(); + } + + @Override + public CompletableFuture createBucketSnapshot( + SnapshotMetadata snapshotMetadata, List bucketSnapshotSegments) { + return CompletableFuture.supplyAsync(() -> { + long bucketId = maxBucketId.getAndIncrement(); + List entries = new ArrayList<>(); + byte[] bytes = snapshotMetadata.toByteArray(); + ByteBuf byteBuf = PooledByteBufAllocator.DEFAULT.directBuffer(bytes.length); + byteBuf.writeBytes(bytes); + entries.add(byteBuf); + this.bucketSnapshots.put(bucketId, entries); + return bucketId; + }, executorService).thenApply(bucketId -> { + List bufList = new ArrayList<>(); + for (SnapshotSegment snapshotSegment : bucketSnapshotSegments) { + byte[] bytes = snapshotSegment.toByteArray(); + ByteBuf byteBuf = PooledByteBufAllocator.DEFAULT.directBuffer(bytes.length); + byteBuf.writeBytes(bytes); + bufList.add(byteBuf); + } + bucketSnapshots.get(bucketId).addAll(bufList); + + return bucketId; + }); + } + + @Override + public CompletableFuture getBucketSnapshotMetadata(long bucketId) { + return CompletableFuture.supplyAsync(() -> { + ByteBuf byteBuf = this.bucketSnapshots.get(bucketId).get(0); + SnapshotMetadata snapshotMetadata; + try { + snapshotMetadata = SnapshotMetadata.parseFrom(byteBuf.nioBuffer()); + } catch (InvalidProtocolBufferException e) { + throw new RuntimeException(e); + } + return snapshotMetadata; + }, executorService); + } + + @Override + public CompletableFuture> getBucketSnapshotSegment(long bucketId, long firstSegmentEntryId, + long lastSegmentEntryId) { + return CompletableFuture.supplyAsync(() -> { + List snapshotSegments = new ArrayList<>(); + long lastEntryId = Math.min(lastSegmentEntryId, this.bucketSnapshots.get(bucketId).size()); + for (int i = (int) firstSegmentEntryId; i <= lastEntryId ; i++) { + ByteBuf byteBuf = this.bucketSnapshots.get(bucketId).get(i); + SnapshotSegment snapshotSegment; + try { + snapshotSegment = SnapshotSegment.parseFrom(byteBuf.nioBuffer()); + snapshotSegments.add(snapshotSegment); + } catch (InvalidProtocolBufferException e) { + throw new RuntimeException(e); + } + } + return snapshotSegments; + }, executorService); + } + + @Override + public CompletableFuture deleteBucketSnapshot(long bucketId) { + return CompletableFuture.supplyAsync(() -> { + List remove = this.bucketSnapshots.remove(bucketId); + if (remove != null) { + for (ByteBuf byteBuf : remove) { + byteBuf.release(); + } + } + return null; + }, executorService); + } + + @Override + public CompletableFuture getBucketSnapshotLength(long bucketId) { + return CompletableFuture.supplyAsync(() -> { + long length = 0; + List bufList = this.bucketSnapshots.get(bucketId); + for (ByteBuf byteBuf : bufList) { + length += byteBuf.array().length; + } + return length; + }, executorService); + } + + @Override + public void start() throws Exception { + + } + + @Override + public void close() throws Exception { + clean(); + } + + public void clean() { + for (List value : bucketSnapshots.values()) { + for (ByteBuf byteBuf : value) { + byteBuf.release(); + } + } + bucketSnapshots.clear(); + executorService.shutdownNow(); + } +} diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/MockManagedCursor.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/MockManagedCursor.java new file mode 100644 index 0000000000000..efb0fa7ab7ba2 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/delayed/MockManagedCursor.java @@ -0,0 +1,412 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.delayed; + +import com.google.common.collect.Range; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import org.apache.bookkeeper.mledger.AsyncCallbacks; +import org.apache.bookkeeper.mledger.Entry; +import org.apache.bookkeeper.mledger.ManagedCursor; +import org.apache.bookkeeper.mledger.ManagedCursorMXBean; +import org.apache.bookkeeper.mledger.ManagedLedger; +import org.apache.bookkeeper.mledger.ManagedLedgerException; +import org.apache.bookkeeper.mledger.Position; +import org.apache.bookkeeper.mledger.impl.PositionImpl; + +public class MockManagedCursor implements ManagedCursor { + + private final String name; + + private final Map cursorProperties; + + public MockManagedCursor(String name) { + this.name = name; + this.cursorProperties = new ConcurrentHashMap<>(); + } + + @Override + public String getName() { + return null; + } + + @Override + public long getLastActive() { + return 0; + } + + @Override + public void updateLastActive() { + + } + + @Override + public Map getProperties() { + return null; + } + + @Override + public Map getCursorProperties() { + return this.cursorProperties; + } + + @Override + public CompletableFuture putCursorProperty(String key, String value) { + cursorProperties.put(key, value); + return CompletableFuture.completedFuture(null); + } + + @Override + public CompletableFuture setCursorProperties(Map cursorProperties) { + return CompletableFuture.completedFuture(null); + } + + public CompletableFuture removeCursorProperty(String key) { + cursorProperties.remove(key); + return CompletableFuture.completedFuture(null); + } + + @Override + public boolean putProperty(String key, Long value) { + return false; + } + + @Override + public boolean removeProperty(String key) { + return false; + } + + @Override + public List readEntries(int numberOfEntriesToRead) throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public void asyncReadEntries(int numberOfEntriesToRead, AsyncCallbacks.ReadEntriesCallback callback, Object ctx, + PositionImpl maxPosition) { + + } + + @Override + public void asyncReadEntries(int numberOfEntriesToRead, long maxSizeBytes, + AsyncCallbacks.ReadEntriesCallback callback, Object ctx, PositionImpl maxPosition) { + + } + + @Override + public Entry getNthEntry(int n, IndividualDeletedEntries deletedEntries) + throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public void asyncGetNthEntry(int n, IndividualDeletedEntries deletedEntries, + AsyncCallbacks.ReadEntryCallback callback, Object ctx) { + + } + + @Override + public List readEntriesOrWait(int numberOfEntriesToRead) + throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public List readEntriesOrWait(int maxEntries, long maxSizeBytes) + throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public void asyncReadEntriesOrWait(int numberOfEntriesToRead, AsyncCallbacks.ReadEntriesCallback callback, + Object ctx, PositionImpl maxPosition) { + + } + + @Override + public void asyncReadEntriesOrWait(int maxEntries, long maxSizeBytes, AsyncCallbacks.ReadEntriesCallback callback, + Object ctx, PositionImpl maxPosition) { + + } + + @Override + public boolean cancelPendingReadRequest() { + return false; + } + + @Override + public boolean hasMoreEntries() { + return false; + } + + @Override + public long getNumberOfEntries() { + return 0; + } + + @Override + public long getNumberOfEntriesInBacklog(boolean isPrecise) { + return 0; + } + + @Override + public void markDelete(Position position) throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void markDelete(Position position, Map properties) + throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncMarkDelete(Position position, AsyncCallbacks.MarkDeleteCallback callback, Object ctx) { + + } + + @Override + public void asyncMarkDelete(Position position, Map properties, + AsyncCallbacks.MarkDeleteCallback callback, Object ctx) { + + } + + @Override + public void delete(Position position) throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncDelete(Position position, AsyncCallbacks.DeleteCallback callback, Object ctx) { + + } + + @Override + public void delete(Iterable positions) throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncDelete(Iterable position, AsyncCallbacks.DeleteCallback callback, Object ctx) { + + } + + @Override + public Position getReadPosition() { + return null; + } + + @Override + public Position getMarkDeletedPosition() { + return null; + } + + @Override + public Position getPersistentMarkDeletedPosition() { + return null; + } + + @Override + public void rewind() { + + } + + @Override + public void seek(Position newReadPosition, boolean force) { + + } + + @Override + public void clearBacklog() throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncClearBacklog(AsyncCallbacks.ClearBacklogCallback callback, Object ctx) { + + } + + @Override + public void skipEntries(int numEntriesToSkip, IndividualDeletedEntries deletedEntries) + throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncSkipEntries(int numEntriesToSkip, IndividualDeletedEntries deletedEntries, + AsyncCallbacks.SkipEntriesCallback callback, Object ctx) { + + } + + @Override + public Position findNewestMatching(java.util.function.Predicate condition) + throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public Position findNewestMatching(FindPositionConstraint constraint, java.util.function.Predicate condition) + throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public void asyncFindNewestMatching(FindPositionConstraint constraint, + java.util.function.Predicate condition, + AsyncCallbacks.FindEntryCallback callback, Object ctx) { + + } + + @Override + public void resetCursor(Position position) throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncResetCursor(Position position, boolean forceReset, AsyncCallbacks.ResetCursorCallback callback) { + + } + + @Override + public List replayEntries(Set positions) + throws InterruptedException, ManagedLedgerException { + return null; + } + + @Override + public Set asyncReplayEntries(Set positions, + AsyncCallbacks.ReadEntriesCallback callback, Object ctx) { + return null; + } + + @Override + public Set asyncReplayEntries(Set positions, + AsyncCallbacks.ReadEntriesCallback callback, Object ctx, + boolean sortEntries) { + return null; + } + + @Override + public void close() throws InterruptedException, ManagedLedgerException { + + } + + @Override + public void asyncClose(AsyncCallbacks.CloseCallback callback, Object ctx) { + + } + + @Override + public Position getFirstPosition() { + return null; + } + + @Override + public void setActive() { + + } + + @Override + public void setInactive() { + + } + + @Override + public void setAlwaysInactive() { + + } + + @Override + public boolean isActive() { + return false; + } + + @Override + public boolean isDurable() { + return false; + } + + @Override + public long getNumberOfEntriesSinceFirstNotAckedMessage() { + return 0; + } + + @Override + public int getTotalNonContiguousDeletedMessagesRange() { + return 0; + } + + @Override + public int getNonContiguousDeletedMessagesRangeSerializedSize() { + return 0; + } + + @Override + public long getEstimatedSizeSinceMarkDeletePosition() { + return 0; + } + + @Override + public double getThrottleMarkDelete() { + return 0; + } + + @Override + public void setThrottleMarkDelete(double throttleMarkDelete) { + + } + + @Override + public ManagedLedger getManagedLedger() { + return null; + } + + @Override + public Range getLastIndividualDeletedRange() { + return null; + } + + @Override + public void trimDeletedEntries(List entries) { + + } + + @Override + public long[] getDeletedBatchIndexesAsLongArray(PositionImpl position) { + return new long[0]; + } + + @Override + public ManagedCursorMXBean getStats() { + return null; + } + + @Override + public boolean checkAndUpdateReadPositionChanged() { + return false; + } + + @Override + public boolean isClosed() { + return false; + } +} diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java index 290cf19c8f959..4b12fbdf1f4f8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java index c618501f23fa2..4bd3604be6b6c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorUtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoaderTest.java index 758f565545350..a2f97e16a76ae 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorWithClassLoaderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java index 54db4c8ff7139..e436444ec7c10 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java index 42305912baaac..5dc4cae38c886 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MangedLedgerInterceptorImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MangedLedgerInterceptorImplTest.java index 3b634b64e4c58..ec9dd53685f87 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MangedLedgerInterceptorImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MangedLedgerInterceptorImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MockBrokerInterceptor.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MockBrokerInterceptor.java index 8b3a83708dfe8..24d49e1514958 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MockBrokerInterceptor.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/MockBrokerInterceptor.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AdvertisedListenersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AdvertisedListenersTest.java index 9ca4510a209b4..e6e7dd7e5a702 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AdvertisedListenersTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AdvertisedListenersTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java index 79da5b582c08b..4517497f154eb 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/BrokerVersionFilterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/BrokerVersionFilterTest.java index ebf08e6932de3..7f587c73d00a4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/BrokerVersionFilterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/BrokerVersionFilterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LeaderElectionServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LeaderElectionServiceTest.java index 502cc56818a0d..62faa70bbcb76 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LeaderElectionServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LeaderElectionServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java index 5d62ec2c58c84..362b3e0cfcfac 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -164,7 +164,6 @@ void shutdown() throws Exception { } private void loopUntilLeaderChangesForAllBroker(List activePulsars, LeaderBroker oldLeader) { - int loopCount = 0; Awaitility.await() .pollInterval(1, TimeUnit.SECONDS) .atMost(MAX_RETRIES, TimeUnit.SECONDS) @@ -181,8 +180,6 @@ private void loopUntilLeaderChangesForAllBroker(List activePulsar } return settled; }); - // Check if maximum retries are already done. If yes, assert. - Assert.assertNotEquals(loopCount, MAX_RETRIES, "Leader is not changed even after maximum retries."); } /* diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTestingUtils.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTestingUtils.java index 93e57b4745eed..4a408c1f3e879 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTestingUtils.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTestingUtils.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimitTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimitTest.java index 57059a1b09861..82e5a8212fab0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimitTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimitTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java index 9b7ea315f59b3..05e82484226ca 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java index e9b442698f97f..0de4cbde52616 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionExpirationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionExpirationTest.java index 65962868b87c9..d894930fb4194 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionExpirationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionExpirationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.loadbalance; import static org.mockito.Mockito.spy; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionTest.java index 36ed1ca6c6190..5c840129dd8d5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/MultiBrokerLeaderElectionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleBrokerStartTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleBrokerStartTest.java index c01aaec666b89..7bc0d564f568e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleBrokerStartTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleBrokerStartTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java index 9e17cf85155e5..b267e5e185633 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateDataTest.java new file mode 100644 index 0000000000000..7b9afee9ce2d1 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateDataTest.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel; + +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Assigned; +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Owned; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.assertj.core.api.Assertions.assertThat; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.pulsar.common.util.ObjectMapperFactory; +import org.testng.annotations.Test; + +@Test(groups = "broker") +public class ServiceUnitStateDataTest { + + @Test + public void testConstructors() throws InterruptedException { + ServiceUnitStateData data1 = new ServiceUnitStateData(Owned, "A"); + assertEquals(data1.state(), Owned); + assertEquals(data1.broker(), "A"); + assertNull(data1.sourceBroker()); + assertThat(data1.timestamp()).isGreaterThan(0);; + + Thread.sleep(10); + + ServiceUnitStateData data2 = new ServiceUnitStateData(Assigned, "A", "B"); + assertEquals(data2.state(), Assigned); + assertEquals(data2.broker(), "A"); + assertEquals(data2.sourceBroker(), "B"); + assertThat(data2.timestamp()).isGreaterThan(data1.timestamp()); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testNullState() { + new ServiceUnitStateData(null, "A"); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testNullBroker() { + new ServiceUnitStateData(Owned, null); + } + + @Test + public void jsonWriteAndReadTest() throws JsonProcessingException { + ObjectMapper mapper = ObjectMapperFactory.create(); + final ServiceUnitStateData src = new ServiceUnitStateData(Assigned, "A", "B"); + String json = mapper.writeValueAsString(src); + ServiceUnitStateData dst = mapper.readValue(json, ServiceUnitStateData.class); + assertEquals(dst, src); + } +} \ No newline at end of file diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateTest.java new file mode 100644 index 0000000000000..304d1df29c971 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateTest.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel; + +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Assigned; +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Free; +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Owned; +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Released; +import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Splitting; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import org.testng.annotations.Test; + +@Test(groups = "broker") +public class ServiceUnitStateTest { + + @Test + public void testTransitions() { + + assertFalse(ServiceUnitState.isValidTransition(Free, Free)); + assertTrue(ServiceUnitState.isValidTransition(Free, Assigned)); + assertTrue(ServiceUnitState.isValidTransition(Free, Owned)); + assertFalse(ServiceUnitState.isValidTransition(Free, Released)); + assertFalse(ServiceUnitState.isValidTransition(Free, Splitting)); + + assertTrue(ServiceUnitState.isValidTransition(Assigned, Free)); + assertFalse(ServiceUnitState.isValidTransition(Assigned, Assigned)); + assertTrue(ServiceUnitState.isValidTransition(Assigned, Owned)); + assertTrue(ServiceUnitState.isValidTransition(Assigned, Released)); + assertFalse(ServiceUnitState.isValidTransition(Assigned, Splitting)); + + assertTrue(ServiceUnitState.isValidTransition(Owned, Free)); + assertTrue(ServiceUnitState.isValidTransition(Owned, Assigned)); + assertFalse(ServiceUnitState.isValidTransition(Owned, Owned)); + assertFalse(ServiceUnitState.isValidTransition(Owned, Released)); + assertTrue(ServiceUnitState.isValidTransition(Owned, Splitting)); + + assertTrue(ServiceUnitState.isValidTransition(Released, Free)); + assertFalse(ServiceUnitState.isValidTransition(Released, Assigned)); + assertTrue(ServiceUnitState.isValidTransition(Released, Owned)); + assertFalse(ServiceUnitState.isValidTransition(Released, Released)); + assertFalse(ServiceUnitState.isValidTransition(Released, Splitting)); + + assertTrue(ServiceUnitState.isValidTransition(Splitting, Free)); + assertFalse(ServiceUnitState.isValidTransition(Splitting, Assigned)); + assertFalse(ServiceUnitState.isValidTransition(Splitting, Owned)); + assertFalse(ServiceUnitState.isValidTransition(Splitting, Released)); + assertFalse(ServiceUnitState.isValidTransition(Splitting, Splitting)); + } + +} \ No newline at end of file diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/models/SplitTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/models/SplitTest.java new file mode 100644 index 0000000000000..67c9555c88f01 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/models/SplitTest.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel.models; + +import static org.testng.Assert.assertEquals; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import org.apache.pulsar.broker.loadbalance.extensions.models.Split; +import org.testng.annotations.Test; + +@Test(groups = "broker") +public class SplitTest { + + @Test + public void testConstructor() { + Map> map = new HashMap<>(); + map.put("C", Optional.of("test")); + + Split split = new Split("A", "B", map); + assertEquals(split.serviceUnit(), "A"); + assertEquals(split.sourceBroker(), "B"); + assertEquals(split.splitServiceUnitToDestBroker(), map); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testNullBundle() { + new Split(null, "A", Map.of()); + } + +} \ No newline at end of file diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/models/UnloadTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/models/UnloadTest.java new file mode 100644 index 0000000000000..3150d63774e5c --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/channel/models/UnloadTest.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.loadbalance.extensions.channel.models; + +import static org.testng.Assert.assertEquals; +import java.util.Optional; +import org.apache.pulsar.broker.loadbalance.extensions.models.Unload; +import org.testng.annotations.Test; + +@Test(groups = "broker") +public class UnloadTest { + + @Test + public void testConstructors() { + + Unload unload1 = new Unload("A", "B"); + assertEquals(unload1.sourceBroker(), "A"); + assertEquals(unload1.serviceUnit(), "B"); + assertEquals(unload1.destBroker(), Optional.empty()); + + Unload unload2 = new Unload("A", "B", Optional.of("C")); + assertEquals(unload2.sourceBroker(), "A"); + assertEquals(unload2.serviceUnit(), "B"); + assertEquals(unload2.destBroker(), Optional.of("C")); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testNullSourceBroker() { + new Unload(null, "A"); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testNullServiceUnit() { + new Unload("A", null); + } + +} \ No newline at end of file diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTaskTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTaskTest.java index d4c3fced4ae13..fbefdb74d41fc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTaskTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTaskTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerSharedTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerSharedTest.java index d29cc5aa87304..8bc097779b00a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerSharedTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerSharedTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java index e1edb8a9462b4..1f0962f2e44c3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java index adc7d2f9c7370..545bf0b0237ea 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -74,9 +74,6 @@ public void testBrokerNotReachThreshold() { LoadData loadData = new LoadData(); LocalBrokerData broker1 = new LocalBrokerData(); - broker1.setCpu(new ResourceUsage(1000, 100)); - broker1.setMemory(new ResourceUsage(5000, 100)); - broker1.setDirectMemory(new ResourceUsage(5000, 100)); broker1.setBandwidthIn(new ResourceUsage(500, 1000)); broker1.setBandwidthOut(new ResourceUsage(500, 1000)); broker1.setBundles(Sets.newHashSet("bundle-1")); @@ -119,9 +116,6 @@ public void testBrokerWithMultipleBundles() { LoadData loadData = new LoadData(); LocalBrokerData broker1 = new LocalBrokerData(); - broker1.setCpu(new ResourceUsage(1000, 100)); - broker1.setMemory(new ResourceUsage(5000, 100)); - broker1.setDirectMemory(new ResourceUsage(5000, 100)); broker1.setBandwidthIn(new ResourceUsage(999, 1000)); broker1.setBandwidthOut(new ResourceUsage(999, 1000)); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedderTest.java index 7498386c1135e..00182fffb8a31 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/UniformLoadShedderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java index bb20559c061be..77541fb5cb43a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/HttpTopicLookupv2Test.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -104,6 +104,8 @@ public void setUp() throws Exception { doReturn(brokerService).when(pulsar).getBrokerService(); doReturn(auth).when(brokerService).getAuthorizationService(); doReturn(new Semaphore(1000)).when(brokerService).getLookupRequestSemaphore(); + doReturn(CompletableFuture.completedFuture(false)).when(brokerService) + .isAllowAutoTopicCreationAsync(any(TopicName.class)); } @Test diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/v2/TopicLookupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/v2/TopicLookupTest.java index 0124007803380..f7bb5d8ce8e9f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/v2/TopicLookupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/lookup/http/v2/TopicLookupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java index 23e665b414908..43d37466918ce 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceCreateBundlesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralDataTest.java index 1fe1ff9480548..9fb21cb646d33 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralDataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceOwnershipListenerTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceOwnershipListenerTests.java index 1ba87d3e4302a..02787aa14358c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceOwnershipListenerTests.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceOwnershipListenerTests.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -99,7 +99,7 @@ public void unLoad(NamespaceBundle bundle) { Assert.assertTrue(onLoad.get()); Assert.assertTrue(unLoad.get()); admin.topics().delete(topic); - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); } @Test @@ -120,7 +120,7 @@ public void testGetAllPartitions() throws Exception { } admin.topics().deletePartitionedTopic(topicName); - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); } @Test @@ -170,6 +170,6 @@ public boolean test(NamespaceBundle namespaceBundle) { Assert.assertEquals(onLoad.get(), 1); Assert.assertEquals(unLoad.get(), 1); admin.topics().delete(topic); - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java index eadde5e3fc4e1..b3d85ff3869af 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java index 75b20d521476c..0dbfe1760879a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceUnloadingTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipCacheForCurrentServerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipCacheForCurrentServerTest.java index f6527291722e2..e53d5c25bd2b5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipCacheForCurrentServerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipCacheForCurrentServerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java index 1712fcc18488a..65fd939563103 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -45,7 +45,6 @@ import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.auth.SameThreadOrderedSafeExecutor; import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor; -import org.apache.pulsar.broker.service.CanPausedNamespaceService; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended; @@ -133,7 +132,7 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(null); doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(null); Supplier namespaceServiceSupplier = () -> spyWithClassAndConstructorArgs( - CanPausedNamespaceService.class, pulsar); + NamespaceService.class, pulsar); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); SameThreadOrderedSafeExecutor executor = new SameThreadOrderedSafeExecutor(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java index db29d16c9fff3..8b2cb96e267c5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -367,6 +367,7 @@ public void testRemoveOwnership() throws Exception { Awaitility.await().untilAsserted(() -> { assertTrue(cache.getOwnedBundles().isEmpty()); assertFalse(store.exists(ServiceUnitUtils.path(bundle)).join()); + assertNull(cache.getLocallyAcquiredLocks().get(bundle)); }); } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/MockProtocolHandler.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/MockProtocolHandler.java index 80ef61fa98ddd..e94c99cf72bb1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/MockProtocolHandler.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/MockProtocolHandler.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtilsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtilsTest.java index e1fed531c7761..da511c9d4490f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtilsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerUtilsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoaderTest.java index 75d8c646b6bc8..4293e23b80f2c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoaderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlersTest.java index 1ae6cdb95228e..8ee007670fa14 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlersTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/ProtocolHandlersTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSeparateThreadPoolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSeparateThreadPoolTest.java index df803f8980519..ca9ac73875fa5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSeparateThreadPoolTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSeparateThreadPoolTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSharedThreadPoolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSharedThreadPoolTest.java index d48ab6191e82d..6880837278eae 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSharedThreadPoolTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerSharedThreadPoolTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerTestsBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerTestsBase.java index f08771934f666..c894b7d77c43a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerTestsBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/protocol/SimpleProtocolHandlerTestsBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java index 1acc5ad0039dd..9bf7e3c5325d9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListenerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListenerTest.java index 6d0ec4f3e03b5..90c26530850a3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListenerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListenerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -197,7 +197,7 @@ public void testResourceGroupAttachToNamespace() throws Exception { assertNull(pulsar.getResourceGroupServiceManager() .getNamespaceResourceGroup(NamespaceName.get(namespaceName)))); - deleteNamespaceGraceFully(namespaceName, false); + deleteNamespaceWithRetry(namespaceName, false); deleteResourceGroup(rgName); } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupRateLimiterTest.java index a12d551b9068e..fed827b1517e6 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupRateLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupRateLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupServiceTest.java index 86dff398f9774..f47f7686743b6 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java index 1fd9271d9bd6a..72fd91ea46d83 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImplTest.java index 13e17d7c682a1..eeda957bf3e22 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceQuotaCalculatorImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java index 7b96aed47a1ac..8cf5511a684f8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceUsageTransportManagerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java index cba15b0631006..554ef1c3f96da 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -130,7 +130,7 @@ public void testFilterEntriesForConsumerOfTxnBufferAbort() { PersistentTopic mockTopic = mock(PersistentTopic.class); when(this.subscriptionMock.getTopic()).thenReturn(mockTopic); - when(mockTopic.isTxnAborted(any(TxnID.class))).thenReturn(true); + when(mockTopic.isTxnAborted(any(TxnID.class), any())).thenReturn(true); List entries = new ArrayList<>(); entries.add(EntryImpl.create(1, 1, createTnxMessage("message1", 1))); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractSubscriptionTest.java index aaf1f6164a374..82554c74ef7b7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractSubscriptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractTopicTest.java index fb7890dc57f88..7f5d3e0edf178 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractTopicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java index 0385574b1098a..554c663850fd9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerConfigurationTest.java index 29ea71489488c..f55489368834e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerConfigurationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerConfigurationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java index 97d1798c1e217..a7e5dc09480d1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -40,6 +40,7 @@ import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.ServiceConfiguration; +import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.client.admin.GetStatsOptions; import org.apache.pulsar.client.admin.PulsarAdmin; @@ -83,27 +84,19 @@ public class BacklogQuotaManagerTest { private static final int MAX_ENTRIES_PER_LEDGER = 5; /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFully(String ns, boolean force) + protected void deleteNamespaceWithRetry(String ns, boolean force) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsar); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsar); } /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFully(String ns, boolean force, PulsarAdmin admin) + protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsar); - } - - /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} - */ - protected void deleteNamespaceGraceFullyByMultiPulsars(String ns, boolean force, PulsarAdmin admin, - PulsarService...pulsars) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsars); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsar); } @DataProvider(name = "backlogQuotaSizeGB") @@ -186,9 +179,9 @@ void createNamespaces() throws PulsarAdminException { @AfterMethod(alwaysRun = true) void clearNamespaces() throws Exception { - deleteNamespaceGraceFully("prop/ns-quota", true); - deleteNamespaceGraceFully("prop/quotahold", true); - deleteNamespaceGraceFully("prop/quotaholdasync", true); + deleteNamespaceWithRetry("prop/ns-quota", true); + deleteNamespaceWithRetry("prop/quotahold", true); + deleteNamespaceWithRetry("prop/quotaholdasync", true); } private void rolloverStats() { @@ -467,6 +460,7 @@ public void testConsumerBacklogEvictionTimeQuotaPrecise() throws Exception { .retentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction) .build(), BacklogQuota.BacklogQuotaType.message_age); config.setPreciseTimeBasedBacklogQuotaCheck(true); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).statsInterval(0, TimeUnit.SECONDS) .build(); @@ -496,7 +490,6 @@ public void testConsumerBacklogEvictionTimeQuotaPrecise() throws Exception { // All messages for both subscription should be cleaned up from backlog by backlog monitor task. assertEquals(stats.getSubscriptions().get(subName1).getMsgBacklog(), 0); assertEquals(stats.getSubscriptions().get(subName2).getMsgBacklog(), 0); - client.close(); } @Test(timeOut = 60000) @@ -508,6 +501,7 @@ public void testConsumerBacklogEvictionTimeQuota() throws Exception { .limitTime(TIME_TO_CHECK_BACKLOG_QUOTA) .retentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction) .build(), BacklogQuota.BacklogQuotaType.message_age); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).statsInterval(0, TimeUnit.SECONDS) .build(); @@ -546,7 +540,6 @@ public void testConsumerBacklogEvictionTimeQuota() throws Exception { }); assertEquals(ml.getSlowestConsumer().getReadPosition(), slowConsumerReadPos); - client.close(); } @Test(timeOut = 60000) @@ -558,6 +551,7 @@ public void testConsumerBacklogEvictionTimeQuotaWithPartEviction() throws Except .limitTime(5) // set limit time as 5 seconds .retentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction) .build(), BacklogQuota.BacklogQuotaType.message_age); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).statsInterval(0, TimeUnit.SECONDS) .build(); @@ -599,7 +593,6 @@ public void testConsumerBacklogEvictionTimeQuotaWithPartEviction() throws Except assertEquals(stats2.getSubscriptions().get(subName1).getMsgBacklog(), 9); assertEquals(stats2.getSubscriptions().get(subName2).getMsgBacklog(), 9); }); - client.close(); } @@ -613,6 +606,7 @@ public void testConsumerBacklogEvictionTimeQuotaWithEmptyLedger() throws Excepti .retentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction) .build(), BacklogQuota.BacklogQuotaType.message_age); config.setPreciseTimeBasedBacklogQuotaCheck(true); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).statsInterval(0, TimeUnit.SECONDS) .build(); @@ -646,8 +640,6 @@ public void testConsumerBacklogEvictionTimeQuotaWithEmptyLedger() throws Excepti TopicStats latestStats = getTopicStats(topic); assertEquals(latestStats.getSubscriptions().get(subName).getMsgBacklog(), 0); }); - - client.close(); } @Test @@ -660,6 +652,7 @@ public void testConsumerBacklogEvictionWithAckSizeQuota() throws Exception { .limitTime(TIME_TO_CHECK_BACKLOG_QUOTA) .retentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction) .build()); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).build(); final String topic1 = "persistent://prop/ns-quota/topic11" + UUID.randomUUID(); @@ -695,6 +688,7 @@ public void testConsumerBacklogEvictionWithAckTimeQuotaPrecise() throws Exceptio .retentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction) .build(), BacklogQuota.BacklogQuotaType.message_age); config.setPreciseTimeBasedBacklogQuotaCheck(true); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).build(); final String topic1 = "persistent://prop/ns-quota/topic12" + UUID.randomUUID(); @@ -736,7 +730,6 @@ public void testConsumerBacklogEvictionWithAckTimeQuotaPrecise() throws Exceptio stats = getTopicStats(topic1); // sub2 has empty backlog because it's backlog get cleaned up by backlog quota monitor task assertEquals(stats.getSubscriptions().get(subName2).getMsgBacklog(), 0); - client.close(); } private Producer createProducer(PulsarClient client, String topic) @@ -1249,6 +1242,7 @@ public void testProducerExceptionAndThenUnblockTimeQuotaPrecise() throws Excepti .retentionPolicy(BacklogQuota.RetentionPolicy.producer_exception) .build(), BacklogQuota.BacklogQuotaType.message_age); config.setPreciseTimeBasedBacklogQuotaCheck(true); + @Cleanup final PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()) .statsInterval(0, TimeUnit.SECONDS).build(); final String topic1 = "persistent://prop/quotahold/exceptandunblock2"; @@ -1302,7 +1296,6 @@ public void testProducerExceptionAndThenUnblockTimeQuotaPrecise() throws Excepti sendException = e; } assertFalse(gotException, "unable to publish due to " + sendException); - client.close(); } @Test @@ -1314,6 +1307,7 @@ public void testProducerExceptionAndThenUnblockTimeQuota() throws Exception { .limitTime(TIME_TO_CHECK_BACKLOG_QUOTA) .retentionPolicy(BacklogQuota.RetentionPolicy.producer_exception) .build(), BacklogQuota.BacklogQuotaType.message_age); + @Cleanup final PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()) .statsInterval(0, TimeUnit.SECONDS).build(); final String topic1 = "persistent://prop/quotahold/exceptandunblock2"; @@ -1367,12 +1361,12 @@ public void testProducerExceptionAndThenUnblockTimeQuota() throws Exception { sendException = e; } assertFalse(gotException, "unable to publish due to " + sendException); - client.close(); } @Test(dataProvider = "backlogQuotaSizeGB", priority = 1) public void testBacklogQuotaInGB(boolean backlogQuotaSizeGB) throws Exception { + admin.close(); pulsar.close(); long backlogQuotaByte = 10 * 1024; if (backlogQuotaSizeGB) { @@ -1383,6 +1377,7 @@ public void testBacklogQuotaInGB(boolean backlogQuotaSizeGB) throws Exception { config.setBacklogQuotaDefaultRetentionPolicy(BacklogQuota.RetentionPolicy.consumer_backlog_eviction); pulsar = new PulsarService(config); pulsar.start(); + admin = PulsarAdmin.builder().serviceHttpUrl(adminUrl.toString()).build(); @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(pulsar.getBrokerServiceUrl()).statsInterval(0, TimeUnit.SECONDS) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java index fe2551287c8c6..a2d80b2ba600b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java index c15c93c0e9a52..433f5e56d952d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java index 66ea7d9522ccb..6aea4aa5e9f0b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java index 8b0dbb76eecb7..e69714e539be6 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java index 62469fdac9bfb..d517f48b97ab6 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerDispatchRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerDispatchRateLimiterTest.java index 656a0158e0fa1..1e9ff14f7588c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerDispatchRateLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerDispatchRateLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerEntryMetadataE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerEntryMetadataE2ETest.java index 33785ba879553..646b8fa1711a9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerEntryMetadataE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerEntryMetadataE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerInternalClientConfigurationOverrideTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerInternalClientConfigurationOverrideTest.java index 775636c9489fb..1b1b383e930e3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerInternalClientConfigurationOverrideTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerInternalClientConfigurationOverrideTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoSubscriptionCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoSubscriptionCreationTest.java index 05673613be77e..3f2e182874e1d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoSubscriptionCreationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoSubscriptionCreationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java index 56858e61f4de7..60544922bf63f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceBundlesCacheInvalidationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceBundlesCacheInvalidationTest.java index b640d2fbe3956..c9771ddbe2fe7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceBundlesCacheInvalidationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceBundlesCacheInvalidationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -59,7 +59,7 @@ public void testRecreateNamespace() throws Exception { // Delete and recreate with 32 bundles admin.topics().delete(topic); - deleteNamespaceGraceFully(namespace, false); + deleteNamespaceWithRetry(namespace, false); admin.namespaces().createNamespace(namespace, 32); BundlesData bundlesData = admin.namespaces().getBundles(namespace); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java index f011ef9b84209..24e38438c5329 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -1496,4 +1496,28 @@ public void testGetTopic() throws Exception { .subscriptionType(SubscriptionType.Shared) .subscribe(); } + + @Test + public void testDynamicConfigurationsForceDeleteNamespaceAllowed() throws Exception { + cleanup(); + conf.setForceDeleteNamespaceAllowed(false); + setup(); + admin.brokers() + .updateDynamicConfiguration("forceDeleteNamespaceAllowed", "true"); + Awaitility.await().untilAsserted(()->{ + assertTrue(conf.isForceDeleteNamespaceAllowed()); + }); + } + + @Test + public void testDynamicConfigurationsForceDeleteTenantAllowed() throws Exception { + cleanup(); + conf.setForceDeleteTenantAllowed(false); + setup(); + admin.brokers() + .updateDynamicConfiguration("forceDeleteTenantAllowed", "true"); + Awaitility.await().untilAsserted(()->{ + assertTrue(conf.isForceDeleteTenantAllowed()); + }); + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java index 5b1589a7c9ba6..b2cfe63e2e5b4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerTestBase.java index a9a40bce1c784..5fd4edd2a3095 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerTestBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,39 +18,13 @@ */ package org.apache.pulsar.broker.service; -import static org.apache.pulsar.common.naming.SystemTopicNames.NAMESPACE_EVENTS_LOCAL_NAME; -import static org.apache.pulsar.compaction.Compactor.COMPACTION_SUBSCRIPTION; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; -import org.apache.pulsar.broker.namespace.NamespaceEphemeralData; -import org.apache.pulsar.broker.service.persistent.PersistentTopic; -import org.apache.pulsar.broker.systopic.SystemTopicClient; -import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.common.events.PulsarEvent; -import org.apache.pulsar.common.naming.NamespaceBundle; -import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.SystemTopicNames; -import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.partition.PartitionedTopicMetadata; import org.apache.pulsar.common.policies.data.ClusterData; import org.apache.pulsar.common.policies.data.TenantInfoImpl; -import org.apache.pulsar.common.util.FutureUtil; import org.apache.pulsar.metadata.api.MetadataStoreException; -import org.apache.pulsar.metadata.api.coordination.LockManager; -import org.awaitility.Awaitility; -import org.awaitility.reflect.WhiteboxImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -134,162 +108,5 @@ protected String newTopicName() { return "prop/ns-abc/topic-" + Long.toHexString(random.nextLong()); } - /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} - */ - protected void deleteNamespaceGraceFully(String ns, boolean force) - throws Exception { - deleteNamespaceGraceFully(ns, force, admin, pulsar); - } - - /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} - */ - public static void deleteNamespaceGraceFully(String ns, boolean force, PulsarAdmin admin, PulsarService...pulsars) - throws Exception { - deleteNamespaceGraceFully(ns, force, admin, Arrays.asList(pulsars)); - } - - /** - * Wait until system topic "__change_event" and subscription "__compaction" are created, and then delete the namespace. - */ - public static void deleteNamespaceGraceFully(String ns, boolean force, PulsarAdmin admin, - Collection pulsars) throws Exception { - // namespace v1 should not wait system topic create. - if (ns.split("/").length > 2){ - admin.namespaces().deleteNamespace(ns, force); - return; - } - - // If disabled system-topic, should not wait system topic create. - boolean allBrokerDisabledSystemTopic = true; - for (PulsarService pulsar : pulsars) { - if (!pulsar.getConfiguration().isSystemTopicEnabled()) { - continue; - } - TopicPoliciesService topicPoliciesService = pulsar.getTopicPoliciesService(); - if (!(topicPoliciesService instanceof SystemTopicBasedTopicPoliciesService)) { - continue; - } - allBrokerDisabledSystemTopic = false; - } - if (allBrokerDisabledSystemTopic){ - admin.namespaces().deleteNamespace(ns, force); - return; - } - - // Stop trigger "onNamespaceBundleOwned". - List>> createReaderTasks = new ArrayList<>(); - List lockedBundles = new ArrayList<>(); - for (PulsarService pulsar : pulsars) { - // Prevents new events from triggering system topic creation. - CanPausedNamespaceService canPausedNamespaceService = (CanPausedNamespaceService) pulsar.getNamespaceService(); - canPausedNamespaceService.pause(); - - // If no bundle has been loaded, then the System Topic will not trigger creation. - LockManager lockManager = pulsar.getCoordinationService().getLockManager(NamespaceEphemeralData.class); - lockedBundles.addAll((List) lockManager.listLocks("/namespace" + "/" + ns).join()); - - // Determines whether the creation of System topic is triggered. - // If readerCaches contains namespace, the creation of System topic already triggered. - TopicPoliciesService topicPoliciesService = pulsar.getTopicPoliciesService(); - if (topicPoliciesService instanceof - SystemTopicBasedTopicPoliciesService systemTopicBasedTopicPoliciesService) { - Map>> readerCaches = - WhiteboxImpl.getInternalState(systemTopicBasedTopicPoliciesService, "readerCaches"); - if (readerCaches.containsKey(NamespaceName.get(ns))) { - createReaderTasks.add(readerCaches.get(NamespaceName.get(ns))); - } - } - } - // Wait all reader-create tasks. - FutureUtil.waitForAll(createReaderTasks).join(); - - // If the bundle elect has not yet been triggered, skip wait. - if (CollectionUtils.isEmpty(lockedBundles) && createReaderTasks.isEmpty()){ - admin.namespaces().deleteNamespace(ns, force); - return; - } - - // Trigger change event topic create. - PulsarService firstPulsar = pulsars.iterator().next(); - NamespaceName namespace = NamespaceName.get(ns); - NamespaceBundle namespaceBundle = mock(NamespaceBundle.class); - when(namespaceBundle.getNamespaceObject()).thenReturn(namespace); - firstPulsar.getTopicPoliciesService().addOwnedNamespaceBundleAsync(namespaceBundle); - // Wait for change event topic and compaction create finish. - String allowAutoTopicCreationType = firstPulsar.getConfiguration().getAllowAutoTopicCreationType(); - int defaultNumPartitions = firstPulsar.getConfiguration().getDefaultNumPartitions(); - ArrayList expectChangeEventTopics = new ArrayList<>(); - if ("non-partitioned".equals(allowAutoTopicCreationType)){ - String t = String.format("persistent://%s/%s", ns, NAMESPACE_EVENTS_LOCAL_NAME); - expectChangeEventTopics.add(t); - } else { - for (int i = 0; i < defaultNumPartitions; i++){ - String t = String.format("persistent://%s/%s-partition-%s", ns, NAMESPACE_EVENTS_LOCAL_NAME, i); - expectChangeEventTopics.add(t); - } - } - Awaitility.await().until(() -> { - boolean finished = true; - for (String changeEventTopicName : expectChangeEventTopics){ - boolean bundleExists = firstPulsar.getNamespaceService() - .checkTopicOwnership(TopicName.get(changeEventTopicName)) - .exceptionally(ex -> false).join(); - if (!bundleExists){ - finished = false; - break; - } - CompletableFuture> completableFuture = - firstPulsar.getBrokerService().getTopic(changeEventTopicName, false); - if (completableFuture == null){ - finished = false; - break; - } - Optional optionalTopic = completableFuture.get(); - if (!optionalTopic.isPresent()){ - finished = false; - break; - } - PersistentTopic changeEventTopic = (PersistentTopic) optionalTopic.get(); - if (!changeEventTopic.isCompactionEnabled()){ - break; - } - if (!changeEventTopic.getSubscriptions().containsKey(COMPACTION_SUBSCRIPTION)){ - finished = false; - break; - } - } - return finished; - }); - - // Do delete. - int retryTimes = 3; - while (true) { - try { - admin.namespaces().deleteNamespace(ns, force); - break; - } catch (PulsarAdminException ex) { - // Do retry only if topic fenced. - if (ex.getStatusCode() == 500 && ex.getMessage().contains("TopicFencedException")){ - if (--retryTimes > 0){ - continue; - } else { - throw ex; - } - } - throw ex; - } - } - - // Resume trigger "onNamespaceBundleOwned". - for (PulsarService pulsarService : pulsars) { - // Prevents new events from triggering system topic creation. - CanPausedNamespaceService canPausedNamespaceService = - (CanPausedNamespaceService) pulsarService.getNamespaceService(); - canPausedNamespaceService.resume(); - } - } - private static final Logger LOG = LoggerFactory.getLogger(BrokerTestBase.class); } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BusyWaitServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BusyWaitServiceTest.java index 21681c728d356..03d479aa68085 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BusyWaitServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BusyWaitServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CanPausedNamespaceService.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CanPausedNamespaceService.java deleted file mode 100644 index c5527a9149897..0000000000000 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CanPausedNamespaceService.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.pulsar.broker.service; - -import java.util.concurrent.locks.ReentrantLock; -import org.apache.pulsar.broker.PulsarService; -import org.apache.pulsar.broker.namespace.NamespaceService; -import org.apache.pulsar.common.naming.NamespaceBundle; - -public class CanPausedNamespaceService extends NamespaceService { - - private volatile boolean paused = false; - - private ReentrantLock lock = new ReentrantLock(); - - public CanPausedNamespaceService(PulsarService pulsar) { - super(pulsar); - } - - @Override - protected void onNamespaceBundleOwned(NamespaceBundle bundle) { - lock.lock(); - try { - if (paused){ - return; - } - super.onNamespaceBundleOwned(bundle); - } finally { - lock.unlock(); - } - } - - public void pause(){ - lock.lock(); - try { - paused = true; - } finally { - lock.unlock(); - } - } - - public void resume(){ - lock.lock(); - try { - paused = false; - } finally { - lock.unlock(); - } - } -} diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ClusterMigrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ClusterMigrationTest.java index 34397df924730..f376ea4541737 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ClusterMigrationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ClusterMigrationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelectorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelectorTest.java index ef96983bcdc87..dbca31416bb9d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelectorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsistentHashingStickyKeyConsumerSelectorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumedLedgersTrimTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumedLedgersTrimTest.java index 355036bdb25ce..f2ee85d3fd64a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumedLedgersTrimTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumedLedgersTrimTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -81,7 +81,7 @@ public void TestConsumedLedgersTrim() throws Exception { PersistentTopic persistentTopic = (PersistentTopic) pulsar.getBrokerService().getOrCreateTopic(topicName).get(); ManagedLedgerConfig managedLedgerConfig = persistentTopic.getManagedLedger().getConfig(); - managedLedgerConfig.setRetentionSizeInMB(1L); + managedLedgerConfig.setRetentionSizeInMB(1); managedLedgerConfig.setRetentionTime(1, TimeUnit.SECONDS); managedLedgerConfig.setMaxEntriesPerLedger(2); managedLedgerConfig.setMinimumRolloverTime(1, TimeUnit.MILLISECONDS); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumerTest.java index 1ad0642d9c5ba..a974655b06c27 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ConsumerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java index b05abf3be5218..375fe41f143cd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/CurrentLedgerRolloverIfFullTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java index 6aa9a53b33674..0b0d1d7f6eac9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EnableProxyProtocolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EnableProxyProtocolTest.java index b6f34a44429d9..2f128fe6270a5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EnableProxyProtocolTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EnableProxyProtocolTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcksTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcksTest.java index a19bb4ee23f4b..040653d95ac27 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcksTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/EntryBatchIndexesAcksTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ExclusiveProducerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ExclusiveProducerTest.java index 124372ea15a90..5f95e557b8c1c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ExclusiveProducerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ExclusiveProducerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -26,10 +26,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; - import io.netty.util.HashedWheelTimer; import lombok.Cleanup; - import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.ProducerAccessMode; import org.apache.pulsar.client.api.PulsarClient; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java index cd10950b230b2..984bb021badc0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelectorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelectorTest.java index f17bb5a3ae94e..98e27ebb9fb83 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelectorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeAutoSplitStickyKeyConsumerSelectorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java index ff9cb56b7811c..e36c656e3faea 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java index 1013e79916cc4..ebd53d65a7465 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -33,7 +33,10 @@ import org.apache.pulsar.broker.namespace.NamespaceService; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.client.api.Consumer; +import org.apache.pulsar.client.api.Message; import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.impl.ConsumerImpl; +import org.apache.pulsar.client.impl.MultiTopicsConsumerImpl; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.naming.TopicVersion; @@ -45,7 +48,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = "flaky") +@Test(groups = "broker") public class InactiveTopicDeleteTest extends BrokerTestBase { @BeforeMethod @@ -314,30 +317,54 @@ public void testDeleteWhenNoBacklogs() throws Exception { super.baseSetup(); final String topic = "persistent://prop/ns-abc/testDeleteWhenNoBacklogs"; - + final String topic2 = "persistent://prop/ns-abc/testDeleteWhenNoBacklogsB"; Producer producer = pulsarClient.newProducer() .topic(topic) .create(); + Producer producer2 = pulsarClient.newProducer() + .topic(topic2) + .create(); Consumer consumer = pulsarClient.newConsumer() .topic(topic) .subscriptionName("sub") .subscribe(); - for (int i = 0; i < 10; i++) { + Consumer consumer2 = pulsarClient.newConsumer() + .topicsPattern("persistent://prop/ns-abc/test.*") + .subscriptionName("sub2") + .subscribe(); + + int producedCount = 10; + for (int i = 0; i < producedCount; i++) { producer.send("Pulsar".getBytes()); + producer2.send("Pulsar".getBytes()); } - consumer.close(); producer.close(); + producer2.close(); + int receivedCount = 0; + Message msg; + while((msg = consumer2.receive(1, TimeUnit.SECONDS)) != null) { + consumer2.acknowledge(msg); + receivedCount ++; + } + assertEquals(producedCount * 2, receivedCount); Thread.sleep(2000); - Assert.assertTrue(admin.topics().getList("prop/ns-abc") - .contains(topic)); + Assert.assertTrue(admin.topics().getList("prop/ns-abc").contains(topic)); admin.topics().skipAllMessages(topic, "sub"); - Awaitility.await() - .untilAsserted(() -> Assert.assertFalse(admin.topics().getList("prop/ns-abc").contains(topic))); + Awaitility.await().untilAsserted(() -> { + Assert.assertFalse(consumer.isConnected()); + final List consumers = ((MultiTopicsConsumerImpl) consumer2).getConsumers(); + consumers.forEach(c -> Assert.assertFalse(c.isConnected())); + Assert.assertFalse(consumer2.isConnected()); + Assert.assertFalse(admin.topics().getList("prop/ns-abc").contains(topic)); + Assert.assertFalse(admin.topics().getList("prop/ns-abc").contains(topic2)); + }); + consumer.close(); + consumer2.close(); } @Test diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/KeyValueTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/KeyValueTest.java index 2796bbbbbf762..d8d0650d1fa79 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/KeyValueTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/KeyValueTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ManagedLedgerCompressionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ManagedLedgerCompressionTest.java index 30b4aca22bc9b..0dbe6ccfed530 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ManagedLedgerCompressionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ManagedLedgerCompressionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java index 248bd33af0d3c..fb15661fddf2d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MaxMessageSizeTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java index 05e86e73038d8..6b106bfd47de7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java index 82a3b1e376100..4905dee947c52 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java index 38bb301ae38ca..68a9a769ac1fe 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java index 34e0c97e7d3cd..6ff5e7b2f8249 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NullValueTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NullValueTest.java index 4cb476e9de036..f79ec3e14a537 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NullValueTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NullValueTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OpportunisticStripingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OpportunisticStripingTest.java index 61484e23dce7c..37832b18cd1dc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OpportunisticStripingTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OpportunisticStripingTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java index c28a375f05956..7e27aabf2df19 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PartitionKeyTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java index 5f145e258cf75..9f6559217941c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java index f0c61a1fc0292..5381a367afd00 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java index fa382ef3c5e58..7be0590fe53af 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java index 1c1434caf213a..48798f0020f01 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java index 6d111a9806ef5..a7b44401a8e2b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java index 29a8834b4baa6..4bf0481e0d084 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java index 8566a43f7f73d..9bd34cc07e06f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -998,7 +998,7 @@ public void testMessageExpiry() throws Exception { consumer.close(); admin.topics().deleteSubscription(topicName, subName); admin.topics().delete(topicName); - deleteNamespaceGraceFully(namespaceName, false); + deleteNamespaceWithRetry(namespaceName, false); } @Test @@ -1090,7 +1090,7 @@ public void testMessageExpiryWithTopicMessageTTL() throws Exception { consumer.close(); admin.topics().deleteSubscription(topicName, subName); admin.topics().delete(topicName); - deleteNamespaceGraceFully(namespaceName, true); + deleteNamespaceWithRetry(namespaceName, true); } catch (PulsarAdminException e) { Assert.assertEquals(e.getStatusCode(), 500); } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java index 2771808a9fa0b..909d6031928d1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -145,6 +145,7 @@ import org.apache.pulsar.metadata.api.MetadataStore; import org.apache.pulsar.metadata.impl.ZKMetadataStore; import org.apache.zookeeper.ZooKeeper; +import org.awaitility.Awaitility; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -218,7 +219,7 @@ public void setup() throws Exception { doReturn(store).when(pulsar).getConfigurationMetadataStore(); // Mock pulsarResources. PulsarResources pulsarResources = spyWithClassAndConstructorArgs(PulsarResources.class, store, store); - NamespaceResources nsr = spyWithClassAndConstructorArgs(NamespaceResources.class, store, store, 30); + NamespaceResources nsr = spyWithClassAndConstructorArgs(NamespaceResources.class, store, 30); TopicResources tsr = spyWithClassAndConstructorArgs(TopicResources.class, store); doReturn(nsr).when(pulsarResources).getNamespaceResources(); doReturn(tsr).when(pulsarResources).getTopicResources(); @@ -1258,6 +1259,8 @@ public void testCloseTopic() throws Exception { @Test public void testDeleteTopic() throws Exception { + doReturn(CompletableFuture.completedFuture(null)).when(ledgerMock).asyncTruncate(); + // create topic PersistentTopic topic = (PersistentTopic) brokerService.getOrCreateTopic(successTopicName).get(); @@ -1293,7 +1296,9 @@ public void testDeleteTopic() throws Exception { role, false, null, SchemaVersion.Latest, 0, false, ProducerAccessMode.Shared, Optional.empty(), true); topic.addProducer(producer, new CompletableFuture<>()).join(); - assertTrue(topic.delete().isCompletedExceptionally()); + CompletableFuture cf = topic.delete(); + Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> cf.isDone()); + assertTrue(cf.isCompletedExceptionally()); assertFalse((boolean) isFencedField.get(topic)); assertFalse((boolean) isClosingOrDeletingField.get(topic)); topic.removeProducer(producer); @@ -1310,7 +1315,9 @@ public void testDeleteTopic() throws Exception { Future f1 = topic.subscribe(getSubscriptionOption(cmd)); f1.get(); - assertTrue(topic.delete().isCompletedExceptionally()); + CompletableFuture cf2 = topic.delete(); + Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> cf2.isDone()); + assertTrue(cf2.isCompletedExceptionally()); assertFalse((boolean) isFencedField.get(topic)); assertFalse((boolean) isClosingOrDeletingField.get(topic)); topic.unsubscribe(successSubName); @@ -2323,7 +2330,7 @@ public void testGetReplicationClusters() throws Exception { assertEquals(topic.getHierarchyTopicPolicies().getReplicationClusters().get(), Collections.emptyList()); PulsarResources pulsarResources = spyWithClassAndConstructorArgs(PulsarResources.class, store, store); - NamespaceResources nsr = spyWithClassAndConstructorArgs(NamespaceResources.class, store, store, 30); + NamespaceResources nsr = spyWithClassAndConstructorArgs(NamespaceResources.class, store, 30); doReturn(nsr).when(pulsarResources).getNamespaceResources(); PulsarServiceMockSupport.mockPulsarServiceProps(pulsar, () -> { doReturn(pulsarResources).when(pulsar).getPulsarResources(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisPublishLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisPublishLimiterTest.java index 61804e7255d8e..a0d0df52d2417 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisPublishLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisPublishLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisTopicPublishRateThrottleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisTopicPublishRateThrottleTest.java index 7a7cc091b3f26..07632814378d0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisTopicPublishRateThrottleTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PrecisTopicPublishRateThrottleTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterDisableTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterDisableTest.java index 24d8c85bae4a0..8dfed77814b35 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterDisableTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterDisableTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterTest.java index ae65ee71a1849..9d2bd49ba04bd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PublishRateLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java index 6de41a548cca1..169241f1d28b4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java index a51711bd31f99..62ba0e83c8600 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java index ec39fcda764e5..b97210b009a3b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java index 65e90966ea541..c61efdff26d80 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRemoveClusterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -22,6 +22,7 @@ import java.lang.reflect.Method; import java.util.UUID; import java.util.concurrent.TimeUnit; +import lombok.Cleanup; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.common.policies.data.TenantInfoImpl; @@ -81,6 +82,7 @@ public void testRemoveClusterFromNamespace() throws Exception { Assert.assertNotNull(repClient1); Assert.assertFalse(repClient1.isClosed()); + @Cleanup PulsarClient client = PulsarClient.builder() .serviceUrl(url1.toString()).statsInterval(0, TimeUnit.SECONDS) .build(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java index ea9a9a2b9f2b1..3982f44905d6b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorSubscriptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java index 09c7e042f58b7..e47d1018ae455 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -37,6 +37,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.SortedSet; @@ -75,6 +76,7 @@ import org.apache.pulsar.client.api.MessageRoutingMode; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.PulsarClient; +import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.RawMessage; import org.apache.pulsar.client.api.RawReader; import org.apache.pulsar.client.api.Schema; @@ -1168,6 +1170,40 @@ public void testUpdateGlobalTopicPartition() throws Exception { consumer2.close(); } + @Test + public void testIncrementPartitionsOfTopicWithReplicatedSubscription() throws Exception { + final String cluster1 = pulsar1.getConfig().getClusterName(); + final String cluster2 = pulsar2.getConfig().getClusterName(); + final String namespace = BrokerTestUtil.newUniqueName("pulsar/ns"); + final String topicName = BrokerTestUtil.newUniqueName("persistent://" + namespace + "/topic1"); + int startPartitions = 4; + int newPartitions = 8; + final String subscriberName = "sub1"; + admin1.namespaces().createNamespace(namespace, Sets.newHashSet(cluster1, cluster2)); + admin1.topics().createPartitionedTopic(topicName, startPartitions); + + @Cleanup + PulsarClient client1 = PulsarClient.builder().serviceUrl(url1.toString()).statsInterval(0, TimeUnit.SECONDS) + .build(); + + Consumer consumer1 = client1.newConsumer().topic(topicName).subscriptionName(subscriberName) + .replicateSubscriptionState(true) + .subscribe(); + + admin1.topics().updatePartitionedTopic(topicName, newPartitions); + + assertEquals(admin1.topics().getPartitionedTopicMetadata(topicName).partitions, newPartitions); + + Map replicatedSubscriptionStatus = + admin1.topics().getReplicatedSubscriptionStatus(topicName, subscriberName); + assertEquals(replicatedSubscriptionStatus.size(), newPartitions); + for (Map.Entry replicatedStatusForPartition : replicatedSubscriptionStatus.entrySet()) { + assertTrue(replicatedStatusForPartition.getValue(), + "Replicated status is invalid for " + replicatedStatusForPartition.getKey()); + } + consumer1.close(); + } + @DataProvider(name = "topicPrefix") public static Object[][] topicPrefix() { return new Object[][] { { "persistent://", "/persistent" }, { "non-persistent://", "/non-persistent" } }; @@ -1224,6 +1260,7 @@ public void testCleanupTopic() throws Exception { final String topicMlName = namespace + "/persistent/cleanTopic"; admin1.namespaces().createNamespace(namespace, Sets.newHashSet(cluster1, cluster2)); + @Cleanup PulsarClient client1 = PulsarClient.builder().serviceUrl(url1.toString()).statsInterval(0, TimeUnit.SECONDS) .build(); @@ -1349,6 +1386,7 @@ public void testDoNotReplicateSystemTopic() throws Exception { admin1.topics().createNonPartitionedTopic(topic); // Replicator will not replicate System Topic other than topic policies initTransaction(2, admin1, pulsar1.getBrokerServiceUrl(), pulsar1); + @Cleanup PulsarClient client = PulsarClient.builder().serviceUrl(pulsar1.getBrokerServiceUrl()) .enableTransaction(true).build(); TransactionImpl transaction = (TransactionImpl) client.newTransaction() @@ -1505,4 +1543,36 @@ public void testWhenUpdateReplicationCluster() throws Exception { assertTrue(topic.getReplicators().isEmpty()); }); } + + @Test + public void testReplicatorProducerNotExceed() throws Exception { + log.info("--- testReplicatorProducerNotExceed ---"); + String namespace1 = "pulsar/ns11"; + admin1.namespaces().createNamespace(namespace1); + admin1.namespaces().setNamespaceReplicationClusters(namespace1, Sets.newHashSet("r1", "r2")); + final TopicName dest1 = TopicName.get( + BrokerTestUtil.newUniqueName("persistent://" + namespace1 + "/testReplicatorProducerNotExceed1")); + String namespace2 = "pulsar/ns22"; + admin2.namespaces().createNamespace(namespace2); + admin2.namespaces().setNamespaceReplicationClusters(namespace2, Sets.newHashSet("r1", "r2")); + final TopicName dest2 = TopicName.get( + BrokerTestUtil.newUniqueName("persistent://" + namespace1 + "/testReplicatorProducerNotExceed2")); + admin1.topics().createPartitionedTopic(dest1.toString(), 1); + admin1.topicPolicies().setMaxProducers(dest1.toString(), 1); + admin2.topics().createPartitionedTopic(dest2.toString(), 1); + admin2.topicPolicies().setMaxProducers(dest2.toString(), 1); + @Cleanup + MessageProducer producer1 = new MessageProducer(url1, dest1); + log.info("--- Starting producer1 --- " + url1); + + producer1.produce(1); + + @Cleanup + MessageProducer producer2 = new MessageProducer(url2, dest2); + log.info("--- Starting producer2 --- " + url2); + + producer2.produce(1); + + Assert.assertThrows(PulsarClientException.ProducerBusyException.class, () -> new MessageProducer(url2, dest2)); + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java index 9768fbf28cdf7..11b0b8dd92fe4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java index d9bde8d4d5ac0..e1506d16188b0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java index 4248c8a5cb16b..c0281f073cfd4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -37,6 +37,7 @@ import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.SubscriptionType; import org.apache.pulsar.common.naming.TopicName; +import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride; import org.apache.pulsar.common.policies.data.DispatchRate; import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies; import org.apache.pulsar.common.policies.data.InactiveTopicDeleteMode; @@ -702,7 +703,7 @@ public void testReplicatorOffloadPolicies() throws Exception { init(namespace, persistentTopicName); OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl.create("s3", "region", "bucket", "endpoint", null, null, null, null, - 8, 9, 10L, null, OffloadedReadPriority.BOOKKEEPER_FIRST); + 8, 9, 10L, 10L, null, OffloadedReadPriority.BOOKKEEPER_FIRST); // local try { admin1.topicPolicies().setOffloadPolicies(persistentTopicName, offloadPolicies); @@ -763,6 +764,34 @@ public void testRemoveReplicationClusters() throws Exception { }); } + @Test + public void testReplicateAutoSubscriptionCreation() throws Exception { + final String namespace = "pulsar/partitionedNs-" + UUID.randomUUID(); + final String topic = "persistent://" + namespace + "/topic" + UUID.randomUUID(); + init(namespace, topic); + + AutoSubscriptionCreationOverride autoSubscriptionCreationOverride + = AutoSubscriptionCreationOverride.builder().allowAutoSubscriptionCreation(true).build(); + // local + admin1.topicPolicies().setAutoSubscriptionCreation(topic, autoSubscriptionCreationOverride); + Awaitility.await().untilAsserted(() -> + assertNull(admin2.topicPolicies().getAutoSubscriptionCreation(topic, false))); + Awaitility.await().untilAsserted(() -> + assertNull(admin3.topicPolicies().getAutoSubscriptionCreation(topic, false))); + // global + admin1.topicPolicies(true).setAutoSubscriptionCreation(topic, autoSubscriptionCreationOverride); + Awaitility.await().ignoreExceptions().untilAsserted(() -> assertEquals(admin2.topicPolicies(true) + .getAutoSubscriptionCreation(topic, false).isAllowAutoSubscriptionCreation(), true)); + Awaitility.await().ignoreExceptions().untilAsserted(() -> assertEquals(admin3.topicPolicies(true) + .getAutoSubscriptionCreation(topic, false).isAllowAutoSubscriptionCreation(), true)); + // remove auto subscription creation for a topic + admin1.topicPolicies(true).removeAutoSubscriptionCreation(topic); + Awaitility.await().untilAsserted(() -> + assertNull(admin2.topicPolicies(true).getAutoSubscriptionCreation(topic, false))); + Awaitility.await().untilAsserted(() -> + assertNull(admin3.topicPolicies(true).getAutoSubscriptionCreation(topic, false))); + } + private void init(String namespace, String topic) throws PulsarAdminException, PulsarClientException, PulsarServerException { final String cluster2 = pulsar2.getConfig().getClusterName(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java index ea0cd623f1dd1..3aedf75762d0a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxAuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxAuthorizationTest.java index c005b96d004cc..a2fc6d8130f48 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxAuthorizationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxAuthorizationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service; import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgsRecordingInvocations; @@ -140,7 +139,7 @@ public void beforeMethod() throws Exception { doReturn(pulsarResources).when(pulsar).getPulsarResources(); }); NamespaceResources namespaceResources = - spyWithClassAndConstructorArgsRecordingInvocations(NamespaceResources.class, store, store, 30); + spyWithClassAndConstructorArgsRecordingInvocations(NamespaceResources.class, store, 30); doReturn(namespaceResources).when(pulsarResources).getNamespaceResources(); TenantResources tenantResources = spyWithClassAndConstructorArgsRecordingInvocations(TenantResources.class, store, 30); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java index 0650cce32b588..97b58d99e3d20 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -141,7 +141,7 @@ import org.testng.annotations.Test; @SuppressWarnings("unchecked") -@Test(groups = "flaky") +@Test(groups = "broker") public class ServerCnxTest { protected EmbeddedChannel channel; private ServiceConfiguration svcConfig; @@ -217,7 +217,7 @@ public void setup() throws Exception { doReturn(executor).when(pulsar).getOrderedExecutor(); PulsarResources pulsarResources = spyWithClassAndConstructorArgs(PulsarResources.class, store, store); - namespaceResources = spyWithClassAndConstructorArgs(NamespaceResources.class, store, store, 30); + namespaceResources = spyWithClassAndConstructorArgs(NamespaceResources.class, store, 30); doReturn(namespaceResources).when(pulsarResources).getNamespaceResources(); doReturn(pulsarResources).when(pulsar).getPulsarResources(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SharedConsumerAssignorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SharedConsumerAssignorTest.java index 7649f6eac2d34..101bd1b21b495 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SharedConsumerAssignorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SharedConsumerAssignorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/StandaloneTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/StandaloneTest.java index 9b7b02407d826..5307e1a9ee874 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/StandaloneTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/StandaloneTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeDispatchLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeDispatchLimiterTest.java index 801e1be6a73d9..cfd33da2eb5f8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeDispatchLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeDispatchLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeRateTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeRateTest.java index 5b42a720c98c2..c6225fc9438a8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeRateTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscribeRateTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java index 0e73db5291e00..b6f1771c08882 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -34,6 +34,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.service.persistent.PersistentSubscription; import org.apache.pulsar.broker.service.persistent.PersistentTopic; @@ -226,6 +227,7 @@ public void testSeekForBatchMessageAndSpecifiedBatchIndex() throws Exception { assertEquals(batchMsgId0.getEntryId(), batchMsgId1.getEntryId()); assertEquals(batchMsgId1.getEntryId(), msgIdToSeekFirst.getEntryId()); + @Cleanup PulsarClient newPulsarClient = PulsarClient.builder() // set start backoff interval short enough to make sure client will re-connect quickly .startingBackoffInterval(1, TimeUnit.MICROSECONDS) @@ -261,8 +263,6 @@ public void testSeekForBatchMessageAndSpecifiedBatchIndex() throws Exception { MessageId receiveId = consumer.receive().getMessageId(); assertEquals(receiveId, messageId); } - - newPulsarClient.close(); } @Test diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java index d33d5341e0b40..7b66b6a6b5152 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicDispatchRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicDispatchRateLimiterTest.java index 5ff3c5ec9eb12..e0495ac077932 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicDispatchRateLimiterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicDispatchRateLimiterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListServiceTest.java index 924019f7a546d..2b0b852a27375 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListWatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListWatcherTest.java index 1a2e192d1f5fa..c232675779fca 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListWatcherTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListWatcherTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java index d8485f3f051c0..5a8fd34c9cdba 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPoliciesServiceDisableTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPoliciesServiceDisableTest.java index 123ad792262aa..c8790f399baf1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPoliciesServiceDisableTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPoliciesServiceDisableTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java index dedc9904ce846..4229c4fc16b7d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicTerminationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java index aa2a8d49e9c95..72f940d238d8c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMarkerDeleteTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java index cd073737cece9..06fdc13b98c94 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TransactionMetadataStoreServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java index 932c446669d33..64807c73852e3 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java index 13d0304717dd3..71caa1edb527c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ChecksumTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ChecksumTest.java index d6bfb0ae3273c..67d251313fba5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ChecksumTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ChecksumTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/DelayedDeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/DelayedDeliveryTest.java index 7f8059e1f0bf3..922fcd5899a7c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/DelayedDeliveryTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/DelayedDeliveryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java index 8b379928a830c..b4152b143ab6c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java index 10b1e4961ccfb..f19fff08de6a7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java index 0fc6db226a391..abedc1a66881a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentFailoverStreamingDispatcherE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentFailoverStreamingDispatcherE2ETest.java index 44bd7eee8ebfd..92352cde47ff0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentFailoverStreamingDispatcherE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentFailoverStreamingDispatcherE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumersTest.java index aa87b2aaa2584..1c23afd957a64 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumersTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumersTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -39,6 +39,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelPromise; +import io.netty.channel.EventLoopGroup; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -49,7 +50,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import io.netty.channel.EventLoopGroup; import org.apache.bookkeeper.common.util.OrderedExecutor; import org.apache.bookkeeper.mledger.Entry; import org.apache.bookkeeper.mledger.Position; @@ -148,8 +148,8 @@ public void setup() throws Exception { subscriptionMock = mock(PersistentSubscription.class); persistentDispatcher = new PersistentStickyKeyDispatcherMultipleConsumers( - topicMock, cursorMock, subscriptionMock, configMock, - new KeySharedMeta().setKeySharedMode(KeySharedMode.AUTO_SPLIT)); + topicMock, cursorMock, subscriptionMock, configMock, + new KeySharedMeta().setKeySharedMode(KeySharedMode.AUTO_SPLIT)); } public void cleanup() { @@ -184,31 +184,31 @@ public void testSendMarkerMessage() { } Awaitility.await().untilAsserted(() -> { - ArgumentCaptor totalMessagesCaptor = ArgumentCaptor.forClass(Integer.class); - verify(consumerMock, times(1)).sendMessages( - anyList(), - any(EntryBatchSizes.class), - any(EntryBatchIndexesAcks.class), - totalMessagesCaptor.capture(), - anyLong(), - anyLong(), - any(RedeliveryTracker.class) - ); - - List allTotalMessagesCaptor = totalMessagesCaptor.getAllValues(); - Assert.assertEquals(allTotalMessagesCaptor.get(0).intValue(), 5); - }); + ArgumentCaptor totalMessagesCaptor = ArgumentCaptor.forClass(Integer.class); + verify(consumerMock, times(1)).sendMessages( + anyList(), + any(EntryBatchSizes.class), + any(EntryBatchIndexesAcks.class), + totalMessagesCaptor.capture(), + anyLong(), + anyLong(), + any(RedeliveryTracker.class) + ); + + List allTotalMessagesCaptor = totalMessagesCaptor.getAllValues(); + Assert.assertEquals(allTotalMessagesCaptor.get(0).intValue(), 5); + }); } @Test(timeOut = 10000) public void testSendMessage() { KeySharedMeta keySharedMeta = new KeySharedMeta().setKeySharedMode(KeySharedMode.STICKY); PersistentStickyKeyDispatcherMultipleConsumers persistentDispatcher = new PersistentStickyKeyDispatcherMultipleConsumers( - topicMock, cursorMock, subscriptionMock, configMock, keySharedMeta); + topicMock, cursorMock, subscriptionMock, configMock, keySharedMeta); try { keySharedMeta.addHashRange() - .setStart(0) - .setEnd(9); + .setStart(0) + .setEnd(9); Consumer consumerMock = mock(Consumer.class); doReturn(keySharedMeta).when(consumerMock).getKeySharedMeta(); @@ -286,7 +286,10 @@ public void testSkipRedeliverTemporally() { // Change slowConsumer availablePermits to 1 // run PersistentStickyKeyDispatcherMultipleConsumers#sendMessagesToConsumers internally // and then stop to dispatch to slowConsumer - persistentDispatcher.sendMessagesToConsumers(PersistentStickyKeyDispatcherMultipleConsumers.ReadType.Normal, redeliverEntries); + if (persistentDispatcher.sendMessagesToConsumers(PersistentStickyKeyDispatcherMultipleConsumers.ReadType.Normal, + redeliverEntries, true)) { + persistentDispatcher.readMoreEntriesAsync(); + } Awaitility.await().untilAsserted(() -> { verify(consumerMock, times(1)).sendMessages( @@ -427,7 +430,7 @@ public void testMessageRedelivery() throws Exception { // (5) Run sendMessagesToConsumers internally // (6) Attempts to send message3 to consumer2 but skipped because redeliveryMessages contains message2 persistentDispatcher.sendMessagesToConsumers(PersistentStickyKeyDispatcherMultipleConsumers.ReadType.Replay, - redeliverEntries); + redeliverEntries, true); while (remainingEntriesNum.get() > 0) { // (7) Run readMoreEntries and resend message1 to consumer1 and message2-3 to consumer2 persistentDispatcher.readMoreEntries(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherBlockConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherBlockConsumerTest.java index c0259ae375c47..ef515cd85bf98 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherBlockConsumerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentStreamingDispatcherBlockConsumerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionMessageDispatchStreamingDispatcherThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionMessageDispatchStreamingDispatcherThrottlingTest.java index 042fb5f7bb1a4..fc62d84b58634 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionMessageDispatchStreamingDispatcherThrottlingTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionMessageDispatchStreamingDispatcherThrottlingTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java index 72e6caf070b1c..e869d71e80c4a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java index a6fe95e781884..b4aa4793ba6fc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -33,4 +33,10 @@ protected void doInitConf() throws Exception { super.doInitConf(); conf.setStreamingDispatch(true); } + + @Override + @Test + public void testMessageRedelivery() throws Exception { + super.testMessageRedelivery(); + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherTest.java index 50aafd2ef1c63..e0740a234e1a4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java index a687381090d59..aa05624a5b0c9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionConfigTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionConfigTest.java index aa513661f1bd5..aa0015742f662 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionConfigTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionConfigTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCacheTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCacheTest.java index dc3eeec83540d..c269b098c6b88 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCacheTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionSnapshotCacheTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java index fec99a9b975fe..4ae923bd2443c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsSnapshotBuilderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowReplicatorTest.java index 822627f12b41d..cc169f355f023 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowReplicatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowReplicatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service.persistent; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; @@ -31,7 +31,6 @@ import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.SubscriptionInitialPosition; import org.apache.pulsar.common.policies.data.TenantInfoImpl; -import org.assertj.core.util.Lists; import org.awaitility.Awaitility; import org.testng.Assert; import org.testng.annotations.BeforeClass; @@ -63,10 +62,14 @@ public void testShadowReplication() throws Exception { String shadowTopicName = "persistent://prop1/ns-shadow/shadow-topic"; String shadowTopicName2 = "persistent://prop1/ns-shadow/shadow-topic-2"; + admin.topics().createNonPartitionedTopic(sourceTopicName); + admin.topics().createShadowTopic(shadowTopicName, sourceTopicName); + admin.topics().createShadowTopic(shadowTopicName2, sourceTopicName); + admin.topics().setShadowTopics(sourceTopicName, Lists.newArrayList(shadowTopicName, shadowTopicName2)); + @Cleanup Producer producer = pulsarClient.newProducer().topic(sourceTopicName).create(); - // NOTE: shadow topic is not ready yet. So use normal topic instead. - // The only difference for consumer should be that the message id is changed. + @Cleanup Consumer shadowConsumer = pulsarClient.newConsumer().topic(shadowTopicName).subscriptionName("shadow-sub") @@ -79,8 +82,6 @@ public void testShadowReplication() throws Exception { PersistentTopic sourceTopic = (PersistentTopic) pulsar.getBrokerService().getTopicIfExists(sourceTopicName).get().get(); - admin.topics().setShadowTopics(sourceTopicName, Lists.newArrayList(shadowTopicName, shadowTopicName2)); - Awaitility.await().untilAsserted(()->Assert.assertEquals(sourceTopic.getShadowReplicators().size(), 2)); ShadowReplicator @@ -130,7 +131,6 @@ public void testShadowReplication() throws Exception { //`replicatedFrom` is set as localClusterName in shadow topic. Assert.assertNotEquals(shadowMessage.getReplicatedFrom(), sourceMessage.getReplicatedFrom()); - //Currently, msg is copied in BK. So the message id is not the same. - Assert.assertNotEquals(shadowMessage.getMessageId(), sourceMessage.getMessageId()); + Assert.assertEquals(shadowMessage.getMessageId(), sourceMessage.getMessageId()); } } \ No newline at end of file diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowTopicTest.java index 22bfd70cf8883..5f8e8f6ffd9b9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/ShadowTopicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,14 +16,28 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service.persistent; +import com.google.common.collect.Lists; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; +import lombok.AllArgsConstructor; +import lombok.Cleanup; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.impl.ShadowManagedLedgerImpl; import org.apache.pulsar.broker.service.BrokerTestBase; +import org.apache.pulsar.client.api.Consumer; +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.api.MessageId; +import org.apache.pulsar.client.api.Producer; +import org.apache.pulsar.client.api.PulsarClientException; +import org.apache.pulsar.client.api.Schema; +import org.apache.pulsar.client.api.SubscriptionInitialPosition; import org.apache.pulsar.common.naming.TopicName; +import org.awaitility.Awaitility; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -44,10 +58,14 @@ protected void cleanup() throws Exception { internalCleanup(); } - @Test() + private String newShadowSourceTopicName() { + return "persistent://" + newTopicName(); + } + + @Test public void testNonPartitionedShadowTopicSetup() throws Exception { - String sourceTopic = "persistent://prop/ns-abc/source"; - String shadowTopic = "persistent://prop/ns-abc/shadow"; + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; //1. test shadow topic setting in topic creation. admin.topics().createNonPartitionedTopic(sourceTopic); admin.topics().createShadowTopic(shadowTopic, sourceTopic); @@ -66,20 +84,22 @@ public void testNonPartitionedShadowTopicSetup() throws Exception { Assert.assertEquals(brokerShadowTopic.getShadowSourceTopic().get().toString(), sourceTopic); } - @Test() + @Test public void testPartitionedShadowTopicSetup() throws Exception { - String sourceTopic = "persistent://prop/ns-abc/source-p"; - String shadowTopic = "persistent://prop/ns-abc/shadow-p"; + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; + String sourceTopicPartition = TopicName.get(sourceTopic).getPartition(0).toString(); String shadowTopicPartition = TopicName.get(shadowTopic).getPartition(0).toString(); //1. test shadow topic setting in topic creation. admin.topics().createPartitionedTopic(sourceTopic, 2); admin.topics().createShadowTopic(shadowTopic, sourceTopic); pulsarClient.newProducer().topic(shadowTopic).create().close();//trigger loading partitions. + PersistentTopic brokerShadowTopic = (PersistentTopic) pulsar.getBrokerService() .getTopicIfExists(shadowTopicPartition).get().get(); Assert.assertTrue(brokerShadowTopic.getManagedLedger() instanceof ShadowManagedLedgerImpl); - Assert.assertEquals(brokerShadowTopic.getShadowSourceTopic().get().toString(), sourceTopic); + Assert.assertEquals(brokerShadowTopic.getShadowSourceTopic().get().toString(), sourceTopicPartition); Assert.assertEquals(admin.topics().getShadowSource(shadowTopic), sourceTopic); //2. test shadow topic could be properly loaded after unload. @@ -90,8 +110,135 @@ public void testPartitionedShadowTopicSetup() throws Exception { brokerShadowTopic = (PersistentTopic) pulsar.getBrokerService().getTopicIfExists(shadowTopicPartition).get().get(); Assert.assertTrue(brokerShadowTopic.getManagedLedger() instanceof ShadowManagedLedgerImpl); - Assert.assertEquals(brokerShadowTopic.getShadowSourceTopic().get().toString(), sourceTopic); + Assert.assertEquals(brokerShadowTopic.getShadowSourceTopic().get().toString(), sourceTopicPartition); + } + + @Test + public void testShadowTopicNotWritable() throws Exception { + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; + admin.topics().createNonPartitionedTopic(sourceTopic); + admin.topics().createShadowTopic(shadowTopic, sourceTopic); + @Cleanup + Producer producer = pulsarClient.newProducer().topic(shadowTopic).create(); + Assert.expectThrows(PulsarClientException.NotAllowedException.class, ()-> producer.send(new byte[]{1,2,3})); } + private void awaitUntilShadowReplicatorReady(String sourceTopic, String shadowTopic) { + Awaitility.await().untilAsserted(()->{ + PersistentTopic sourcePersistentTopic = + (PersistentTopic) pulsar.getBrokerService().getTopicIfExists(sourceTopic).get().get(); + ShadowReplicator + replicator = (ShadowReplicator) sourcePersistentTopic.getShadowReplicators().get(shadowTopic); + if (replicator == null) { + return; + } + Assert.assertEquals(String.valueOf(replicator.getState()), "Started"); + }); + } + @Test + public void testShadowTopicConsuming() throws Exception { + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; + admin.topics().createNonPartitionedTopic(sourceTopic); + admin.topics().createShadowTopic(shadowTopic, sourceTopic); + admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic)); + awaitUntilShadowReplicatorReady(sourceTopic, shadowTopic); + @Cleanup Producer producer = pulsarClient.newProducer().topic(sourceTopic).create(); + @Cleanup Consumer consumer = + pulsarClient.newConsumer().topic(shadowTopic).subscriptionName("sub").subscribe(); + byte[] content = "Hello Shadow Topic".getBytes(StandardCharsets.UTF_8); + MessageId id = producer.send(content); + log.info("msg send to source topic, id={}", id); + Message msg = consumer.receive(5, TimeUnit.SECONDS); + Assert.assertEquals(msg.getMessageId(), id); + Assert.assertEquals(msg.getValue(), content); + } + + + @Test + public void testShadowTopicConsumingWithStringSchema() throws Exception { + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; + admin.topics().createNonPartitionedTopic(sourceTopic); + admin.topics().createShadowTopic(shadowTopic, sourceTopic); + admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic)); + awaitUntilShadowReplicatorReady(sourceTopic, shadowTopic); + + @Cleanup Producer producer = pulsarClient.newProducer(Schema.STRING).topic(sourceTopic).create(); + @Cleanup Consumer consumer = + pulsarClient.newConsumer(Schema.STRING).topic(shadowTopic).subscriptionName("sub") + .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest).subscribe(); + String content = "Hello Shadow Topic"; + MessageId id = producer.send(content); + Message msg = consumer.receive(); + Assert.assertEquals(msg.getMessageId(), id); + Assert.assertEquals(msg.getValue(), content); + + for (int i = 0; i < 10; i++) { + producer.send(content + i); + } + for (int i = 0; i < 10; i++) { + Assert.assertEquals(consumer.receive().getValue(), content + i); + } + } + + @AllArgsConstructor + @NoArgsConstructor + @Data + private static class Point { + int x; + int y; + } + @Test + public void testShadowTopicConsumingWithJsonSchema() throws Exception { + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; + admin.topics().createNonPartitionedTopic(sourceTopic); + admin.topics().createShadowTopic(shadowTopic, sourceTopic); + admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic)); + awaitUntilShadowReplicatorReady(sourceTopic, shadowTopic); + + + @Cleanup Producer producer = + pulsarClient.newProducer(Schema.JSON(Point.class)).topic(sourceTopic).create(); + @Cleanup Consumer consumer = + pulsarClient.newConsumer(Schema.JSON(Point.class)).topic(shadowTopic).subscriptionName("sub") + .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest).subscribe(); + Point content = new Point(1, 2); + MessageId id = producer.send(content); + Message msg = consumer.receive(); + Assert.assertEquals(msg.getMessageId(), id); + Assert.assertEquals(msg.getValue(), content); + } + + @Test + public void testConsumeShadowMessageWithoutCache() throws Exception { + String sourceTopic = newShadowSourceTopicName(); + String shadowTopic = sourceTopic + "-shadow"; + admin.topics().createNonPartitionedTopic(sourceTopic); + @Cleanup Producer producer = pulsarClient.newProducer(Schema.STRING).topic(sourceTopic).create(); + String content = "Hello Shadow Topic"; + MessageId id = producer.send(content); + for (int i = 0; i < 10; i++) { + producer.send(content + i); + } + + admin.topics().createShadowTopic(shadowTopic, sourceTopic); + // disable shadow replicator + // admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic)); + @Cleanup Consumer consumer = + pulsarClient.newConsumer(Schema.STRING).topic(shadowTopic).subscriptionName("sub") + .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest) + .subscribe(); + + Message msg = consumer.receive(); + Assert.assertEquals(msg.getMessageId(), id); + Assert.assertEquals(msg.getValue(), content); + + for (int i = 0; i < 10; i++) { + Assert.assertEquals(consumer.receive().getValue(), content + i); + } + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/SimpleProducerConsumerTestStreamingDispatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/SimpleProducerConsumerTestStreamingDispatcherTest.java index 7ed7981c9374b..706571eeb712f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/SimpleProducerConsumerTestStreamingDispatcherTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/SimpleProducerConsumerTestStreamingDispatcherTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java index 23136ea93443b..e57092d02dd5d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/TopicDuplicationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilter2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilter2Test.java index dbcaa160b2391..bb7d4c32724fc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilter2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilter2Test.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProducerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProducerTest.java index 5973b7fe54b56..a75ca64cf73fe 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProducerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProducerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProviderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProviderTest.java index 4c8f787b7136b..8aff4db0e1183 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProviderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterProviderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.broker.service.plugin; import static org.apache.pulsar.broker.service.plugin.EntryFilterProvider.ENTRY_FILTER_DEFINITION_FILE; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterTest.java index 19175e936c4b7..a2fe1d7d92a6c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/EntryFilterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java index f10bc1ee864e1..9825491c80302 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheckTest.java index ed9c90f00682b..090b3654719da 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/AvroSchemaCompatibilityCheckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BaseAvroSchemaCompatibilityTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BaseAvroSchemaCompatibilityTest.java index 7b1987ad09fe4..a7fcf40b284ae 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BaseAvroSchemaCompatibilityTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BaseAvroSchemaCompatibilityTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageTest.java index 6d89fef19a5d1..d0c2e149bf438 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ClientGetSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ClientGetSchemaTest.java index 67b16f86614e3..970e6b2712981 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ClientGetSchemaTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ClientGetSchemaTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java index 9bf0189037a3a..cd47bc373b31a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java index a2e3bed7bbf52..a90211d0b1d91 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/PartitionedTopicsSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/PartitionedTopicsSchemaTest.java index 11be95c783c44..d2a0b501e8282 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/PartitionedTopicsSchemaTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/PartitionedTopicsSchemaTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheckTest.java index d30ea1c0f23e8..dead7797c6811 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufNativeSchemaCompatibilityCheckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheckTest.java index e16fdb084c4e2..8822087178c7f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/ProtobufSchemaCompatibilityCheckTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java index 91d7706655ec0..a2bd506a8f939 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/SchemaServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidatorTest.java index ce851b6e6ce72..160adb78de564 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaDataValidatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java index d79a03d7f0479..c574a0d830d38 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/validator/SchemaRegistryServiceWithSchemaDataValidatorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java index 0a63e7a2b3ed5..5eb29b8ef2870 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/utils/ClientChannelHelper.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/utils/ClientChannelHelper.java index afd071a858bbf..33d954f7bfa0a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/utils/ClientChannelHelper.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/utils/ClientChannelHelper.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BookieClientsStatsGeneratorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BookieClientsStatsGeneratorTest.java index 0db0515c2fc07..8ec87b2ec543b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BookieClientsStatsGeneratorTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BookieClientsStatsGeneratorTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java index 7eb96e2bd5880..d2eea9e13e4d8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/DimensionStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/DimensionStatsTest.java index 504f37ddee89b..62d51377f425c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/DimensionStatsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/DimensionStatsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java index f9ff2d2081d2e..522790fa5fab5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/LedgerOffloaderMetricsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java index 6ad17b7d27eb1..7f8c71cb1390c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java index cd07b7f6e25b9..c2b5c3d834c29 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetadataStoreStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetadataStoreStatsTest.java index eba134a2c8dfe..3ce735b797fb1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetadataStoreStatsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetadataStoreStatsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -137,4 +137,86 @@ public void testMetadataStoreStats() throws Exception { } } + @Test + public void testBatchMetadataStoreMetrics() throws Exception { + String ns = "prop/ns-abc1"; + admin.namespaces().createNamespace(ns); + + String topic = "persistent://prop/ns-abc1/metadata-store-" + UUID.randomUUID(); + String subName = "my-sub1"; + + @Cleanup + Producer producer = pulsarClient.newProducer(Schema.STRING) + .topic(topic).create(); + @Cleanup + Consumer consumer = pulsarClient.newConsumer(Schema.STRING) + .topic(topic).subscriptionName(subName).subscribe(); + + for (int i = 0; i < 100; i++) { + producer.newMessage().value(UUID.randomUUID().toString()).send(); + } + + for (;;) { + Message message = consumer.receive(10, TimeUnit.SECONDS); + if (message == null) { + break; + } + consumer.acknowledge(message); + } + + ByteArrayOutputStream output = new ByteArrayOutputStream(); + PrometheusMetricsGenerator.generate(pulsar, false, false, false, false, output); + String metricsStr = output.toString(); + Multimap metricsMap = PrometheusMetricsTest.parseMetrics(metricsStr); + + Collection executorQueueSize = metricsMap.get("pulsar_batch_metadata_store_executor_queue_size"); + Collection opsWaiting = metricsMap.get("pulsar_batch_metadata_store_queue_wait_time_ms" + "_sum"); + Collection batchExecuteTime = metricsMap.get("pulsar_batch_metadata_store_batch_execute_time_ms" + "_sum"); + Collection opsPerBatch = metricsMap.get("pulsar_batch_metadata_store_batch_size" + "_sum"); + + Assert.assertTrue(executorQueueSize.size() > 1); + Assert.assertTrue(opsWaiting.size() > 1); + Assert.assertTrue(batchExecuteTime.size() > 0); + Assert.assertTrue(opsPerBatch.size() > 0); + + for (PrometheusMetricsTest.Metric m : executorQueueSize) { + Assert.assertEquals(m.tags.get("cluster"), "test"); + String metadataStoreName = m.tags.get("name"); + Assert.assertNotNull(metadataStoreName); + Assert.assertTrue(metadataStoreName.equals(MetadataStoreConfig.METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.CONFIGURATION_METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.STATE_METADATA_STORE)); + Assert.assertTrue(m.value >= 0); + } + for (PrometheusMetricsTest.Metric m : opsWaiting) { + Assert.assertEquals(m.tags.get("cluster"), "test"); + String metadataStoreName = m.tags.get("name"); + Assert.assertNotNull(metadataStoreName); + Assert.assertTrue(metadataStoreName.equals(MetadataStoreConfig.METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.CONFIGURATION_METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.STATE_METADATA_STORE)); + Assert.assertTrue(m.value >= 0); + } + + for (PrometheusMetricsTest.Metric m : batchExecuteTime) { + Assert.assertEquals(m.tags.get("cluster"), "test"); + String metadataStoreName = m.tags.get("name"); + Assert.assertNotNull(metadataStoreName); + Assert.assertTrue(metadataStoreName.equals(MetadataStoreConfig.METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.CONFIGURATION_METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.STATE_METADATA_STORE)); + Assert.assertTrue(m.value > 0); + } + + for (PrometheusMetricsTest.Metric m : opsPerBatch) { + Assert.assertEquals(m.tags.get("cluster"), "test"); + String metadataStoreName = m.tags.get("name"); + Assert.assertNotNull(metadataStoreName); + Assert.assertTrue(metadataStoreName.equals(MetadataStoreConfig.METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.CONFIGURATION_METADATA_STORE) + || metadataStoreName.equals(MetadataStoreConfig.STATE_METADATA_STORE)); + Assert.assertTrue(m.value > 0); + } + } + } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetricsAuthenticationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetricsAuthenticationTest.java index 0866729586fe9..2a51c52146dbc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetricsAuthenticationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/MetricsAuthenticationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java index cfab570301873..db59942e15ce5 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -28,32 +28,38 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import io.jsonwebtoken.SignatureAlgorithm; +import io.prometheus.client.Collector; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Field; import java.math.RoundingMode; import java.nio.charset.StandardCharsets; import java.text.NumberFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Properties; import java.util.Random; +import java.util.Set; import java.util.TreeMap; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import javax.crypto.SecretKey; import javax.naming.AuthenticationException; import lombok.Cleanup; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.authentication.AuthenticationDataSource; import org.apache.pulsar.broker.authentication.AuthenticationProviderToken; @@ -80,7 +86,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = "flaky") +@Test(groups = "broker") public class PrometheusMetricsTest extends BrokerTestBase { @BeforeMethod(alwaysRun = true) @@ -352,6 +358,88 @@ public void testPerTopicStats() throws Exception { c2.close(); } + /** + * Test that the total message and byte counts for a topic are not reset when a consumer disconnects. + * + * @throws Exception + */ + @Test + public void testPerTopicStatsReconnect() throws Exception { + Producer p1 = pulsarClient.newProducer().topic("persistent://my-property/use/my-ns/my-topic1").create(); + + Consumer c1 = pulsarClient.newConsumer() + .topic("persistent://my-property/use/my-ns/my-topic1") + .subscriptionName("test") + .subscribe(); + + final int messages = 5; + final int pulsarMessageOverhead = 31; // Number of extra bytes pulsar adds to each message + final int messageSizeBytes = "my-message-n".getBytes().length + pulsarMessageOverhead; + + for (int i = 0; i < messages; i++) { + String message = "my-message-" + i; + p1.send(message.getBytes()); + } + + for (int i = 0; i < messages; i++) { + c1.acknowledge(c1.receive()); + } + + c1.close(); + + for (int i = 0; i < messages; i++) { + String message = "my-message-" + i; + p1.send(message.getBytes()); + } + + Consumer c2 = pulsarClient.newConsumer() + .topic("persistent://my-property/use/my-ns/my-topic1") + .subscriptionName("test") + .subscribe(); + + for (int i = 0; i < messages; i++) { + c2.acknowledge(c2.receive()); + } + + p1.close(); + c2.close(); + + ByteArrayOutputStream statsOut = new ByteArrayOutputStream(); + PrometheusMetricsGenerator.generate(pulsar, true, false, false, statsOut); + String metricsStr = statsOut.toString(); + Multimap metrics = parseMetrics(metricsStr); + + metrics.entries().forEach(e -> { + System.out.println(e.getKey() + ": " + e.getValue()); + }); + + List cm = (List) metrics.get("pulsar_in_bytes_total"); + assertEquals(cm.size(), 1); + assertEquals(cm.get(0).value, (messageSizeBytes * messages * 2)); + assertEquals(cm.get(0).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1"); + assertEquals(cm.get(0).tags.get("namespace"), "my-property/use/my-ns"); + + cm = (List) metrics.get("pulsar_in_messages_total"); + assertEquals(cm.size(), 1); + assertEquals(cm.get(0).value, (messages * 2)); + assertEquals(cm.get(0).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1"); + assertEquals(cm.get(0).tags.get("namespace"), "my-property/use/my-ns"); + + cm = (List) metrics.get("pulsar_out_bytes_total"); + assertEquals(cm.size(), 1); + assertEquals(cm.get(0).value, (messageSizeBytes * messages * 2)); + assertEquals(cm.get(0).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1"); + assertEquals(cm.get(0).tags.get("namespace"), "my-property/use/my-ns"); + assertEquals(cm.get(0).tags.get("subscription"), "test"); + + cm = (List) metrics.get("pulsar_out_messages_total"); + assertEquals(cm.size(), 1); + assertEquals(cm.get(0).value, (messages * 2)); + assertEquals(cm.get(0).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1"); + assertEquals(cm.get(0).tags.get("namespace"), "my-property/use/my-ns"); + assertEquals(cm.get(0).tags.get("subscription"), "test"); + } + @Test public void testPerTopicExpiredStat() throws Exception { String ns = "prop/ns-abc1"; @@ -773,6 +861,13 @@ public void testPerConsumerStats() throws Exception { // Running the test twice to make sure types are present when generated multiple times @Test(invocationCount = 2) public void testDuplicateMetricTypeDefinitions() throws Exception { + cleanup(); + conf.setTransactionCoordinatorEnabled(true); + conf.setTransactionLogBatchedWriteEnabled(true); + conf.setTransactionPendingAckBatchedWriteEnabled(true); + setup(); + + Set allPrometheusSuffixString = allPrometheusSuffixEnums(); Producer p1 = pulsarClient.newProducer().topic("persistent://my-property/use/my-ns/my-topic1").create(); Producer p2 = pulsarClient.newProducer().topic("persistent://my-property/use/my-ns/my-topic2").create(); for (int i = 0; i < 10; i++) { @@ -831,32 +926,18 @@ public void testDuplicateMetricTypeDefinitions() throws Exception { if (!typeDefs.containsKey(metricName)) { // This may be OK if this is a _sum or _count metric from a summary - if (metricName.endsWith("_sum")) { - String summaryMetricName = metricName.substring(0, metricName.indexOf("_sum")); - if (!typeDefs.containsKey(summaryMetricName)) { - fail("Metric " + metricName + " does not have a corresponding summary type definition"); - } - } else if (metricName.endsWith("_count")) { - String summaryMetricName = metricName.substring(0, metricName.indexOf("_count")); - if (!typeDefs.containsKey(summaryMetricName)) { - fail("Metric " + metricName + " does not have a corresponding summary type definition"); - } - } else if (metricName.endsWith("_bucket")) { - String summaryMetricName = metricName.substring(0, metricName.indexOf("_bucket")); - if (!typeDefs.containsKey(summaryMetricName)) { - fail("Metric " + metricName + " does not have a corresponding summary type definition"); + boolean isNorm = false; + for (String suffix : allPrometheusSuffixString){ + if (metricName.endsWith(suffix)){ + String summaryMetricName = metricName.substring(0, metricName.indexOf(suffix)); + if (!typeDefs.containsKey(summaryMetricName)) { + fail("Metric " + metricName + " does not have a corresponding summary type definition"); + } + isNorm = true; + break; } - } else if (metricName.endsWith("_created")) { - String summaryMetricName = metricName.substring(0, metricName.indexOf("_created")); - if (!typeDefs.containsKey(summaryMetricName)) { - fail("Metric " + metricName + " does not have a corresponding summary type definition"); - } - } else if (metricName.endsWith("_total")) { - String summaryMetricName = metricName.substring(0, metricName.indexOf("_total")); - if (!typeDefs.containsKey(summaryMetricName)) { - fail("Metric " + metricName + " does not have a corresponding counter type definition"); - } - } else { + } + if (!isNorm){ fail("Metric " + metricName + " does not have a type definition"); } @@ -865,8 +946,30 @@ public void testDuplicateMetricTypeDefinitions() throws Exception { p1.close(); p2.close(); + + conf.setTransactionCoordinatorEnabled(false); + conf.setTransactionLogBatchedWriteEnabled(false); + conf.setTransactionPendingAckBatchedWriteEnabled(false); } + /*** + * this method will return ["_sum", "_info", "_bucket", "_count", "_total", "_created", "_gsum", "_gcount"] + */ + public static Set allPrometheusSuffixEnums(){ + HashSet result = new HashSet<>(); + final String metricsName = "123"; + for (Collector.Type type : Collector.Type.values()){ + Collector.MetricFamilySamples metricFamilySamples = + new Collector.MetricFamilySamples(metricsName, type, "", new ArrayList<>()); + result.addAll(Arrays.asList(metricFamilySamples.getNames())); + } + return result.stream() + .map(str -> str.substring(metricsName.length())) + .filter(str -> StringUtils.isNotBlank(str)) + .collect(Collectors.toSet()); + } + + @Test public void testManagedLedgerCacheStats() throws Exception { Producer p1 = pulsarClient.newProducer().topic("persistent://my-property/use/my-ns/my-topic1").create(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java index 31a833047e742..50419dcde447a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TimeWindowTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TimeWindowTest.java index 26812e495f0d3..89528c1965397 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TimeWindowTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TimeWindowTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionBatchWriterMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionBatchWriterMetricsTest.java index ceed05884df2e..b0b2fcce351ff 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionBatchWriterMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionBatchWriterMetricsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -41,6 +41,7 @@ import org.apache.pulsar.broker.resources.ClusterResources; import org.apache.pulsar.broker.resources.NamespaceResources; import org.apache.pulsar.broker.resources.TenantResources; +import org.apache.pulsar.broker.transaction.pendingack.impl.MLPendingAckStoreProvider; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Message; import org.apache.pulsar.client.api.Producer; @@ -56,6 +57,7 @@ import org.apache.pulsar.common.policies.data.ClusterData; import org.apache.pulsar.common.policies.data.Policies; import org.apache.pulsar.common.policies.data.TenantInfoImpl; +import org.apache.pulsar.transaction.coordinator.impl.MLTransactionMetadataStoreProvider; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -75,6 +77,8 @@ public class TransactionBatchWriterMetricsTest extends MockedPulsarServiceBaseTe @BeforeClass public void setup() throws Exception { + MLTransactionMetadataStoreProvider.initBufferedWriterMetrics("localhost"); + MLPendingAckStoreProvider.initBufferedWriterMetrics("localhost"); super.internalSetup(); } @@ -130,7 +134,7 @@ public void testTransactionMetaLogMetrics() throws Exception{ // verify tc. String metrics_key_txn_tc_record_count_sum = - "pulsar_txn_tc_bufferedwriter_batch_record_count_sum{cluster=\"%s\",broker=\"%s\"} "; + "pulsar_txn_tc_bufferedwriter_batch_records_sum{cluster=\"%s\",broker=\"%s\"} "; Assert.assertTrue(searchMetricsValue(metricsLines, String.format(metrics_key_txn_tc_record_count_sum, metricsLabelCluster, metricsLabelBroker)) > 0); @@ -146,7 +150,7 @@ public void testTransactionMetaLogMetrics() throws Exception{ > 0); // verify pending ack. String metrics_key_txn_pending_ack_record_count_sum = - "pulsar_txn_pending_ack_store_bufferedwriter_batch_record_count_sum{cluster=\"%s\",broker=\"%s\"} "; + "pulsar_txn_pending_ack_store_bufferedwriter_batch_records_sum{cluster=\"%s\",broker=\"%s\"} "; Assert.assertTrue(searchMetricsValue(metricsLines, String.format(metrics_key_txn_pending_ack_record_count_sum, metricsLabelCluster, metricsLabelBroker)) > 0); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java index 1f4163e65e065..766e0b90d693f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,11 +18,22 @@ */ package org.apache.pulsar.broker.stats; +import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.pulsar.broker.stats.PrometheusMetricsTest.parseMetrics; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import com.google.common.base.Splitter; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; import lombok.extern.slf4j.Slf4j; @@ -50,18 +61,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.ByteArrayOutputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.pulsar.broker.stats.PrometheusMetricsTest.parseMetrics; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; @Slf4j public class TransactionMetricsTest extends BrokerTestBase { @@ -82,6 +81,7 @@ protected void afterSetup() throws Exception { .build()); admin.namespaces().createNamespace(NamespaceName.SYSTEM_NAMESPACE.toString()); createTransactionCoordinatorAssign(); + replacePulsarClient(PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true)); } @AfterMethod(alwaysRun = true) @@ -91,7 +91,7 @@ protected void cleanup() throws Exception { } @Test - public void testTransactionCoordinatorMetrics() throws Exception{ + public void testTransactionCoordinatorMetrics() throws Exception { long timeout = 10000; admin.lookups().lookupTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN.toString()); TransactionCoordinatorID transactionCoordinatorIDOne = TransactionCoordinatorID.get(0); @@ -123,7 +123,7 @@ public void testTransactionCoordinatorMetrics() throws Exception{ } @Test - public void testTransactionCoordinatorRateMetrics() throws Exception{ + public void testTransactionCoordinatorRateMetrics() throws Exception { int txnCount = 120; String ns1 = "prop/ns-abc1"; admin.namespaces().createNamespace(ns1); @@ -134,7 +134,7 @@ public void testTransactionCoordinatorRateMetrics() throws Exception{ pulsar.getTransactionMetadataStoreService().handleTcClientConnect(transactionCoordinatorIDOne); admin.topics().createNonPartitionedTopic(topic); admin.topics().createSubscription(topic, subName, MessageId.earliest); - Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> + Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() == 1); @@ -142,7 +142,6 @@ public void testTransactionCoordinatorRateMetrics() throws Exception{ .subscriptionName(subName).topic(topic).subscribe(); List list = new ArrayList<>(); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); for (int i = 0; i < txnCount; i++) { TransactionImpl transaction = (TransactionImpl) pulsarClient.newTransaction() @@ -150,13 +149,13 @@ public void testTransactionCoordinatorRateMetrics() throws Exception{ TxnID txnID = new TxnID(transaction.getTxnIdMostBits(), transaction.getTxnIdLeastBits()); list.add(txnID); if (i == 1) { - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); consumer.acknowledgeAsync(new MessageIdImpl(1000, 1000, -1), transaction).get(); continue; } if (i % 2 == 0) { - pulsar.getTransactionMetadataStoreService().addProducedPartitionToTxn(list.get(i), Collections.singletonList(topic)).get(); + pulsar.getTransactionMetadataStoreService() + .addProducedPartitionToTxn(list.get(i), Collections.singletonList(topic)).get(); } else { pulsar.getTransactionMetadataStoreService().addAckedPartitionToTxn(list.get(i), Collections.singletonList(TransactionSubscription.builder().topic(topic) @@ -167,7 +166,7 @@ public void testTransactionCoordinatorRateMetrics() throws Exception{ for (int i = 0; i < txnCount; i++) { if (i % 2 == 0) { pulsar.getTransactionMetadataStoreService().endTransaction(list.get(i), TxnAction.COMMIT_VALUE, - false).get(); + false).get(); } else { pulsar.getTransactionMetadataStoreService().endTransaction(list.get(i), TxnAction.ABORT_VALUE, false).get(); @@ -198,7 +197,7 @@ public void testTransactionCoordinatorRateMetrics() throws Exception{ Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> { try { - pulsar.getTransactionMetadataStoreService() + pulsar.getTransactionMetadataStoreService() .getStores().get(transactionCoordinatorIDOne).getTxnMeta(txnID).get(); } catch (Exception e) { return true; @@ -226,7 +225,7 @@ public void testTransactionCoordinatorRateMetrics() throws Exception{ } @Test - public void testManagedLedgerMetrics() throws Exception{ + public void testManagedLedgerMetrics() throws Exception { cleanup(); ServiceConfiguration serviceConfiguration = getDefaultConf(); serviceConfiguration.setTopicLevelPoliciesEnabled(false); @@ -244,10 +243,9 @@ public void testManagedLedgerMetrics() throws Exception{ pulsar.getTransactionMetadataStoreService().handleTcClientConnect(transactionCoordinatorIDOne).get(); admin.topics().createSubscription(topic, subName, MessageId.earliest); - Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> + Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() == 1); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); Consumer consumer = pulsarClient.newConsumer() .topic(topic) .receiverQueueSize(10) @@ -294,7 +292,7 @@ public void testManagedLedgerMetrics() throws Exception{ } @Test - public void testManagedLedgerMetricsWhenPendingAckNotInit() throws Exception{ + public void testManagedLedgerMetricsWhenPendingAckNotInit() throws Exception { String ns1 = "prop/ns-abc1"; admin.namespaces().createNamespace(ns1); String topic = "persistent://" + ns1 + "/testManagedLedgerMetricsWhenPendingAckNotInit"; @@ -307,11 +305,9 @@ public void testManagedLedgerMetricsWhenPendingAckNotInit() throws Exception{ admin.topics().createSubscription(topic, subName, MessageId.earliest); admin.topics().createSubscription(topic, subName2, MessageId.earliest); - Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> + Awaitility.await().atMost(2000, TimeUnit.MILLISECONDS).until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() == 1); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); - Consumer consumer = pulsarClient.newConsumer() .topic(topic) .receiverQueueSize(10) @@ -361,7 +357,7 @@ public void testManagedLedgerMetricsWhenPendingAckNotInit() throws Exception{ } @Test - public void testDuplicateMetricTypeDefinitions() throws Exception{ + public void testDuplicateMetricTypeDefinitions() throws Exception { admin.lookups().lookupTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN.toString()); TransactionCoordinatorID transactionCoordinatorIDOne = TransactionCoordinatorID.get(0); TransactionCoordinatorID transactionCoordinatorIDTwo = TransactionCoordinatorID.get(1); @@ -370,7 +366,6 @@ public void testDuplicateMetricTypeDefinitions() throws Exception{ Awaitility.await().until(() -> pulsar.getTransactionMetadataStoreService().getStores().size() == 2); - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()).enableTransaction(true).build(); Producer p1 = pulsarClient .newProducer() .topic("persistent://my-property/use/my-ns/my-topic1") @@ -415,7 +410,8 @@ public void testDuplicateMetricTypeDefinitions() throws Exception{ } // From https://github.com/prometheus/docs/blob/master/content/docs/instrumenting/exposition_formats.md - // "The TYPE line for a metric name must appear before the first sample is reported for that metric name." + // "The TYPE line for a metric name must appear before the first sample is reported for that metric + // name." if (metricNames.containsKey(metricName)) { log.info(metricsStr); fail("TYPE definition for " + metricName + " appears after first sample"); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java index 39ecc4235888a..b5933f9ecf529 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregatorTest.java new file mode 100644 index 0000000000000..9bd0b1f1bd428 --- /dev/null +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregatorTest.java @@ -0,0 +1,163 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.stats.prometheus; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.when; +import java.util.List; +import org.apache.bookkeeper.mledger.ManagedLedger; +import org.apache.bookkeeper.mledger.impl.ManagedLedgerMBeanImpl; +import org.apache.bookkeeper.mledger.util.StatsBuckets; +import org.apache.pulsar.broker.PulsarService; +import org.apache.pulsar.broker.PulsarServiceMockSupport; +import org.apache.pulsar.broker.ServiceConfiguration; +import org.apache.pulsar.broker.service.BrokerService; +import org.apache.pulsar.broker.service.Consumer; +import org.apache.pulsar.broker.service.Replicator; +import org.apache.pulsar.broker.service.Subscription; +import org.apache.pulsar.broker.service.Topic; +import org.apache.pulsar.broker.service.persistent.PersistentTopic; +import org.apache.pulsar.common.policies.data.BacklogQuota; +import org.apache.pulsar.common.policies.data.stats.ConsumerStatsImpl; +import org.apache.pulsar.common.policies.data.stats.SubscriptionStatsImpl; +import org.apache.pulsar.common.policies.data.stats.TopicStatsImpl; +import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap; +import org.apache.pulsar.metadata.impl.ZKMetadataStore; +import org.mockito.Mockito; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +@Test(groups = "broker") +public class NamespaceStatsAggregatorTest { + protected PulsarService pulsar; + private BrokerService broker; + private ConcurrentOpenHashMap>> + multiLayerTopicsMap; + + @BeforeMethod(alwaysRun = true) + public void setup() throws Exception { + multiLayerTopicsMap = ConcurrentOpenHashMap.>>newBuilder() + .build(); + pulsar = Mockito.mock(PulsarService.class); + broker = Mockito.mock(BrokerService.class); + doReturn(multiLayerTopicsMap).when(broker).getMultiLayerTopicMap(); + Mockito.when(pulsar.getLocalMetadataStore()).thenReturn(Mockito.mock(ZKMetadataStore.class)); + ServiceConfiguration mockConfig = Mockito.mock(ServiceConfiguration.class); + PulsarServiceMockSupport.mockPulsarServiceProps(pulsar, () -> { + doReturn(mockConfig).when(pulsar).getConfiguration(); + doReturn(broker).when(pulsar).getBrokerService(); + }); + } + + @Test + public void testGenerateSubscriptionsStats() { + // given + final String namespace = "tenant/cluster/ns"; + + // prepare multi-layer topic map + ConcurrentOpenHashMap bundlesMap = ConcurrentOpenHashMap.newBuilder().build(); + ConcurrentOpenHashMap topicsMap = ConcurrentOpenHashMap.newBuilder().build(); + ConcurrentOpenHashMap subscriptionsMaps = ConcurrentOpenHashMap.newBuilder().build(); + bundlesMap.put("my-bundle", topicsMap); + multiLayerTopicsMap.put(namespace, bundlesMap); + + // Prepare managed ledger + ManagedLedger ml = Mockito.mock(ManagedLedger.class); + ManagedLedgerMBeanImpl mlBeanStats = Mockito.mock(ManagedLedgerMBeanImpl.class); + StatsBuckets statsBuckets = new StatsBuckets(ManagedLedgerMBeanImpl.ENTRY_LATENCY_BUCKETS_USEC); + when(mlBeanStats.getInternalAddEntryLatencyBuckets()).thenReturn(statsBuckets); + when(mlBeanStats.getInternalLedgerAddEntryLatencyBuckets()).thenReturn(statsBuckets); + when(mlBeanStats.getInternalEntrySizeBuckets()).thenReturn( + new StatsBuckets(ManagedLedgerMBeanImpl.ENTRY_SIZE_BUCKETS_BYTES)); + when(ml.getStats()).thenReturn(mlBeanStats); + + // Prepare topic and subscription + PersistentTopic topic = Mockito.mock(PersistentTopic.class); + Subscription subscription = Mockito.mock(Subscription.class); + Consumer consumer = Mockito.mock(Consumer.class); + ConsumerStatsImpl consumerStats = new ConsumerStatsImpl(); + when(consumer.getStats()).thenReturn(consumerStats); + when(subscription.getConsumers()).thenReturn(List.of(consumer)); + subscriptionsMaps.put("my-subscription", subscription); + SubscriptionStatsImpl subStats = new SubscriptionStatsImpl(); + TopicStatsImpl topicStats = new TopicStatsImpl(); + topicStats.subscriptions.put("my-subscription", subStats); + when(topic.getStats(false, false, false)).thenReturn(topicStats); + when(topic.getBrokerService()).thenReturn(broker); + when(topic.getSubscriptions()).thenReturn(subscriptionsMaps); + when(topic.getReplicators()).thenReturn(ConcurrentOpenHashMap.newBuilder().build()); + when(topic.getManagedLedger()).thenReturn(ml); + when(topic.getBacklogQuota(Mockito.any())).thenReturn(Mockito.mock(BacklogQuota.class)); + topicsMap.put("my-topic", topic); + PrometheusMetricStreams metricStreams = Mockito.spy(new PrometheusMetricStreams()); + + // Populate subscriptions stats + subStats.blockedSubscriptionOnUnackedMsgs = true; + consumerStats.blockedConsumerOnUnackedMsgs = false; // should not affect blockedSubscriptionOnUnackedMsgs + consumerStats.unackedMessages = 1; + consumerStats.msgRateRedeliver = 0.7; + subStats.consumers.add(0, consumerStats); + + // when + NamespaceStatsAggregator.generate(pulsar, true, true, + true, true, metricStreams); + + // then + verifySubscriptionMetric(metricStreams, "pulsar_subscription_blocked_on_unacked_messages", 1); + verifyConsumerMetric(metricStreams, "pulsar_consumer_blocked_on_unacked_messages", 0); + + verifySubscriptionMetric(metricStreams, "pulsar_subscription_msg_rate_redeliver", 0.7); + verifySubscriptionMetric(metricStreams, "pulsar_subscription_unacked_messages", 1L); + } + + private void verifySubscriptionMetric(PrometheusMetricStreams metricStreams, String metricName, Number value) { + Mockito.verify(metricStreams).writeSample(metricName, + value, + "cluster", + null, + "namespace", + "tenant/cluster/ns", + "topic", + "my-topic", + "partition", + "-1", + "subscription", + "my-subscription"); + } + + private void verifyConsumerMetric(PrometheusMetricStreams metricStreams, String metricName, Number value) { + Mockito.verify(metricStreams).writeSample(metricName, + value, + "cluster", + null, + "namespace", + "tenant/cluster/ns", + "topic", + "my-topic", + "partition", + "-1", + "subscription", + "my-subscription", + "consumer_name", + null, + "consumer_id", + "0"); + } +} diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreamsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreamsTest.java index 6e2bd529ffa1f..b955f7d34a178 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreamsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricStreamsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicServiceTest.java index 91db232d2aa4e..44a4de5e8a923 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,6 +18,7 @@ */ package org.apache.pulsar.broker.systopic; +import static org.apache.pulsar.broker.service.SystemTopicBasedTopicPoliciesService.getEventKey; import static org.mockito.Mockito.mock; import com.google.common.collect.Sets; import java.util.HashSet; @@ -121,7 +122,7 @@ public void testSendAndReceiveNamespaceEvents() throws Exception { .policies(policies) .build()) .build(); - systemTopicClientForNamespace1.newWriter().write(event); + systemTopicClientForNamespace1.newWriter().write(getEventKey(event), event); SystemTopicClient.Reader reader = systemTopicClientForNamespace1.newReader(); Message received = reader.readNext(); log.info("Receive pulsar event from system topic : {}", received.getValue()); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java index 510abae87bc88..f82badac51e19 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -47,6 +47,7 @@ import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.client.api.SubscriptionInitialPosition; import org.apache.pulsar.client.api.SubscriptionType; +import org.apache.pulsar.common.events.PulsarEvent; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.common.naming.SystemTopicNames; import org.apache.pulsar.common.naming.TopicName; @@ -202,7 +203,7 @@ public void testHeartbeatTopicNotAllowedToSendEvent() throws Exception { } @Test - private void testSetBacklogCausedCreatingProducerFailure() throws Exception { + public void testSetBacklogCausedCreatingProducerFailure() throws Exception { final String ns = "prop/ns-test"; final String topic = ns + "/topic-1"; @@ -249,10 +250,12 @@ private void testSetBacklogCausedCreatingProducerFailure() throws Exception { Thread.sleep(3 * 1000); try { - Producer producerN = PulsarClient.builder() + @Cleanup + PulsarClient pulsarClient1 = PulsarClient.builder() .maxBackoffInterval(3, TimeUnit.SECONDS) .operationTimeout(5, TimeUnit.SECONDS) - .serviceUrl(lookupUrl.toString()).connectionTimeout(2, TimeUnit.SECONDS).build() + .serviceUrl(lookupUrl.toString()).connectionTimeout(2, TimeUnit.SECONDS).build(); + Producer producerN = pulsarClient1 .newProducer(Schema.STRING).topic(topic).sendTimeout(3, TimeUnit.SECONDS).create(); Assert.assertTrue(producerN.isConnected()); producerN.close(); @@ -260,4 +263,39 @@ private void testSetBacklogCausedCreatingProducerFailure() throws Exception { Assert.fail("failed to create producer"); } } + + @Test + public void testSystemTopicNotCheckExceed() throws Exception { + final String ns = "prop/ns-test"; + final String topic = ns + "/topic-1"; + + admin.namespaces().createNamespace(ns, 2); + admin.topics().createPartitionedTopic(String.format("persistent://%s", topic), 1); + + conf.setMaxSameAddressConsumersPerTopic(1); + admin.namespaces().setMaxConsumersPerTopic(ns, 1); + admin.topicPolicies().setMaxConsumers(topic, 1); + NamespaceEventsSystemTopicFactory systemTopicFactory = new NamespaceEventsSystemTopicFactory(pulsarClient); + TopicPoliciesSystemTopicClient systemTopicClientForNamespace = systemTopicFactory + .createTopicPoliciesSystemTopicClient(NamespaceName.get(ns)); + SystemTopicClient.Reader reader1 = systemTopicClientForNamespace.newReader(); + SystemTopicClient.Reader reader2 = systemTopicClientForNamespace.newReader(); + + conf.setMaxSameAddressProducersPerTopic(1); + admin.namespaces().setMaxProducersPerTopic(ns, 1); + admin.topicPolicies().setMaxProducers(topic, 1); + CompletableFuture> writer1 = systemTopicClientForNamespace.newWriterAsync(); + CompletableFuture> writer2 = systemTopicClientForNamespace.newWriterAsync(); + CompletableFuture f1 = admin.topicPolicies().setCompactionThresholdAsync(topic, 1L); + + FutureUtil.waitForAll(List.of(writer1, writer2, f1)).join(); + Assert.assertTrue(reader1.hasMoreEvents()); + Assert.assertNotNull(reader1.readNext()); + Assert.assertTrue(reader2.hasMoreEvents()); + Assert.assertNotNull(reader2.readNext()); + reader1.close(); + reader2.close(); + writer1.get().close(); + writer2.get().close(); + } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/tools/BrokerToolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/tools/BrokerToolTest.java index 9899bb36a875c..ad2cf7784eb1f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/tools/BrokerToolTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/tools/BrokerToolTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java index c0afdbee48756..39c324d92f38c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -28,31 +28,43 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import java.io.IOException; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; import java.lang.reflect.Field; -import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; import java.util.NavigableMap; import java.util.Optional; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; +import org.apache.bookkeeper.mledger.AsyncCallbacks; +import org.apache.bookkeeper.mledger.Entry; +import org.apache.bookkeeper.mledger.ManagedLedgerException; import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; import org.apache.bookkeeper.mledger.impl.PositionImpl; +import org.apache.bookkeeper.mledger.impl.ReadOnlyManagedLedgerImpl; import org.apache.bookkeeper.mledger.proto.MLDataFormats; import org.apache.commons.collections4.map.LinkedMap; import org.apache.commons.lang3.RandomUtils; import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.service.AbstractTopic; import org.apache.pulsar.broker.service.BrokerService; +import org.apache.pulsar.broker.service.SystemTopicTxnBufferSnapshotService; import org.apache.pulsar.broker.service.Topic; -import org.apache.pulsar.broker.service.TransactionBufferSnapshotService; +import org.apache.pulsar.broker.service.TransactionBufferSnapshotServiceFactory; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.broker.systopic.NamespaceEventsSystemTopicFactory; import org.apache.pulsar.broker.systopic.SystemTopicClient; +import org.apache.pulsar.broker.transaction.buffer.AbortedTxnProcessor; +import org.apache.pulsar.broker.transaction.buffer.impl.SingleSnapshotAbortedTxnProcessorImpl; import org.apache.pulsar.broker.transaction.buffer.impl.TopicTransactionBuffer; -import org.apache.pulsar.broker.transaction.buffer.matadata.TransactionBufferSnapshot; +import org.apache.pulsar.broker.transaction.buffer.metadata.TransactionBufferSnapshot; +import org.apache.pulsar.broker.transaction.buffer.metadata.v2.TransactionBufferSnapshotIndex; +import org.apache.pulsar.broker.transaction.buffer.metadata.v2.TransactionBufferSnapshotIndexes; +import org.apache.pulsar.broker.transaction.buffer.metadata.v2.TransactionBufferSnapshotSegment; +import org.apache.pulsar.broker.transaction.buffer.metadata.v2.TxnIDData; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Message; import org.apache.pulsar.client.api.MessageId; @@ -66,9 +78,11 @@ import org.apache.pulsar.client.api.transaction.TxnID; import org.apache.pulsar.client.impl.MessageIdImpl; import org.apache.pulsar.client.impl.transaction.TransactionImpl; +import org.apache.pulsar.common.api.proto.MessageMetadata; import org.apache.pulsar.common.events.EventType; import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.policies.data.TopicStats; +import org.apache.pulsar.common.protocol.Commands; import org.apache.pulsar.common.util.FutureUtil; import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap; import org.awaitility.Awaitility; @@ -82,6 +96,8 @@ public class TopicTransactionBufferRecoverTest extends TransactionTestBase { private static final String RECOVER_COMMIT = NAMESPACE1 + "/recover-commit"; private static final String RECOVER_ABORT = NAMESPACE1 + "/recover-abort"; + private static final String SNAPSHOT_INDEX = NAMESPACE1 + "/snapshot-index"; + private static final String SNAPSHOT_SEGMENT = NAMESPACE1 + "/snapshot-segment"; private static final String SUBSCRIPTION_NAME = "test-recover"; private static final String TAKE_SNAPSHOT = NAMESPACE1 + "/take-snapshot"; private static final String ABORT_DELETE = NAMESPACE1 + "/abort-delete"; @@ -110,6 +126,14 @@ public Object[] testTopic() { }; } + @DataProvider(name = "enableSnapshotSegment") + public Object[] testSnapshot() { + return new Boolean[] { + true, + false + }; + } + @Test(dataProvider = "testTopic") private void recoverTest(String testTopic) throws Exception { PulsarClient pulsarClient = this.pulsarClient; @@ -151,7 +175,7 @@ private void recoverTest(String testTopic) throws Exception { Message message = consumer.receive(2, TimeUnit.SECONDS); assertNull(message); - tnx1.commit(); + tnx1.commit().get(); // only can receive message 1 message = consumer.receive(2, TimeUnit.SECONDS); @@ -224,9 +248,7 @@ private void recoverTest(String testTopic) throws Exception { } - @Test - private void testTakeSnapshot() throws IOException, ExecutionException, InterruptedException { - + private void testTakeSnapshot() throws Exception { @Cleanup Producer producer = pulsarClient .newProducer(Schema.STRING) @@ -296,8 +318,9 @@ private void testTakeSnapshot() throws IOException, ExecutionException, Interrup } - @Test - private void testTopicTransactionBufferDeleteAbort() throws Exception { + @Test(dataProvider = "enableSnapshotSegment") + private void testTopicTransactionBufferDeleteAbort(Boolean enableSnapshotSegment) throws Exception { + getPulsarServiceList().get(0).getConfig().setTransactionBufferSegmentedSnapshotEnabled(enableSnapshotSegment); @Cleanup Producer producer = pulsarClient .newProducer(Schema.STRING) @@ -372,22 +395,34 @@ private void testTopicTransactionBufferDeleteAbort() throws Exception { field.setAccessible(true); TopicTransactionBuffer topicTransactionBuffer = (TopicTransactionBuffer) field.get(persistentTopic); - field = TopicTransactionBuffer.class.getDeclaredField("aborts"); + field = TopicTransactionBuffer.class.getDeclaredField("snapshotAbortedTxnProcessor"); field.setAccessible(true); - LinkedMap linkedMap = - (LinkedMap) field.get(topicTransactionBuffer); - assertEquals(linkedMap.size(), 1); - assertEquals(linkedMap.get(linkedMap.firstKey()).getLedgerId(), - ((MessageIdImpl) message.getMessageId()).getLedgerId()); - exist = true; + AbortedTxnProcessor abortedTxnProcessor = (AbortedTxnProcessor) field.get(topicTransactionBuffer); + + if (enableSnapshotSegment) { + //TODO + exist = true; + } else { + Field abortsField = SingleSnapshotAbortedTxnProcessorImpl.class.getDeclaredField("aborts"); + abortsField.setAccessible(true); + + LinkedMap linkedMap = + (LinkedMap) abortsField.get(abortedTxnProcessor); + assertEquals(linkedMap.size(), 1); + assertEquals(linkedMap.get(linkedMap.firstKey()).getLedgerId(), + ((MessageIdImpl) message.getMessageId()).getLedgerId()); + exist = true; + } + } } } assertTrue(exist); } - @Test - public void clearTransactionBufferSnapshotTest() throws Exception { + @Test(dataProvider = "enableSnapshotSegment") + public void clearTransactionBufferSnapshotTest(Boolean enableSnapshotSegment) throws Exception { + getPulsarServiceList().get(0).getConfig().setTransactionBufferSegmentedSnapshotEnabled(enableSnapshotSegment); String topic = NAMESPACE1 + "/tb-snapshot-delete-" + RandomUtils.nextInt(); Producer producer = pulsarClient @@ -408,9 +443,11 @@ public void clearTransactionBufferSnapshotTest() throws Exception { PersistentTopic originalTopic = (PersistentTopic) getPulsarServiceList().get(0) .getBrokerService().getTopic(TopicName.get(topic).toString(), false).get().get(); TopicTransactionBuffer topicTransactionBuffer = (TopicTransactionBuffer) originalTopic.getTransactionBuffer(); - Method takeSnapshotMethod = TopicTransactionBuffer.class.getDeclaredMethod("takeSnapshot"); - takeSnapshotMethod.setAccessible(true); - takeSnapshotMethod.invoke(topicTransactionBuffer); + Field abortedTxnProcessorField = TopicTransactionBuffer.class.getDeclaredField("snapshotAbortedTxnProcessor"); + abortedTxnProcessorField.setAccessible(true); + AbortedTxnProcessor abortedTxnProcessor = + (AbortedTxnProcessor) abortedTxnProcessorField.get(topicTransactionBuffer); + abortedTxnProcessor.takeAbortedTxnsSnapshot(topicTransactionBuffer.getMaxReadPosition()); TopicName transactionBufferTopicName = NamespaceEventsSystemTopicFactory.getSystemTopicName( @@ -472,60 +509,66 @@ public void testTransactionBufferRecoverThrowException() throws Exception { PersistentTopic originalTopic = (PersistentTopic) getPulsarServiceList().get(0) .getBrokerService().getTopic(TopicName.get(topic).toString(), false).get().get(); - TransactionBufferSnapshotService transactionBufferSnapshotService = - mock(TransactionBufferSnapshotService.class); + SystemTopicTxnBufferSnapshotService systemTopicTxnBufferSnapshotService = + mock(SystemTopicTxnBufferSnapshotService.class); SystemTopicClient.Reader reader = mock(SystemTopicClient.Reader.class); SystemTopicClient.Writer writer = mock(SystemTopicClient.Writer.class); - doReturn(CompletableFuture.completedFuture(reader)).when(transactionBufferSnapshotService).createReader(any()); - doReturn(CompletableFuture.completedFuture(writer)).when(transactionBufferSnapshotService).createWriter(any()); + doReturn(CompletableFuture.completedFuture(reader)) + .when(systemTopicTxnBufferSnapshotService).createReader(any()); + doReturn(CompletableFuture.completedFuture(writer)) + .when(systemTopicTxnBufferSnapshotService).createWriter(any()); + TransactionBufferSnapshotServiceFactory transactionBufferSnapshotServiceFactory = + mock(TransactionBufferSnapshotServiceFactory.class); + doReturn(systemTopicTxnBufferSnapshotService) + .when(transactionBufferSnapshotServiceFactory).getTxnBufferSnapshotService(); doReturn(CompletableFuture.completedFuture(null)).when(reader).closeAsync(); doReturn(CompletableFuture.completedFuture(null)).when(writer).closeAsync(); - Field field = PulsarService.class.getDeclaredField("transactionBufferSnapshotService"); + Field field = PulsarService.class.getDeclaredField("transactionBufferSnapshotServiceFactory"); field.setAccessible(true); - TransactionBufferSnapshotService transactionBufferSnapshotServiceOriginal = - (TransactionBufferSnapshotService) field.get(getPulsarServiceList().get(0)); + TransactionBufferSnapshotServiceFactory transactionBufferSnapshotServiceFactoryOriginal = + ((TransactionBufferSnapshotServiceFactory)field.get(getPulsarServiceList().get(0))); // mock reader can't read snapshot fail throw RuntimeException doThrow(new RuntimeException("test")).when(reader).hasMoreEvents(); // check reader close topic - checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceOriginal, - transactionBufferSnapshotService, originalTopic, field, producer); + checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceFactoryOriginal, + transactionBufferSnapshotServiceFactory, originalTopic, field, producer); doReturn(true).when(reader).hasMoreEvents(); // mock reader can't read snapshot fail throw PulsarClientException doThrow(new PulsarClientException("test")).when(reader).hasMoreEvents(); // check reader close topic - checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceOriginal, - transactionBufferSnapshotService, originalTopic, field, producer); + checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceFactoryOriginal, + transactionBufferSnapshotServiceFactory, originalTopic, field, producer); doReturn(true).when(reader).hasMoreEvents(); // mock create reader fail doReturn(FutureUtil.failedFuture(new PulsarClientException("test"))) - .when(transactionBufferSnapshotService).createReader(any()); + .when(systemTopicTxnBufferSnapshotService).createReader(any()); // check create reader fail close topic originalTopic = (PersistentTopic) getPulsarServiceList().get(0) .getBrokerService().getTopic(TopicName.get(topic).toString(), false).get().get(); - checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceOriginal, - transactionBufferSnapshotService, originalTopic, field, producer); - doReturn(CompletableFuture.completedFuture(reader)).when(transactionBufferSnapshotService).createReader(any()); + checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceFactoryOriginal, + transactionBufferSnapshotServiceFactory, originalTopic, field, producer); + doReturn(CompletableFuture.completedFuture(reader)).when(systemTopicTxnBufferSnapshotService).createReader(any()); // check create writer fail close topic originalTopic = (PersistentTopic) getPulsarServiceList().get(0) .getBrokerService().getTopic(TopicName.get(topic).toString(), false).get().get(); // mock create writer fail doReturn(FutureUtil.failedFuture(new PulsarClientException("test"))) - .when(transactionBufferSnapshotService).createWriter(any()); - checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceOriginal, - transactionBufferSnapshotService, originalTopic, field, producer); + .when(systemTopicTxnBufferSnapshotService).createWriter(any()); + checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceFactoryOriginal, + transactionBufferSnapshotServiceFactory, originalTopic, field, producer); } private void checkCloseTopic(PulsarClient pulsarClient, - TransactionBufferSnapshotService transactionBufferSnapshotServiceOriginal, - TransactionBufferSnapshotService transactionBufferSnapshotService, + TransactionBufferSnapshotServiceFactory transactionBufferSnapshotServiceFactoryOriginal, + TransactionBufferSnapshotServiceFactory transactionBufferSnapshotServiceFactory, PersistentTopic originalTopic, Field field, Producer producer) throws Exception { - field.set(getPulsarServiceList().get(0), transactionBufferSnapshotService); + field.set(getPulsarServiceList().get(0), transactionBufferSnapshotServiceFactory); // recover again will throw then close topic new TopicTransactionBuffer(originalTopic); @@ -536,7 +579,7 @@ private void checkCloseTopic(PulsarClient pulsarClient, assertTrue((boolean) close.get(originalTopic)); }); - field.set(getPulsarServiceList().get(0), transactionBufferSnapshotServiceOriginal); + field.set(getPulsarServiceList().get(0), transactionBufferSnapshotServiceFactoryOriginal); Transaction txn = pulsarClient.newTransaction() .withTransactionTimeout(5, TimeUnit.SECONDS) @@ -565,4 +608,138 @@ public void testTransactionBufferNoSnapshotCloseReader() throws Exception{ assertTrue(stats.getSubscriptions().keySet().contains("__compaction")); } + @Test + public void testTransactionBufferIndexSystemTopic() throws Exception { + SystemTopicTxnBufferSnapshotService transactionBufferSnapshotIndexService = + new TransactionBufferSnapshotServiceFactory(pulsarClient).getTxnBufferSnapshotIndexService(); + + SystemTopicClient.Writer indexesWriter = + transactionBufferSnapshotIndexService.createWriter(TopicName.get(SNAPSHOT_INDEX)).get(); + + SystemTopicClient.Reader indexesReader = + transactionBufferSnapshotIndexService.createReader(TopicName.get(SNAPSHOT_INDEX)).get(); + + + List indexList = new LinkedList<>(); + + for (long i = 0; i < 5; i++) { + indexList.add(new TransactionBufferSnapshotIndex(i, i, i, i, i)); + } + + TransactionBufferSnapshotIndexes transactionBufferTransactionBufferSnapshotIndexes = + new TransactionBufferSnapshotIndexes(SNAPSHOT_INDEX, + indexList, null); + + indexesWriter.write(SNAPSHOT_INDEX, transactionBufferTransactionBufferSnapshotIndexes); + + assertTrue(indexesReader.hasMoreEvents()); + transactionBufferTransactionBufferSnapshotIndexes = indexesReader.readNext().getValue(); + assertEquals(transactionBufferTransactionBufferSnapshotIndexes.getTopicName(), SNAPSHOT_INDEX); + assertEquals(transactionBufferTransactionBufferSnapshotIndexes.getIndexList().size(), 5); + assertNull(transactionBufferTransactionBufferSnapshotIndexes.getSnapshot()); + + TransactionBufferSnapshotIndex transactionBufferSnapshotIndex = + transactionBufferTransactionBufferSnapshotIndexes.getIndexList().get(1); + assertEquals(transactionBufferSnapshotIndex.getMaxReadPositionLedgerID(), 1L); + assertEquals(transactionBufferSnapshotIndex.getMaxReadPositionEntryID(), 1L); + assertEquals(transactionBufferSnapshotIndex.getPersistentPositionLedgerID(), 1L); + assertEquals(transactionBufferSnapshotIndex.getPersistentPositionEntryID(), 1L); + assertEquals(transactionBufferSnapshotIndex.getSequenceID(), 1L); + } + + public static String buildKey( + TransactionBufferSnapshotSegment snapshot) { + return "multiple-" + snapshot.getSequenceId() + "-" + snapshot.getTopicName(); + } + + @Test + public void testTransactionBufferSegmentSystemTopic() throws Exception { + // init topic and topicName + String snapshotTopic = NAMESPACE1 + "/" + EventType.TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS; + TopicName snapshotSegmentTopicName = TopicName.getPartitionedTopicName(snapshotTopic); + + //send message to create manager ledger + Producer producer = + pulsarClient.newProducer(Schema.AVRO( + TransactionBufferSnapshotSegment.class)) + .topic(snapshotTopic) + .create(); + + // get brokerService and pulsarService + PulsarService pulsarService = getPulsarServiceList().get(0); + BrokerService brokerService = pulsarService.getBrokerService(); + + // create snapshot segment writer + SystemTopicTxnBufferSnapshotService + transactionBufferSnapshotSegmentService = + new TransactionBufferSnapshotServiceFactory(pulsarClient).getTxnBufferSnapshotSegmentService(); + + SystemTopicClient.Writer + segmentWriter = transactionBufferSnapshotSegmentService.createWriter(snapshotSegmentTopicName).get(); + + // write two snapshot to snapshot segment topic + TransactionBufferSnapshotSegment snapshot = + new TransactionBufferSnapshotSegment(); + + //build and send snapshot + snapshot.setTopicName(snapshotTopic); + snapshot.setSequenceId(1L); + snapshot.setMaxReadPositionLedgerId(2L); + snapshot.setMaxReadPositionEntryId(3L); + LinkedList txnIDSet = new LinkedList<>(); + txnIDSet.add(new TxnIDData(1, 1)); + snapshot.setAborts(txnIDSet ); + + segmentWriter.write(buildKey(snapshot), snapshot); + snapshot.setSequenceId(2L); + + MessageIdImpl messageId = (MessageIdImpl) segmentWriter.write(buildKey(snapshot), snapshot); + + //Create read-only managed ledger + //And read the entry and decode entry to snapshot + CompletableFuture entryCompletableFuture = new CompletableFuture<>(); + AsyncCallbacks.OpenReadOnlyManagedLedgerCallback callback = new AsyncCallbacks + .OpenReadOnlyManagedLedgerCallback() { + @Override + public void openReadOnlyManagedLedgerComplete(ReadOnlyManagedLedgerImpl readOnlyManagedLedger, Object ctx) { + readOnlyManagedLedger.asyncReadEntry( + new PositionImpl(messageId.getLedgerId(), messageId.getEntryId()), + new AsyncCallbacks.ReadEntryCallback() { + @Override + public void readEntryComplete(Entry entry, Object ctx) { + entryCompletableFuture.complete(entry); + } + + @Override + public void readEntryFailed(ManagedLedgerException exception, Object ctx) { + entryCompletableFuture.completeExceptionally(exception); + } + }, null); + } + + @Override + public void openReadOnlyManagedLedgerFailed(ManagedLedgerException exception, Object ctx) { + // + } + }; + pulsarService.getManagedLedgerFactory() + .asyncOpenReadOnlyManagedLedger(snapshotSegmentTopicName.getPersistenceNamingEncoding(), callback, + brokerService.getManagedLedgerConfig(snapshotSegmentTopicName).get(),null); + + Entry entry = entryCompletableFuture.get(); + //decode snapshot from entry + ByteBuf headersAndPayload = entry.getDataBuffer(); + //skip metadata + MessageMetadata msgMetadata = Commands.parseMessageMetadata(headersAndPayload); + snapshot = Schema.AVRO(TransactionBufferSnapshotSegment.class) + .decode(Unpooled.wrappedBuffer(headersAndPayload).nioBuffer()); + + //verify snapshot + assertEquals(snapshot.getTopicName(), snapshotTopic); + assertEquals(snapshot.getSequenceId(), 2L); + assertEquals(snapshot.getMaxReadPositionLedgerId(), 2L); + assertEquals(snapshot.getMaxReadPositionEntryId(), 3L); + assertEquals(snapshot.getAborts().toArray()[0], new TxnIDData(1, 1)); + } + } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionConsumeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionConsumeTest.java index 3783f9ef243d1..78846fb75922a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionConsumeTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionConsumeTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -239,8 +239,10 @@ private List appendTransactionMessages( throws ExecutionException, InterruptedException, PulsarClientException { //Change the state of TB to Ready. @Cleanup - Producer producer = PulsarClient.builder().serviceUrl(pulsarServiceList.get(0).getBrokerServiceUrl()) - .enableTransaction(true).build() + PulsarClient pulsarClient1 = PulsarClient.builder().serviceUrl(pulsarServiceList.get(0).getBrokerServiceUrl()) + .enableTransaction(true).build(); + @Cleanup + Producer producer = pulsarClient1 .newProducer(Schema.STRING).topic(CONSUME_TOPIC).sendTimeout(0, TimeUnit.SECONDS).create(); List positionList = new ArrayList<>(); for (int i = 0; i < transactionMsgCnt; i++) { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java index d43221a64e275..cdbb1563280b4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionProduceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -89,35 +89,6 @@ public void produceAndCommitTest() throws Exception { produceTest(true); } - @Test - public void testDeleteNamespaceBeforeCommit() throws Exception { - final String topic = NAMESPACE1 + "/testDeleteTopicBeforeCommit"; - PulsarClient pulsarClient = this.pulsarClient; - Transaction tnx = pulsarClient.newTransaction() - .withTransactionTimeout(60, TimeUnit.SECONDS) - .build().get(); - long txnIdMostBits = ((TransactionImpl) tnx).getTxnIdMostBits(); - long txnIdLeastBits = ((TransactionImpl) tnx).getTxnIdLeastBits(); - Assert.assertTrue(txnIdMostBits > -1); - Assert.assertTrue(txnIdLeastBits > -1); - - @Cleanup - Producer outProducer = pulsarClient - .newProducer() - .topic(topic) - .sendTimeout(0, TimeUnit.SECONDS) - .enableBatching(false) - .create(); - - String content = "Hello Txn"; - outProducer.newMessage(tnx).value(content.getBytes(UTF_8)).send(); - - try { - deleteNamespaceGraceFully(NAMESPACE1, true); - } catch (Exception ignore) {} - tnx.commit().get(); - } - @Test public void produceAndAbortTest() throws Exception { produceTest(false); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java index 952cd9b2c45a9..f075b80ef7aba 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -84,19 +84,21 @@ import org.apache.pulsar.broker.service.BacklogQuotaManager; import org.apache.pulsar.broker.service.BrokerService; import org.apache.pulsar.broker.service.BrokerServiceException; +import org.apache.pulsar.broker.service.SystemTopicTxnBufferSnapshotService; import org.apache.pulsar.broker.service.Topic; -import org.apache.pulsar.broker.service.TransactionBufferSnapshotService; +import org.apache.pulsar.broker.service.TransactionBufferSnapshotServiceFactory; import org.apache.pulsar.broker.service.persistent.PersistentSubscription; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.broker.systopic.NamespaceEventsSystemTopicFactory; import org.apache.pulsar.broker.systopic.SystemTopicClient; +import org.apache.pulsar.broker.transaction.buffer.AbortedTxnProcessor; import org.apache.pulsar.broker.transaction.buffer.TransactionBuffer; import org.apache.pulsar.broker.transaction.buffer.impl.TopicTransactionBuffer; import org.apache.pulsar.broker.transaction.buffer.impl.TopicTransactionBufferProvider; import org.apache.pulsar.broker.transaction.buffer.impl.TopicTransactionBufferRecoverCallBack; import org.apache.pulsar.broker.transaction.buffer.impl.TopicTransactionBufferState; import org.apache.pulsar.broker.transaction.pendingack.PendingAckStore; -import org.apache.pulsar.broker.transaction.buffer.matadata.TransactionBufferSnapshot; +import org.apache.pulsar.broker.transaction.buffer.metadata.TransactionBufferSnapshot; import org.apache.pulsar.broker.transaction.pendingack.TransactionPendingAckStoreProvider; import org.apache.pulsar.broker.transaction.pendingack.impl.MLPendingAckReplyCallBack; import org.apache.pulsar.broker.transaction.pendingack.impl.MLPendingAckStore; @@ -213,7 +215,8 @@ public void testTopicTransactionMetrics() throws Exception { public void testCreateTransactionSystemTopic() throws Exception { String subName = "test"; String topicName = TopicName.get(NAMESPACE1 + "/" + "testCreateTransactionSystemTopic").toString(); - + admin.namespaces().deleteNamespace(NAMESPACE1, true); + admin.namespaces().createNamespace(NAMESPACE1); try { // init pending ack @Cleanup @@ -229,7 +232,7 @@ public void testCreateTransactionSystemTopic() throws Exception { // getList does not include transaction system topic List list = admin.topics().getList(NAMESPACE1); - assertEquals(list.size(), 2); + assertFalse(list.isEmpty()); list.forEach(topic -> assertFalse(topic.contains(PENDING_ACK_STORE_SUFFIX))); try { @@ -603,6 +606,7 @@ public void testMaxReadPositionForNormalPublish() throws Exception { .getTopic(topic, false).get().get(); TopicTransactionBuffer topicTransactionBuffer = (TopicTransactionBuffer) persistentTopic.getTransactionBuffer(); + @Cleanup PulsarClient noTxnClient = PulsarClient.builder().enableTransaction(false) .serviceUrl(getPulsarServiceList().get(0).getBrokerServiceUrl()).build(); @@ -941,9 +945,11 @@ public void testNoEntryCanBeReadWhenRecovery() throws Exception { filed1.set(persistentTopic, managedLedger); TopicTransactionBuffer topicTransactionBuffer = (TopicTransactionBuffer) field2.get(persistentTopic); - Method method = TopicTransactionBuffer.class.getDeclaredMethod("takeSnapshot"); - method.setAccessible(true); - CompletableFuture completableFuture = (CompletableFuture) method.invoke(topicTransactionBuffer); + Field processorField = TopicTransactionBuffer.class.getDeclaredField("snapshotAbortedTxnProcessor"); + processorField.setAccessible(true); + AbortedTxnProcessor abortedTxnProcessor = (AbortedTxnProcessor) processorField.get(topicTransactionBuffer); + CompletableFuture completableFuture = abortedTxnProcessor.takeAbortedTxnsSnapshot( + topicTransactionBuffer.getMaxReadPosition()); completableFuture.get(); doReturn(PositionImpl.LATEST).when(managedLedger).getLastConfirmedEntry(); @@ -1025,9 +1031,15 @@ public void testNotChangeMaxReadPositionAndAddAbortTimesWhenCheckIfNoSnapshot() .getTopic(NAMESPACE1 + "/changeMaxReadPositionAndAddAbortTimes" + UUID.randomUUID(), true) .get().get(); TransactionBuffer buffer = persistentTopic.getTransactionBuffer(); - Field field = TopicTransactionBuffer.class.getDeclaredField("changeMaxReadPositionAndAddAbortTimes"); - field.setAccessible(true); - AtomicLong changeMaxReadPositionAndAddAbortTimes = (AtomicLong) field.get(buffer); + Field processorField = TopicTransactionBuffer.class.getDeclaredField("snapshotAbortedTxnProcessor"); + processorField.setAccessible(true); + + AbortedTxnProcessor abortedTxnProcessor = (AbortedTxnProcessor) processorField.get(buffer); + Field changeTimeField = TopicTransactionBuffer + .class.getDeclaredField("changeMaxReadPositionAndAddAbortTimes"); + changeTimeField.setAccessible(true); + AtomicLong changeMaxReadPositionAndAddAbortTimes = (AtomicLong) changeTimeField.get(buffer); + Field field1 = TopicTransactionBufferState.class.getDeclaredField("state"); field1.setAccessible(true); @@ -1514,18 +1526,23 @@ public void testTBRecoverChangeStateError() throws InterruptedException, Timeout when(pendingAckStoreProvider.newPendingAckStore(any())) .thenReturn(CompletableFuture.completedFuture(pendingAckStore)); // Mock TransactionBufferSnapshotService - TransactionBufferSnapshotService transactionBufferSnapshotService - = mock(TransactionBufferSnapshotService.class); - SystemTopicClient.Writer writer = mock(SystemTopicClient.Writer.class); + SystemTopicTxnBufferSnapshotService systemTopicTxnBufferSnapshotService + = mock(SystemTopicTxnBufferSnapshotService.class); + SystemTopicClient.Writer writer = mock(SystemTopicClient.Writer.class); when(writer.closeAsync()).thenReturn(CompletableFuture.completedFuture(null)); - when(transactionBufferSnapshotService.createWriter(any())) + when(systemTopicTxnBufferSnapshotService.createWriter(any())) .thenReturn(CompletableFuture.completedFuture(writer)); + TransactionBufferSnapshotServiceFactory transactionBufferSnapshotServiceFactory = + mock(TransactionBufferSnapshotServiceFactory.class); + when(transactionBufferSnapshotServiceFactory.getTxnBufferSnapshotService()) + .thenReturn(systemTopicTxnBufferSnapshotService); + // Mock pulsar. PulsarService pulsar = mock(PulsarService.class); when(pulsar.getConfiguration()).thenReturn(serviceConfiguration); when(pulsar.getConfig()).thenReturn(serviceConfiguration); when(pulsar.getTransactionExecutorProvider()).thenReturn(executorProvider); - when(pulsar.getTransactionBufferSnapshotService()).thenReturn(transactionBufferSnapshotService); + when(pulsar.getTransactionBufferSnapshotServiceFactory()).thenReturn(transactionBufferSnapshotServiceFactory); TopicTransactionBufferProvider topicTransactionBufferProvider = new TopicTransactionBufferProvider(); when(pulsar.getTransactionBufferProvider()).thenReturn(topicTransactionBufferProvider); // Mock BacklogQuotaManager diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java index 123755fe870d4..d48ef901f54dd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -45,11 +45,11 @@ import org.apache.pulsar.broker.BookKeeperClientFactory; import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.ServiceConfiguration; +import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; import org.apache.pulsar.broker.auth.SameThreadOrderedSafeExecutor; import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor; import org.apache.pulsar.broker.namespace.NamespaceService; import org.apache.pulsar.broker.service.BrokerTestBase; -import org.apache.pulsar.broker.service.CanPausedNamespaceService; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.common.naming.NamespaceName; @@ -198,7 +198,7 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(null); doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(null); Supplier namespaceServiceSupplier = - () -> spyWithClassAndConstructorArgs(CanPausedNamespaceService.class, pulsar); + () -> spyWithClassAndConstructorArgs(NamespaceService.class, pulsar); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); SameThreadOrderedSafeExecutor executor = new SameThreadOrderedSafeExecutor(); @@ -332,26 +332,18 @@ protected final void internalCleanup() { } /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link BrokerTestBase#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFully(String ns, boolean force) + protected void deleteNamespaceWithRetry(String ns, boolean force) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsarServiceList); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsarServiceList); } /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} + * see {@link MockedPulsarServiceBaseTest#deleteNamespaceWithRetry(String, boolean, PulsarAdmin, Collection)} */ - protected void deleteNamespaceGraceFully(String ns, boolean force, PulsarAdmin admin) + protected void deleteNamespaceWithRetry(String ns, boolean force, PulsarAdmin admin) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsarServiceList); - } - - /** - * see {@link BrokerTestBase#deleteNamespaceGraceFully(String, boolean, PulsarAdmin, Collection)} - */ - protected void deleteNamespaceGraceFullyByMultiPulsars(String ns, boolean force, PulsarAdmin admin, - Collection pulsars) throws Exception { - BrokerTestBase.deleteNamespaceGraceFully(ns, force, admin, pulsars); + MockedPulsarServiceBaseTest.deleteNamespaceWithRetry(ns, force, admin, pulsarServiceList); } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/InMemTransactionBufferReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/InMemTransactionBufferReaderTest.java index d4234fbd16610..04175290b4991 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/InMemTransactionBufferReaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/InMemTransactionBufferReaderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TopicTransactionBufferTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TopicTransactionBufferTest.java index ba7b8b6b40f36..fe964718c3d56 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TopicTransactionBufferTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TopicTransactionBufferTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientTest.java index 2e93b0ad7076e..86606e3ae8eb1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferClientTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferCloseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferCloseTest.java index 77ac464c1d497..cd3a14da5967d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferCloseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferCloseTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferHandlerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferHandlerImplTest.java index af4e442f617a3..d6ec092c4456f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferHandlerImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferHandlerImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java index 4f12b744ec1d1..6733b1ef4cfaf 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionBufferTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntryImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntryImplTest.java index fa879d23ca1c2..8c70b7d258637 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntryImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionEntryImplTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionLowWaterMarkTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionLowWaterMarkTest.java index 0922c9b801b6d..3901f186d81c7 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionLowWaterMarkTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionLowWaterMarkTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java index 15e3ff74156a0..55d115905a35d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -177,6 +177,9 @@ public void testSyncNormalPositionWhenTBRecover(boolean clientEnableTransaction, final String topicName = NAMESPACE1 + "/testSyncNormalPositionWhenTBRecover-" + clientEnableTransaction + state.name(); + if (pulsarClient != null) { + pulsarClient.shutdown(); + } pulsarClient = PulsarClient.builder() .serviceUrl(getPulsarServiceList().get(0).getBrokerServiceUrl()) .statsInterval(0, TimeUnit.SECONDS) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java index 7421a1b69f9b1..c442c3a901464 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorConfigTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorConfigTest.java index b72b28e52aed5..a62d7eff5d305 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorConfigTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorConfigTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -62,8 +62,8 @@ protected void cleanup() throws Exception { @Test public void testMaxActiveTxn() throws Exception { - pulsarClient = PulsarClient.builder().serviceUrl(lookupUrl.toString()) - .enableTransaction(true).operationTimeout(3, TimeUnit.SECONDS).build(); + replacePulsarClient(PulsarClient.builder().serviceUrl(lookupUrl.toString()) + .enableTransaction(true).operationTimeout(3, TimeUnit.SECONDS)); // new two txn will not reach max active txns Transaction commitTxn = diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreAssignmentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreAssignmentTest.java index c95becc2b3d45..ac1f570218704 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreAssignmentTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreAssignmentTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreTestBase.java index e69d6ba630b25..eb714dd848afc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionMetaStoreTestBase.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckInMemoryDeleteTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckInMemoryDeleteTest.java index 58be651a7d183..1360dd7c4442b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckInMemoryDeleteTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckInMemoryDeleteTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckMetadataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckMetadataTest.java index 0b14f6592fa82..efe83cebc3661 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckMetadataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckMetadataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java index ff9e16fac7dd1..dd0a24b36a425 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/PendingAckPersistentTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreTest.java index 649f4e4e5109e..19d6cc85c9ff6 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/pendingack/impl/MLPendingAckStoreTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -43,9 +43,9 @@ import org.apache.pulsar.common.util.FutureUtil; import org.apache.pulsar.transaction.coordinator.impl.TxnLogBufferedWriterConfig; import static org.mockito.Mockito.*; +import org.awaitility.Awaitility; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.testcontainers.shaded.org.awaitility.Awaitility; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; @@ -256,8 +256,24 @@ public Object answer(InvocationOnMock invocation) throws Throwable { Assert.assertTrue(mlPendingAckStoreForRead.pendingAckLogIndex.keySet().iterator().next().getEntryId() > 19); // cleanup. - mlPendingAckStoreForWrite.closeAsync().get(); - mlPendingAckStoreForRead.closeAsync().get(); + closePendingAckStoreWithRetry(mlPendingAckStoreForWrite); + closePendingAckStoreWithRetry(mlPendingAckStoreForRead); + } + + /** + * Why should retry? + * Because when the cursor close and cursor switch ledger are concurrent executing, the bad version exception is + * thrown. + */ + private void closePendingAckStoreWithRetry(MLPendingAckStore pendingAckStore){ + Awaitility.await().until(() -> { + try { + pendingAckStore.closeAsync().get(); + return true; + } catch (Exception ex){ + return false; + } + }); } /** diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerTest.java index dddb10c62dd38..ca8a144ae8275 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/recover/TransactionRecoverTrackerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java index 35d6ac0ce9b2f..3c0c2f4e68774 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/MaxRequestSizeFilterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/MaxRequestSizeFilterTest.java index b1c0748c8ffc4..295e0b78ebb85 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/MaxRequestSizeFilterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/MaxRequestSizeFilterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ProcessHandlerFilterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ProcessHandlerFilterTest.java index d6ade32ba6d5f..cc427bcfd6a5f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ProcessHandlerFilterTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ProcessHandlerFilterTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java index 06f80afda95a4..c424ab8cdd020 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java index 8e6df74d5a0e7..fcea97176ffad 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java index 9f631e3854257..ab0a5992b2d1c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java index c875e8ac129cf..1e33121259337 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoaderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarServiceTest.java index fcc806fc35a48..27b355282e8bb 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithPulsarServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServletWithClassLoader.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServletWithClassLoader.java index 6ff7b851ad49e..f65a98fd3f18f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServletWithClassLoader.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/MockAdditionalServletWithClassLoader.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ClusterMetadataSetupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ClusterMetadataSetupTest.java index 088087dce681f..3315452a8e32e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ClusterMetadataSetupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ClusterMetadataSetupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java index 15849a6773a1b..be59f200db9ba 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java index 08189895ac872..e29f6f4116ac9 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperSessionExpireRecoveryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java index e635de4acd2ab..71e30c21b3c20 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticatedProducerConsumerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java index ba061fc40bac1..f2631f591217b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthenticationTlsHostnameVerificationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java index dde958d518aca..0ce3b7df07d1f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/AuthorizationProducerConsumerTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -30,6 +30,7 @@ import com.google.common.collect.Sets; import java.io.IOException; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -548,6 +549,63 @@ public void testSchemaCompatibilityStrategyPermission() throws Exception { log.info("-- Exiting {} test --", methodName); } + @Test + public void testUpdateTopicPropertiesAuthorization() throws Exception { + log.info("-- Starting {} test --", methodName); + cleanup(); + conf.setAuthorizationProvider(PulsarAuthorizationProvider.class.getName()); + setup(); + + final String tenantRole = "tenant-role"; + final String generalRole = "general-role"; + final String namespace = "my-property/my-ns-sub-auth"; + final String topicName = "persistent://" + namespace + "/my-topic"; + clientAuthProviderSupportedRoles.add(generalRole); + + Authentication superUserAuthentication = new ClientAuthentication("superUser"); + @Cleanup + PulsarAdmin superAdmin = spy(PulsarAdmin.builder().serviceHttpUrl(brokerUrl.toString()) + .authentication(superUserAuthentication).build()); + + Authentication tenantAdminAuthentication = new ClientAuthentication(tenantRole); + @Cleanup + PulsarAdmin tenantAdmin = spy(PulsarAdmin.builder().serviceHttpUrl(brokerUrl.toString()) + .authentication(tenantAdminAuthentication).build()); + + Authentication generalAuthentication = new ClientAuthentication(generalRole); + @Cleanup + PulsarAdmin generalAdmin = spy(PulsarAdmin.builder().serviceHttpUrl(brokerUrl.toString()) + .authentication(generalAuthentication).build()); + + superAdmin.clusters().createCluster("test", + ClusterData.builder().serviceUrl(brokerUrl.toString()).build()); + superAdmin.tenants().createTenant("my-property", + new TenantInfoImpl(Sets.newHashSet(tenantRole), Sets.newHashSet("test"))); + superAdmin.namespaces().createNamespace(namespace, Sets.newHashSet("test")); + superAdmin.topics().createPartitionedTopic(topicName, 1); + + Map topicProperties = new HashMap(); + topicProperties.put("key1", "value1"); + // superUser and tenantAdminatrator have authorization to operate topic's properties + superAdmin.topics().updateProperties(topicName, topicProperties); + Awaitility.await().untilAsserted(() -> assertEquals( + superAdmin.topics().getProperties(topicName).get("key1"), "value1")); + topicProperties.put("key1", "value2"); + tenantAdmin.topics().updateProperties(topicName, topicProperties); + Awaitility.await().untilAsserted(() -> assertEquals( + tenantAdmin.topics().getProperties(topicName).get("key1"), "value2")); + + // generalRole doesn't have authorization to update topic's properties so it will fail + try { + generalAdmin.topics().updateProperties(topicName, topicProperties); + fail("should have failed with authorization exception"); + } catch (Exception e) { + assertTrue(e.getMessage().startsWith( + "Unauthorized to validateTopicOperation for operation [UPDATE_METADATA]")); + } + + log.info("-- Exiting {} test --", methodName); + } @Test public void testSubscriptionPrefixAuthorization() throws Exception { log.info("-- Starting {} test --", methodName); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java index 42a97bf0fcbdd..53da440736208 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -217,10 +217,10 @@ public void testConcurrentWriteBrokerData() throws Exception { @Cleanup("shutdownNow") ExecutorService executor = Executors.newFixedThreadPool(10); List> list = new ArrayList<>(); + LocalBrokerData data = loadManager.getLoadManager().updateLocalBrokerData(); + data.cleanDeltas(); + data.getBundles().clear(); for (int i = 0; i < 1000; i++) { - LocalBrokerData data = loadManager.getLoadManager().updateLocalBrokerData(); - data.cleanDeltas(); - data.getBundles().clear(); list.add(executor.submit(() -> { try { assertNotNull(loadManager.generateLoadReport()); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java index f0e9f4a33f91d..5523e9416844c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BytesKeyTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientAuthenticationTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientAuthenticationTlsTest.java index 289a7a6797d14..186bf9d736e45 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientAuthenticationTlsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientAuthenticationTlsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java index bc459fde30540..1c5cf2ee2e795 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java index c8acc7d46f82d..168886f733a3c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -23,7 +23,6 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -41,7 +40,7 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") +@Test(groups = "broker-api") public class ClientDeduplicationTest extends ProducerConsumerBase { @DataProvider diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java index 62e459dda0dfd..e8b9baa992c46 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerAckListTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerAckListTest.java index e101a513c3759..d01e5b764a7a1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerAckListTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerAckListTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerBatchReceiveTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerBatchReceiveTest.java index 8109e8ce8ebf8..c6e5f17155a97 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerBatchReceiveTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerBatchReceiveTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerCleanupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerCleanupTest.java index 230c2ae8cd0e3..65e6f6cf6c29c 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerCleanupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerCleanupTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.pulsar.client.api; import io.netty.util.HashedWheelTimer; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java index 3d931346c89b2..7e3b68a5445be 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -30,9 +30,12 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import lombok.Cleanup; import org.apache.pulsar.client.impl.ConsumerImpl; import org.apache.pulsar.client.impl.MessageIdImpl; +import org.apache.pulsar.common.api.proto.CommandAck; import org.apache.pulsar.common.util.FutureUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,6 +68,19 @@ public Object[][] ackReceiptEnabled() { return new Object[][] { { true }, { false } }; } + @DataProvider(name = "batchedMessageAck") + public Object[][] batchedMessageAck() { + // When batch index ack is disabled (by default), only after all single messages were sent would the pending + // ACK be added into the ACK tracker. + return new Object[][] { + // numAcked, batchSize, ack type + { 3, 5, CommandAck.AckType.Individual }, + { 5, 5, CommandAck.AckType.Individual }, + { 3, 5, CommandAck.AckType.Cumulative }, + { 5, 5, CommandAck.AckType.Cumulative } + }; + } + /** * It verifies that redelivered messages are sorted based on the ledger-ids. * 

@@ -297,4 +313,57 @@ public void testMessageRedeliveryAfterUnloadedWithEarliestPosition() throws Exce
         consumer.close();
         producer.close();
     }
+
+    @Test(timeOut = 30000, dataProvider = "batchedMessageAck")
+    public void testAckNotSent(int numAcked, int batchSize, CommandAck.AckType ackType) throws Exception {
+        String topic = "persistent://my-property/my-ns/test-ack-not-sent-"
+                + numAcked + "-" + batchSize + "-" + ackType.getValue();
+        @Cleanup Consumer consumer = pulsarClient.newConsumer(Schema.STRING)
+                .topic(topic)
+                .subscriptionName("sub")
+                .enableBatchIndexAcknowledgment(false)
+                .acknowledgmentGroupTime(1, TimeUnit.HOURS) // ACK won't be sent
+                .subscribe();
+        @Cleanup Producer producer = pulsarClient.newProducer(Schema.STRING)
+                .topic(topic)
+                .enableBatching(true)
+                .batchingMaxMessages(batchSize)
+                .batchingMaxPublishDelay(1, TimeUnit.HOURS)
+                .create();
+        for (int i = 0; i < batchSize; i++) {
+            String value = "msg-" + i;
+            producer.sendAsync(value).thenAccept(id -> log.info("{} was sent to {}", value, id));
+        }
+        List> messages = new ArrayList<>();
+        for (int i = 0; i < batchSize; i++) {
+            messages.add(consumer.receive());
+        }
+        if (ackType == CommandAck.AckType.Individual) {
+            for (int i = 0; i < numAcked; i++) {
+                consumer.acknowledge(messages.get(i));
+            }
+        } else {
+            consumer.acknowledgeCumulative(messages.get(numAcked - 1));
+        }
+
+        consumer.redeliverUnacknowledgedMessages();
+
+        messages.clear();
+        for (int i = 0; i < batchSize; i++) {
+            Message msg = consumer.receive(2, TimeUnit.SECONDS);
+            if (msg == null) {
+                break;
+            }
+            log.info("Received {} from {}", msg.getValue(), msg.getMessageId());
+            messages.add(msg);
+        }
+        List values = messages.stream().map(Message::getValue).collect(Collectors.toList());
+        // All messages are redelivered because only if the whole batch are acknowledged would the message ID be
+        // added into the ACK tracker.
+        if (numAcked < batchSize) {
+            assertEquals(values, IntStream.range(0, batchSize).mapToObj(i -> "msg-" + i).collect(Collectors.toList()));
+        } else {
+            assertTrue(values.isEmpty());
+        }
+    }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java
index cb9a4c3c104c7..5e3731fbf24fc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DeadLetterTopicTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
index 93b51ebf871f4..fc103a46027c0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -50,7 +50,6 @@
 import lombok.Cleanup;
 import org.apache.pulsar.broker.namespace.NamespaceService;
 import org.apache.pulsar.broker.service.BrokerService;
-import org.apache.pulsar.broker.service.CanPausedNamespaceService;
 import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers;
 import org.apache.pulsar.broker.service.persistent.PersistentTopic;
 import org.apache.pulsar.client.impl.ConsumerImpl;
@@ -618,12 +617,13 @@ public void testBrokerSubscriptionRecovery(boolean unloadBundleGracefully) throw
         }
         latch.await();
         // (2) consume all messages except: unackMessages-set
-        Set unackMessages = Sets.newHashSet(5, 10, 20, 21, 22, 23, 25, 26, 30, 32, 40, 80, 160, 320);
+        Set unackMsgIndex = Sets.newHashSet(5, 10, 20, 21, 22, 23, 25, 26, 30, 32, 40, 80, 160, 320);
+        Set unackMsgs = unackMsgIndex.stream().map(i -> "my-message-" + i).collect(Collectors.toSet());
         int receivedMsgCount = 0;
         for (int i = 0; i < totalProducedMsgs; i++) {
             Message msg = consumer.receive(500, TimeUnit.MILLISECONDS);
             assertNotNull(msg);
-            if (!unackMessages.contains(i)) {
+            if (!unackMsgs.contains(new String(msg.getData()))) {
                 consumer.acknowledge(msg);
             }
             receivedMsgCount++;
@@ -635,7 +635,7 @@ public void testBrokerSubscriptionRecovery(boolean unloadBundleGracefully) throw
         if (unloadBundleGracefully) {
             // set clean namespace which will not let broker unload bundle gracefully: stop broker
             Supplier namespaceServiceSupplier =
-                    () -> spyWithClassAndConstructorArgs(CanPausedNamespaceService.class, pulsar);
+                    () -> spyWithClassAndConstructorArgs(NamespaceService.class, pulsar);
             doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider();
         }
         stopBroker();
@@ -646,7 +646,6 @@ public void testBrokerSubscriptionRecovery(boolean unloadBundleGracefully) throw
                 .subscriptionType(SubscriptionType.Shared).subscribe();
 
         // consumer should only receive unakced messages
-        Set unackMsgs = unackMessages.stream().map(i -> "my-message-" + i).collect(Collectors.toSet());
         Set receivedMsgs = new HashSet<>();
         for (int i = 0; i < totalProducedMsgs; i++) {
             Message msg = consumer.receive(500, TimeUnit.MILLISECONDS);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java
index dae6124223f9b..066236eed5b2d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/InterceptorsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/InterceptorsTest.java
index 283c5071e15ac..f23d82b32cd43 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/InterceptorsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/InterceptorsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java
index 0917eb7764fab..7b617a6a192d8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,6 +24,7 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
+import com.google.common.collect.Lists;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -49,7 +50,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import lombok.Cleanup;
 import org.apache.bookkeeper.mledger.impl.PositionImpl;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
 import org.apache.pulsar.broker.service.Topic;
 import org.apache.pulsar.broker.service.nonpersistent.NonPersistentStickyKeyDispatcherMultipleConsumers;
 import org.apache.pulsar.broker.service.persistent.PersistentStickyKeyDispatcherMultipleConsumers;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MemoryLimitTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MemoryLimitTest.java
index 431991e61aa19..ae6a78227b479 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MemoryLimitTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MemoryLimitTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -37,12 +37,12 @@
 @Test(groups = "broker-api")
 public class MemoryLimitTest extends ProducerConsumerBase {
 
-    @DataProvider(name = "batching")
+    @DataProvider(name = "batchingAndMemoryLimit")
     public Object[][] provider() {
         return new Object[][] {
-                // "Batching"
-                { false },
-                { true },
+                // "Batching, memoryLimit in kilo bytes"
+                {false, 100},
+                {true, 201} // batching need n(batches)*1024(allocated size) capacity, that is 100+101*1024 bytes
         };
     }
 
@@ -59,14 +59,14 @@ protected void cleanup() throws Exception {
         super.internalCleanup();
     }
 
-    @Test
-    public void testRejectMessages()
+    @Test(dataProvider = "batchingAndMemoryLimit")
+    public void testRejectMessages(boolean batching, int memoryLimit)
             throws Exception {
         String topic = newTopicName();
 
         ClientBuilder clientBuilder = PulsarClient.builder()
                 .serviceUrl(pulsar.getBrokerServiceUrl())
-                .memoryLimit(100, SizeUnit.KILO_BYTES);
+                .memoryLimit(memoryLimit, SizeUnit.KILO_BYTES);
 
         @Cleanup
         PulsarTestClient client = PulsarTestClient.create(clientBuilder);
@@ -74,6 +74,10 @@ public void testRejectMessages()
         @Cleanup
         ProducerImpl producer = (ProducerImpl) client.newProducer()
                 .topic(topic)
+                .enableBatching(batching)
+                .batchingMaxMessages(1)
+                .batchingMaxPublishDelay(1, TimeUnit.HOURS)
+                .batchingMaxBytes(Integer.MAX_VALUE)
                 .blockIfQueueFull(false)
                 .sendTimeout(5, TimeUnit.SECONDS)
                 .create();
@@ -88,7 +92,12 @@ public void testRejectMessages()
         Awaitility.await()
                 .atMost(Duration.ofSeconds(5))
                 .until(() -> producer.getPendingQueueSize() == n);
-        assertEquals(client.getMemoryLimitController().currentUsage(), n * 1024);
+        if (batching) {
+            // BatchMessageContainerImpl allocated buffer size is 1024, so we need add n(batches)*1024
+            assertEquals(client.getMemoryLimitController().currentUsage(), n * 1024 + n * 1024);
+        } else {
+            assertEquals(client.getMemoryLimitController().currentUsage(), n * 1024);
+        }
 
         try {
             producer.send(new byte[1024]);
@@ -107,14 +116,14 @@ public void testRejectMessages()
         producer.send(new byte[1024]);
     }
 
-    @Test
-    public void testRejectMessagesOnMultipleTopics() throws Exception {
+    @Test(dataProvider = "batchingAndMemoryLimit")
+    public void testRejectMessagesOnMultipleTopics(boolean batching, int memoryLimit) throws Exception {
         String t1 = newTopicName();
         String t2 = newTopicName();
 
         ClientBuilder clientBuilder = PulsarClient.builder()
                 .serviceUrl(pulsar.getBrokerServiceUrl())
-                .memoryLimit(100, SizeUnit.KILO_BYTES);
+                .memoryLimit(memoryLimit, SizeUnit.KILO_BYTES);
 
         @Cleanup
         PulsarTestClient client = PulsarTestClient.create(clientBuilder);
@@ -122,6 +131,10 @@ public void testRejectMessagesOnMultipleTopics() throws Exception {
         @Cleanup
         ProducerImpl p1 = (ProducerImpl) client.newProducer()
                 .topic(t1)
+                .enableBatching(batching)
+                .batchingMaxMessages(1)
+                .batchingMaxPublishDelay(1, TimeUnit.HOURS)
+                .batchingMaxBytes(Integer.MAX_VALUE)
                 .blockIfQueueFull(false)
                 .sendTimeout(5, TimeUnit.SECONDS)
                 .create();
@@ -129,6 +142,10 @@ public void testRejectMessagesOnMultipleTopics() throws Exception {
         @Cleanup
         ProducerImpl p2 = (ProducerImpl) client.newProducer()
                 .topic(t2)
+                .enableBatching(batching)
+                .batchingMaxMessages(1)
+                .batchingMaxPublishDelay(1, TimeUnit.HOURS)
+                .batchingMaxBytes(Integer.MAX_VALUE)
                 .blockIfQueueFull(false)
                 .sendTimeout(5, TimeUnit.SECONDS)
                 .create();
@@ -146,7 +163,12 @@ public void testRejectMessagesOnMultipleTopics() throws Exception {
         Awaitility.await()
                 .atMost(Duration.ofSeconds(5))
                 .until(() -> (p1.getPendingQueueSize() + p2.getPendingQueueSize()) == n);
-        assertEquals(client.getMemoryLimitController().currentUsage(), n * 1024);
+        if (batching) {
+            // BatchMessageContainerImpl allocated buffer size is 1024, so we need add n(batches)*1024
+            assertEquals(client.getMemoryLimitController().currentUsage(), n * 1024 + n * 1024);
+        } else {
+            assertEquals(client.getMemoryLimitController().currentUsage(), n * 1024);
+        }
 
         try {
             p1.send(new byte[1024]);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
index d3e5067ed3123..ed85ffd600ec6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerService.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerService.java
index 7cba7405ddbf6..3e6ee4f2a969d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerService.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerServiceHooks.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerServiceHooks.java
index a68e2d5c32c30..06289e123c8b9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerServiceHooks.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MockBrokerServiceHooks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiRolesTokenAuthorizationProviderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiRolesTokenAuthorizationProviderTest.java
index 12d7c71358bbd..02b58a8667dd1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiRolesTokenAuthorizationProviderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiRolesTokenAuthorizationProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java
index d0e8af54b621e..6bd11de5a2f88 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -38,11 +37,11 @@
 import org.apache.pulsar.client.impl.ClientBuilderImpl;
 import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
+import org.awaitility.Awaitility;
 import org.mockito.AdditionalAnswers;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java
index 6dc901d53e268..472af3e88cd36 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MutualAuthenticationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java
index c68ef91d211dc..c55f34987d31a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
index d1b536a679689..d4af84b846960 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java
index 13f11c0261296..a005170323118 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionedProducerConsumerTest.java
index 472f08fa962df..e0e1bf20e7cbc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionedProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionedProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PatternMultiTopicsConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PatternMultiTopicsConsumerTest.java
index dc8cecdadc4ec..00a47c3957150 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PatternMultiTopicsConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PatternMultiTopicsConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCleanupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCleanupTest.java
index 251dd8a0aaa92..9184c6d9dd052 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCleanupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCleanupTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerConsumerBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerConsumerBase.java
index a7a14568f6ec1..ca58bddf13c23 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerConsumerBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerConsumerBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCreationTest.java
index bd5ce7b1746e6..d5734588288f3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCreationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCreationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerQueueSizeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerQueueSizeTest.java
index 6c3a270bb1ae2..961297347f16e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerQueueSizeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerQueueSizeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProxyProtocolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProxyProtocolTest.java
index e5b532414bdd1..7f632d5a76485 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProxyProtocolTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProxyProtocolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithInternalListenerNameTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithInternalListenerNameTest.java
index 35e8939e53153..67d3b2b40d307 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithInternalListenerNameTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithInternalListenerNameTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithoutInternalListenerNameTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithoutInternalListenerNameTest.java
index 85c4ab37cab3b..a748de20323e5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithoutInternalListenerNameTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PulsarMultiListenersWithoutInternalListenerNameTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java
index 5f02219aac344..3028392ada1e8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/RetryTopicTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ServiceUrlProviderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ServiceUrlProviderTest.java
index 80408910141a9..22b22455cb7b5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ServiceUrlProviderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ServiceUrlProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java
index 7cfa35c9d1c7e..c8ab95cde9dc2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerStatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,6 +19,7 @@
 package org.apache.pulsar.client.api;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
@@ -30,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
@@ -449,4 +451,63 @@ public void testProducerPendingQueueSizeStats(boolean batchingEnabled) throws Ex
                 .until(() -> producer.getStats().getPendingQueueSize() == numMessages);
         assertEquals(producer.getStats().getPendingQueueSize(), numMessages);
     }
+
+    /**
+     * This test verifies partitioned topic stats for producer and consumer.
+     * @throws Exception
+     */
+    @Test
+    public void testPartitionTopicStats() throws Exception {
+        log.info("-- Starting {} test --", methodName);
+
+        String topicName = "persistent://my-property/my-ns/testPartitionTopicStats";
+        int numPartitions = 10;
+        admin.topics().createPartitionedTopic(topicName, numPartitions);
+
+        ConsumerBuilder consumerBuilder = pulsarClient.newConsumer().topic(topicName)
+                .subscriptionName("my-subscriber-name");
+
+        Consumer consumer = consumerBuilder.subscribe();
+
+        ProducerBuilder producerBuilder = pulsarClient.newProducer().enableBatching(false).topic(topicName);
+
+        Producer producer = producerBuilder.create();
+
+        int numMessages = 20;
+        for (int i = 0; i < numMessages; i++) {
+            String message = "my-message-" + i;
+            producer.send(message.getBytes());
+        }
+
+        Message msg = null;
+        Set messageSet = new HashSet<>();
+        for (int i = 0; i < numMessages; i++) {
+            msg = consumer.receive(5, TimeUnit.SECONDS);
+            String receivedMessage = new String(msg.getData());
+            log.info("Received message: [{}]", receivedMessage);
+            String expectedMessage = "my-message-" + i;
+            testMessageOrderAndDuplicates(messageSet, receivedMessage, expectedMessage);
+        }
+        // Acknowledge the consumption of all messages at once
+        consumer.acknowledgeCumulative(msg);
+
+        ConsumerStats cStat = consumer.getStats();
+        ProducerStats pStat = producer.getStats();
+        retryStrategically((test) -> !pStat.getPartitionStats().isEmpty(), 5, 100);
+        retryStrategically((test) -> !cStat.getPartitionStats().isEmpty(), 5, 100);
+        Map prodStatsMap = pStat.getPartitionStats();
+        Map consStatsMap = cStat.getPartitionStats();
+        assertFalse(prodStatsMap.isEmpty());
+        assertFalse(consStatsMap.isEmpty());
+        for (int i = 0; i < numPartitions; i++) {
+            String topic = topicName + "-partition-" + i;
+            assertTrue(prodStatsMap.containsKey(topic));
+            assertTrue(consStatsMap.containsKey(topic));
+        }
+
+        consumer.close();
+        producer.close();
+
+        log.info("-- Exiting {} test --", methodName);
+    }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
index a7716150bbd69..8b033d0231fae 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -140,7 +140,7 @@ public void rest() throws Exception {
 
         for (String tenant : admin.tenants().getTenants()) {
             for (String namespace : admin.namespaces().getNamespaces(tenant)) {
-                deleteNamespaceGraceFully(namespace, true);
+                deleteNamespaceWithRetry(namespace, true);
             }
             admin.tenants().deleteTenant(tenant, true);
         }
@@ -3377,6 +3377,9 @@ public void testConsumerSubscriptionInitialize() throws Exception {
         defaultConsumer.close();
         latestConsumer.close();
         earliestConsumer.close();
+        producer.close();
+
+        admin.topics().delete(topicName, true);
 
         log.info("-- Exiting {} test --", methodName);
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
index 244ccab1a35d1..21d6a7ed89a56 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleTypedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleTypedProducerConsumerTest.java
index c5a7de1abecd9..f127ca64b072e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleTypedProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleTypedProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
index 642bec7321edd..9036d82d84f01 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TenantTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TenantTest.java
index 3ec4f5e980fe5..15c5d55cbea5b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TenantTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TenantTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsHostVerificationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsHostVerificationTest.java
index 1689cf0491b77..95a78d7ffcef6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsHostVerificationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsHostVerificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java
index e7087a2637f27..6a2109836a2c9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerTest.java
index 06666d55ec45c..0563fc3b9da37 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsSniTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsSniTest.java
index c3f7a46a21ba1..fd722e52e5f1f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsSniTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TlsSniTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenAuthenticatedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenAuthenticatedProducerConsumerTest.java
index 3170a101ff8c5..87f12e6acdcb2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenAuthenticatedProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenAuthenticatedProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenExpirationProduceConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenExpirationProduceConsumerTest.java
index 520c8743cbed2..e955a9ae7062f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenExpirationProduceConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenExpirationProduceConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 import static org.testng.Assert.assertThrows;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
index cc1bd8cbe5918..22834b2e0c9c1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TokenOauth2AuthenticatedProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -35,6 +35,7 @@
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.impl.ProducerImpl;
 import org.apache.pulsar.client.impl.auth.oauth2.AuthenticationFactoryOAuth2;
+import org.apache.pulsar.client.impl.auth.oauth2.AuthenticationOAuth2;
 import org.apache.pulsar.common.policies.data.ClusterData;
 import org.apache.pulsar.common.policies.data.TenantInfoImpl;
 import org.awaitility.Awaitility;
@@ -61,6 +62,8 @@ public class TokenOauth2AuthenticatedProducerConsumerTest extends ProducerConsum
 
     // Credentials File, which contains "client_id" and "client_secret"
     private final String CREDENTIALS_FILE = "./src/test/resources/authentication/token/credentials_file.json";
+    private final String ISSUER_URL = "https://dev-kt-aa9ne.us.auth0.com";
+    private final String AUDIENCE = "https://dev-kt-aa9ne.us.auth0.com/api/v2/";
 
     @BeforeMethod(alwaysRun = true)
     @Override
@@ -77,6 +80,13 @@ protected void setup() throws Exception {
         providers.add(AuthenticationProviderToken.class.getName());
         conf.setAuthenticationProviders(providers);
 
+        conf.setBrokerClientAuthenticationPlugin(AuthenticationOAuth2.class.getName());
+        conf.setBrokerClientAuthenticationParameters("{\n"
+                + "  \"privateKey\": \"" + CREDENTIALS_FILE + "\",\n"
+                + "  \"issuerUrl\": \"" + ISSUER_URL + "\",\n"
+                + "  \"audience\": \"" + AUDIENCE + "\",\n"
+                + "}\n");
+
         conf.setClusterName("test");
 
         // Set provider domain name
@@ -94,9 +104,9 @@ protected final void clientSetup() throws Exception {
 
         // AuthenticationOAuth2
         Authentication authentication = AuthenticationFactoryOAuth2.clientCredentials(
-                new URL("https://dev-kt-aa9ne.us.auth0.com"),
+                new URL(ISSUER_URL),
                 path.toUri().toURL(),  // key file path
-                "https://dev-kt-aa9ne.us.auth0.com/api/v2/"
+                AUDIENCE
         );
 
         admin = spy(PulsarAdmin.builder().serviceHttpUrl(brokerUrl.toString())
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java
index 618cd1aa1aadf..c2eb957ee605d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java
index d4bc019db9202..c227411f233d3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java
index 9b1848c9ff3a4..9ddd0dbfb05fd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AdminApiKeyStoreTlsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AdminApiKeyStoreTlsAuthTest.java
index 04b05b36d0e78..3194a91c6e4b3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AdminApiKeyStoreTlsAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AdminApiKeyStoreTlsAuthTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiPartTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiPartTest.java
index 6cbd54894d607..08aca4838d854 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiPartTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiPartTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiTopicTest.java
index a28ed59893f3b..f50fcdeea95bc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConMultiTopicTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConNoPartTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConNoPartTest.java
index a7d2ac1055ded..940927ebd8164 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConNoPartTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConNoPartTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConSupports.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConSupports.java
index e7547033ecf30..e03b170913751 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConSupports.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConSupports.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConTXTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConTXTest.java
index 3647777f8430e..5f1c9037944c0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConTXTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoCloseUselessClientConTXTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -46,8 +46,8 @@
 @Test(groups = "broker-impl")
 public class AutoCloseUselessClientConTXTest extends AutoCloseUselessClientConSupports {
 
-    private static String topicName = UUID.randomUUID().toString().replaceAll("-","");
-    private static String topicFullName = "persistent://public/default/" + topicName;
+    private static final String topicName = UUID.randomUUID().toString().replaceAll("-","");
+    private static final String topicFullName = "persistent://public/default/" + topicName;
 
     @BeforeMethod
     public void before() throws PulsarAdminException, MetadataStoreException {
@@ -59,38 +59,18 @@ public void before() throws PulsarAdminException, MetadataStoreException {
                 && !topicList_defaultNamespace.contains(topicFullName)){
             pulsarAdmin_0.topics().createNonPartitionedTopic(topicFullName);
         }
-        List topicList_systemNamespace = pulsarAdmin_0.topics().getList("pulsar/system");
-
-        if (!pulsar.getPulsarResources()
-                .getNamespaceResources()
-                .getPartitionedTopicResources().partitionedTopicExists(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN)){
-            pulsar.getPulsarResources()
-                    .getNamespaceResources()
-                    .getPartitionedTopicResources()
-                    .createPartitionedTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN,
-                            new PartitionedTopicMetadata(2));
-        }
-        if (!pulsar.getPulsarResources()
-                .getNamespaceResources()
-                .getPartitionedTopicResources().partitionedTopicExists(SystemTopicNames.TRANSACTION_COORDINATOR_LOG)){
-            pulsar.getPulsarResources()
-                    .getNamespaceResources()
-                    .getPartitionedTopicResources()
-                    .createPartitionedTopic(SystemTopicNames.TRANSACTION_COORDINATOR_LOG,
-                            new PartitionedTopicMetadata(2));
-        }
     }
 
     @Override
     protected void doInitConf() throws Exception {
         super.doInitConf();
-        updateConfig(conf, "BROKER-INIT");
+        updateConfig(conf);
     }
 
     @Override
     protected ServiceConfiguration createConfForAdditionalBroker(int additionalBrokerIndex) {
         ServiceConfiguration conf = super.createConfForAdditionalBroker(additionalBrokerIndex);
-        updateConfig(conf, "BROKER-" + additionalBrokerIndex);
+        updateConfig(conf);
         return conf;
     }
 
@@ -110,7 +90,20 @@ protected PulsarClient createNewPulsarClient(ClientBuilder clientBuilder) throws
             if (!admin.namespaces().getNamespaces("pulsar").contains("pulsar/system")) {
                 admin.namespaces().createNamespace("pulsar/system");
             }
-        }catch (Exception e){
+
+            if (conf.isTransactionCoordinatorEnabled()) {
+                if (!pulsar.getPulsarResources()
+                        .getNamespaceResources()
+                        .getPartitionedTopicResources()
+                        .partitionedTopicExists(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN)){
+                    pulsar.getPulsarResources()
+                            .getNamespaceResources()
+                            .getPartitionedTopicResources()
+                            .createPartitionedTopic(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN,
+                                    new PartitionedTopicMetadata(2));
+                }
+            }
+        } catch (Exception e){
             log.warn("create namespace failure", e);
         }
         return clientBuilder.enableTransaction(true).build();
@@ -119,7 +112,7 @@ protected PulsarClient createNewPulsarClient(ClientBuilder clientBuilder) throws
     /**
      * Override for make broker enable transaction.
      */
-    private void updateConfig(ServiceConfiguration conf, String advertisedAddress) {
+    private void updateConfig(ServiceConfiguration conf) {
         this.conf.setTransactionCoordinatorEnabled(true);
         this.conf.setSystemTopicEnabled(true);
         this.conf.setTopicLevelPoliciesEnabled(true);
@@ -132,11 +125,11 @@ private void updateConfig(ServiceConfiguration conf, String advertisedAddress) {
     public void testConnectionAutoReleaseUnPartitionedTopicWithTransaction() throws Exception {
         PulsarClientImpl pulsarClient = (PulsarClientImpl) super.getAllClients().get(0);
         // Init clients
-        Consumer consumer = pulsarClient.newConsumer()
+        Consumer consumer = pulsarClient.newConsumer()
                 .topic(topicName)
                 .subscriptionName("my-subscription-x")
                 .subscribe();
-        Producer producer = pulsarClient.newProducer()
+        Producer producer = pulsarClient.newProducer()
                 .sendTimeout(0, TimeUnit.SECONDS)
                 .topic(topicName)
                 .create();
@@ -158,6 +151,4 @@ public void testConnectionAutoReleaseUnPartitionedTopicWithTransaction() throws
         consumer.close();
         producer.close();
     }
-
-
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoScaledReceiverQueueSizeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoScaledReceiverQueueSizeTest.java
index 30794a2ba8a26..5d3c07d103ec3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoScaledReceiverQueueSizeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/AutoScaledReceiverQueueSizeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplSerializationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplSerializationTest.java
index 56d32e1d21239..d40c8572103dd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplSerializationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplSerializationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckDisableTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckDisableTest.java
index da946896b6797..c2e910d79ef81 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckDisableTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckDisableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckTest.java
index c9bdb75af86cc..d72807a920f2b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BatchMessageIndexAckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
index e3af761429a09..c29978c5f5283 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java
index 7f2d11fd3adf5..322cf524dbe9c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientWithSocks5ProxyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientWithSocks5ProxyTest.java
index 1478b400ffdf6..81755b82968fa 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientWithSocks5ProxyTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ClientWithSocks5ProxyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/CompactedOutBatchMessageTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/CompactedOutBatchMessageTest.java
index f3fd353cdc306..012e4cdfd0a30 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/CompactedOutBatchMessageTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/CompactedOutBatchMessageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConnectionPoolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConnectionPoolTest.java
index 3d8b18c52e6ea..e8816894513d2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConnectionPoolTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConnectionPoolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumeBaseExceptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumeBaseExceptionTest.java
index 76a7f7e185e39..ef1c993642b4d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumeBaseExceptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumeBaseExceptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckTest.java
index ea2815641f1b7..42da60906483c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerConfigurationTest.java
index 3fa820f76043f..48ffb6a9c5888 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerConfigurationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerDedupPermitsUpdateTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerDedupPermitsUpdateTest.java
index 4c9922acbec06..6fc8268ae2165 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerDedupPermitsUpdateTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerDedupPermitsUpdateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerMemoryLimitTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerMemoryLimitTest.java
index 3c621fb83f10b..cf647eeda2e9f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerMemoryLimitTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerMemoryLimitTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 import lombok.Cleanup;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerUnsubscribeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerUnsubscribeTest.java
index 87d1546e0819f..b3d417e293303 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerUnsubscribeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerUnsubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DispatchAccordingPermitsTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DispatchAccordingPermitsTests.java
index c5927a1266f74..1cbefb83a19e8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DispatchAccordingPermitsTests.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DispatchAccordingPermitsTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DynamicReceiverQueueSizeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DynamicReceiverQueueSizeTest.java
index 692beaf1aa564..be9bbaa65b1f4 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DynamicReceiverQueueSizeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DynamicReceiverQueueSizeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
index d284853050e7e..8838bd9e3a1dd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -35,7 +35,6 @@
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.ProducerConsumerBase;
-import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.awaitility.Awaitility;
@@ -70,9 +69,6 @@ public Object[][] subType() {
     @Test(dataProvider = "subType")
     public void testCanRecoverConsumptionWhenLiftMaxUnAckedMessagesRestriction(SubscriptionType subscriptionType)
             throws PulsarClientException {
-        PulsarClient pulsarClient = PulsarClient.builder().
-                serviceUrl(lookupUrl.toString())
-                .build();
         final int totalMsg = 1000;
         String topic = "broker-close-test-" + RandomStringUtils.randomAlphabetic(5);
         Map, List> nameToId = new ConcurrentHashMap<>();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithAuthTest.java
index 3b65806515001..8e508b6cf2068 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithAuthTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithoutAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithoutAuthTest.java
index a4b6ef599b58d..b5ec18b68f8b3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithoutAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsProducerConsumerTestWithoutAuthTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsTest.java
index c5894ace01da6..6edcf0d60cdce 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeyStoreTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/LookupRetryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/LookupRetryTest.java
index 448f099c386d8..929784541f00a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/LookupRetryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/LookupRetryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChecksumTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChecksumTest.java
index ba0d65007da6a..515b34db8509d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChecksumTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChecksumTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingSharedTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingSharedTest.java
index e2aa128134130..163c42d835b35 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingSharedTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingSharedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -48,7 +48,7 @@
 import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
 import org.apache.pulsar.common.api.proto.MessageMetadata;
 import org.apache.pulsar.common.protocol.Commands;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.awaitility.Awaitility;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
index 50fb05cd75f34..8b4b73842e2cd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -116,10 +116,10 @@ public void testInvalidConfig() throws Exception {
     public void testLargeMessage(boolean ackReceiptEnabled, boolean clientSizeMaxMessageSize) throws Exception {
 
         log.info("-- Starting {} test --", methodName);
-        clientSizeMaxMessageSize = false;
-        this.conf.setMaxMessageSize(50);
         if (clientSizeMaxMessageSize) {
-            this.conf.setMaxMessageSize(5);
+            this.conf.setMaxMessageSize(35);
+        } else {
+            this.conf.setMaxMessageSize(50);
         }
         final int totalMessages = 5;
         final String topicName = "persistent://my-property/my-ns/my-topic1";
@@ -130,7 +130,7 @@ public void testLargeMessage(boolean ackReceiptEnabled, boolean clientSizeMaxMes
 
         ProducerBuilder producerBuilder = pulsarClient.newProducer().topic(topicName);
         if (clientSizeMaxMessageSize) {
-            producerBuilder.chunkMaxMessageSize(5);
+            producerBuilder.chunkMaxMessageSize(35);
         }
 
         Producer producer = producerBuilder.compressionType(CompressionType.LZ4).enableChunking(true)
@@ -313,13 +313,14 @@ public void testPublishWithFailure() throws Exception {
     public void testMaxPendingChunkMessages() throws Exception {
 
         log.info("-- Starting {} test --", methodName);
-        this.conf.setMaxMessageSize(10);
+        this.conf.setMaxMessageSize(100);
         final int totalMessages = 25;
         final String topicName = "persistent://my-property/my-ns/maxPending";
         final int totalProducers = 25;
         @Cleanup("shutdownNow")
         ExecutorService executor = Executors.newFixedThreadPool(totalProducers);
 
+        @Cleanup
         ConsumerImpl consumer = (ConsumerImpl) pulsarClient.newConsumer().topic(topicName)
                 .subscriptionName("my-subscriber-name").acknowledgmentGroupTime(0, TimeUnit.SECONDS)
                 .maxPendingChunkedMessage(1).autoAckOldestChunkedMessageOnQueueFull(true)
@@ -334,12 +335,11 @@ public void testMaxPendingChunkMessages() throws Exception {
             producers[i] = producerBuilder.enableChunking(true).enableBatching(false).create();
             int index = i;
             executor.submit(() -> {
-                futures.add(producers[index].sendAsync(createMessagePayload(45).getBytes()));
+                futures.add(producers[index].sendAsync(createMessagePayload(450).getBytes()));
             });
         }
 
         FutureUtil.waitForAll(futures).get();
-        PersistentTopic topic = (PersistentTopic) pulsar.getBrokerService().getTopicIfExists(topicName).get().get();
 
         Message msg = null;
         Set messageSet = new HashSet<>();
@@ -354,8 +354,12 @@ public void testMaxPendingChunkMessages() throws Exception {
             consumer.acknowledge(msg);
         }
 
+        log.info("messageSet size: {}, totalPublishedMessages: {}", messageSet.size(), totalPublishedMessages);
         assertNotEquals(messageSet.size(), totalPublishedMessages);
 
+        for (int i = 0; i < totalProducers; i++) {
+            producers[i].close();
+        }
     }
 
     /**
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageIdTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageIdTest.java
index 1ec734bc508e9..c4cdcbd19d575 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageIdTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageIdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java
index 92c2d767098aa..772ddbee4e54d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
index d838c06ed217c..ad1955f08d779 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessagePublishThrottlingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageRedeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageRedeliveryTest.java
index 4e4e3ac086a2c..29b06f68b64eb 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageRedeliveryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageRedeliveryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -262,7 +262,6 @@ public void testDoNotRedeliveryMarkDeleteMessages() throws PulsarClientException
     public void testRedeliveryAddEpoch(boolean enableBatch) throws Exception{
         final String topic = "testRedeliveryAddEpoch";
         final String subName = "my-sub";
-
         @Cleanup
         ConsumerImpl consumer = ((ConsumerImpl) pulsarClient.newConsumer(Schema.STRING)
                 .topic(topic)
@@ -309,10 +308,10 @@ public void testRedeliveryAddEpoch(boolean enableBatch) throws Exception{
         assertNull(message);
 
         ConnectionHandler connectionHandler = consumer.getConnectionHandler();
+
         connectionHandler.cnx().channel().close();
 
         consumer.grabCnx();
-
         message = consumer.receive(3, TimeUnit.SECONDS);
         assertNotNull(message);
         assertEquals(message.getValue(), test3);
@@ -423,13 +422,13 @@ public static Object[][] enableBatch() {
         return new Object[][] { { Boolean.TRUE }, { Boolean.FALSE } };
     }
 
+
     @Test(dataProvider = "enableBatch")
     public void testMultiConsumerRedeliveryAddEpoch(boolean enableBatch) throws Exception{
         final String topic = "testMultiConsumerRedeliveryAddEpoch";
         final String subName = "my-sub";
         admin.topics().createPartitionedTopic(topic, 5);
         final int messageNumber = 50;
-
         @Cleanup
         Consumer consumer = pulsarClient.newConsumer(Schema.STRING)
                 .topic(topic)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java
index 2974c39744f48..a41aac9bd457f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -66,7 +66,7 @@
 import org.testng.annotations.Test;
 
 @Slf4j
-@Test(groups = "flaky")
+@Test(groups = "broker-impl")
 public class MultiTopicsReaderTest extends MockedPulsarServiceBaseTest {
 
     private static final String subscription = "reader-multi-topics-sub";
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
index 34f8ff368a960..679d6c1a19e51 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/NegativeAcksTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,8 +20,12 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +37,9 @@
 import org.apache.pulsar.client.api.ProducerConsumerBase;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.SubscriptionType;
+import org.awaitility.Awaitility;
+import org.testcontainers.shaded.org.awaitility.reflect.WhiteboxImpl;
+import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
@@ -160,63 +167,64 @@ public void testNegativeAcks(boolean batching, boolean usePartitions, Subscripti
     public static Object[][] variationsBackoff() {
         return new Object[][] {
                 // batching / partitions / subscription-type / min-nack-time-ms/ max-nack-time-ms / ack-timeout
-                { false, false, SubscriptionType.Shared, 100, 1000, 0 },
-                { false, false, SubscriptionType.Failover, 100, 1000, 0 },
-                { false, true, SubscriptionType.Shared, 100, 1000, 0 },
-                { false, true, SubscriptionType.Failover, 100, 1000, 0 },
-                { true, false, SubscriptionType.Shared, 100, 1000, 0 },
-                { true, false, SubscriptionType.Failover, 100, 1000, 0 },
-                { true, true, SubscriptionType.Shared, 100, 1000, 0 },
-                { true, true, SubscriptionType.Failover, 100, 1000, 0 },
-
-                { false, false, SubscriptionType.Shared, 0, 1000, 0 },
-                { false, false, SubscriptionType.Failover, 0, 1000, 0 },
-                { false, true, SubscriptionType.Shared, 0, 1000, 0 },
-                { false, true, SubscriptionType.Failover, 0, 1000, 0 },
-                { true, false, SubscriptionType.Shared, 0, 1000, 0 },
-                { true, false, SubscriptionType.Failover, 0, 1000, 0 },
-                { true, true, SubscriptionType.Shared, 0, 1000, 0 },
-                { true, true, SubscriptionType.Failover, 0, 1000, 0 },
-
-                { false, false, SubscriptionType.Shared, 100, 1000, 1000 },
-                { false, false, SubscriptionType.Failover, 100, 1000, 1000 },
-                { false, true, SubscriptionType.Shared, 100, 1000, 1000 },
-                { false, true, SubscriptionType.Failover, 100, 1000, 1000 },
-                { true, false, SubscriptionType.Shared, 100, 1000, 1000 },
-                { true, false, SubscriptionType.Failover, 100, 1000, 1000 },
-                { true, true, SubscriptionType.Shared, 100, 1000, 1000 },
-                { true, true, SubscriptionType.Failover, 100, 1000, 1000 },
-
-                { false, false, SubscriptionType.Shared, 0, 1000, 1000 },
-                { false, false, SubscriptionType.Failover, 0, 1000, 1000 },
-                { false, true, SubscriptionType.Shared, 0, 1000, 1000 },
-                { false, true, SubscriptionType.Failover, 0, 1000, 1000 },
-                { true, false, SubscriptionType.Shared, 0, 1000, 1000 },
-                { true, false, SubscriptionType.Failover, 0, 1000, 1000 },
-                { true, true, SubscriptionType.Shared, 0, 1000, 1000 },
-                { true, true, SubscriptionType.Failover, 0, 1000, 1000 },
+                { false, false, SubscriptionType.Shared, 100, 1000 },
+                { false, false, SubscriptionType.Failover, 100, 1000 },
+                { false, true, SubscriptionType.Shared, 100, 1000 },
+                { false, true, SubscriptionType.Failover, 100, 1000 },
+                { true, false, SubscriptionType.Shared, 100, 1000 },
+                { true, false, SubscriptionType.Failover, 100, 1000 },
+                { true, true, SubscriptionType.Shared, 100, 1000 },
+                { true, true, SubscriptionType.Failover, 100, 1000 },
+
+                { false, false, SubscriptionType.Shared, 0, 1000 },
+                { false, false, SubscriptionType.Failover, 0, 1000 },
+                { false, true, SubscriptionType.Shared, 0, 1000 },
+                { false, true, SubscriptionType.Failover, 0, 1000 },
+                { true, false, SubscriptionType.Shared, 0, 1000 },
+                { true, false, SubscriptionType.Failover, 0, 1000 },
+                { true, true, SubscriptionType.Shared, 0, 1000 },
+                { true, true, SubscriptionType.Failover, 0, 1000 },
+
+                { false, false, SubscriptionType.Shared, 100, 1000 },
+                { false, false, SubscriptionType.Failover, 100, 1000 },
+                { false, true, SubscriptionType.Shared, 100, 1000 },
+                { false, true, SubscriptionType.Failover, 100, 1000 },
+                { true, false, SubscriptionType.Shared, 100, 1000 },
+                { true, false, SubscriptionType.Failover, 100, 1000 },
+                { true, true, SubscriptionType.Shared, 100, 1000 },
+                { true, true, SubscriptionType.Failover, 100, 1000 },
+
+                { false, false, SubscriptionType.Shared, 0, 1000 },
+                { false, false, SubscriptionType.Failover, 0, 1000 },
+                { false, true, SubscriptionType.Shared, 0, 1000 },
+                { false, true, SubscriptionType.Failover, 0, 1000 },
+                { true, false, SubscriptionType.Shared, 0, 1000 },
+                { true, false, SubscriptionType.Failover, 0, 1000 },
+                { true, true, SubscriptionType.Shared, 0, 1000 },
+                { true, true, SubscriptionType.Failover, 0, 1000 },
         };
     }
 
     @Test(dataProvider = "variationsBackoff")
     public void testNegativeAcksWithBackoff(boolean batching, boolean usePartitions, SubscriptionType subscriptionType,
-            int minNackTimeMs, int maxNackTimeMs, int ackTimeout)
+            int minNackTimeMs, int maxNackTimeMs)
             throws Exception {
         log.info("Test negative acks with back off batching={} partitions={} subType={} minNackTimeMs={}, "
                         + "maxNackTimeMs={}", batching, usePartitions, subscriptionType, minNackTimeMs, maxNackTimeMs);
         String topic = BrokerTestUtil.newUniqueName("testNegativeAcksWithBackoff");
 
+        MultiplierRedeliveryBackoff backoff = MultiplierRedeliveryBackoff.builder()
+                .minDelayMs(minNackTimeMs)
+                .maxDelayMs(maxNackTimeMs)
+                .build();
+
         @Cleanup
         Consumer consumer = pulsarClient.newConsumer(Schema.STRING)
                 .topic(topic)
                 .subscriptionName("sub1")
                 .acknowledgmentGroupTime(0, TimeUnit.SECONDS)
                 .subscriptionType(subscriptionType)
-                .negativeAckRedeliveryBackoff(MultiplierRedeliveryBackoff.builder()
-                        .minDelayMs(minNackTimeMs)
-                        .maxDelayMs(maxNackTimeMs)
-                        .build())
-                .ackTimeout(ackTimeout, TimeUnit.MILLISECONDS)
+                .negativeAckRedeliveryBackoff(backoff)
                 .subscribe();
 
         @Cleanup
@@ -235,9 +243,16 @@ public void testNegativeAcksWithBackoff(boolean batching, boolean usePartitions,
         }
         producer.flush();
 
-        for (int i = 0; i < N; i++) {
-            Message msg = consumer.receive();
-            consumer.negativeAcknowledge(msg);
+        final int redeliverCount = 5;
+        long firstReceivedAt = System.currentTimeMillis();
+        long expectedTotalRedeliveryDelay = 0;
+        for (int i = 0; i < redeliverCount; i++) {
+            for (int j = 0; j < N; j++) {
+                Message msg = consumer.receive();
+                log.info("Received message {}", msg.getValue());
+                consumer.negativeAcknowledge(msg);
+            }
+            expectedTotalRedeliveryDelay += backoff.next(i);
         }
 
         Set receivedMessages = new HashSet<>();
@@ -248,9 +263,15 @@ public void testNegativeAcksWithBackoff(boolean batching, boolean usePartitions,
             receivedMessages.add(msg.getValue());
             consumer.acknowledge(msg);
         }
-
+        long receivedAfterRedeliveryAt = System.currentTimeMillis();
+        log.info("Total redelivery delay: {} ms", receivedAfterRedeliveryAt - firstReceivedAt);
         assertEquals(receivedMessages, sentMessages);
 
+        if (SubscriptionType.Shared == subscriptionType) {
+            log.info("Total expected redelivery delay {} ms", expectedTotalRedeliveryDelay);
+            assertTrue(receivedAfterRedeliveryAt - firstReceivedAt >= expectedTotalRedeliveryDelay);
+        }
+
         // There should be no more messages
         assertNull(consumer.receive(100, TimeUnit.MILLISECONDS));
         consumer.close();
@@ -346,4 +367,130 @@ public void testNegativeAcksWithBatchAckEnabled() throws Exception {
         // There should be no more messages
         assertNull(consumer.receive(100, TimeUnit.MILLISECONDS));
     }
+
+    @Test
+    public void testFailoverConsumerBatchCumulateAck() throws Exception {
+        final String topic = BrokerTestUtil.newUniqueName("my-topic");
+        admin.topics().createPartitionedTopic(topic, 2);
+
+        @Cleanup
+        Consumer consumer = pulsarClient.newConsumer(Schema.INT32)
+                .topic(topic)
+                .subscriptionName("sub")
+                .subscriptionType(SubscriptionType.Failover)
+                .enableBatchIndexAcknowledgment(true)
+                .acknowledgmentGroupTime(100, TimeUnit.MILLISECONDS)
+                .receiverQueueSize(10)
+                .subscribe();
+
+        @Cleanup
+        Producer producer = pulsarClient.newProducer(Schema.INT32)
+                .topic(topic)
+                .batchingMaxMessages(10)
+                .batchingMaxPublishDelay(3, TimeUnit.SECONDS)
+                .blockIfQueueFull(true)
+                .create();
+
+        int count = 0;
+        Set datas = new HashSet<>();
+        CountDownLatch producerLatch = new CountDownLatch(10);
+        while (count < 10) {
+            datas.add(count);
+            producer.sendAsync(count).whenComplete((m, e) -> {
+                producerLatch.countDown();
+            });
+            count++;
+        }
+        producerLatch.await();
+        CountDownLatch consumerLatch = new CountDownLatch(1);
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                consumer.receiveAsync()
+                        .thenCompose(m -> {
+                            log.info("received one msg : {}", m.getMessageId());
+                            datas.remove(m.getValue());
+                            return consumer.acknowledgeCumulativeAsync(m);
+                        })
+                        .thenAccept(ignore -> {
+                            try {
+                                Thread.sleep(500);
+                                consumer.redeliverUnacknowledgedMessages();
+                            } catch (Exception e) {
+                                throw new RuntimeException(e);
+                            }
+                        })
+                        .whenComplete((r, e) -> {
+                            consumerLatch.countDown();
+                        });
+            }
+        }).start();
+        consumerLatch.await();
+        Thread.sleep(500);
+        count = 0;
+        while(true) {
+            Message msg = consumer.receive(5, TimeUnit.SECONDS);
+            if (msg == null) {
+                break;
+            }
+            consumer.acknowledgeCumulative(msg);
+            Thread.sleep(200);
+            datas.remove(msg.getValue());
+            log.info("received msg : {}", msg.getMessageId());
+            count++;
+        }
+        Assert.assertEquals(count, 9);
+        Assert.assertEquals(0, datas.size());
+    }
+
+    @Test(invocationCount = 5)
+    public void testMultiTopicConsumerConcurrentRedeliverAndReceive() throws Exception {
+        final String topic = BrokerTestUtil.newUniqueName("my-topic");
+        admin.topics().createPartitionedTopic(topic, 2);
+
+        final int receiverQueueSize = 10;
+
+        @Cleanup
+        MultiTopicsConsumerImpl consumer =
+                (MultiTopicsConsumerImpl) pulsarClient.newConsumer(Schema.INT32)
+                .topic(topic)
+                .subscriptionName("sub")
+                .receiverQueueSize(receiverQueueSize)
+                .subscribe();
+        ExecutorService internalPinnedExecutor =
+                WhiteboxImpl.getInternalState(consumer, "internalPinnedExecutor");
+
+        @Cleanup
+        Producer producer = pulsarClient.newProducer(Schema.INT32)
+                .topic(topic)
+                .enableBatching(false)
+                .create();
+
+        for (int i = 0; i < receiverQueueSize; i++){
+            producer.send(i);
+        }
+
+        Awaitility.await().until(() -> consumer.incomingMessages.size() == receiverQueueSize);
+
+        // For testing the race condition of issue #18491
+        // We need to inject a delay for the pinned internal thread
+        Thread.sleep(1000L);
+        internalPinnedExecutor.submit(() -> consumer.redeliverUnacknowledgedMessages()).get();
+        // Make sure the message redelivery is completed. The incoming queue will be cleaned up during the redelivery.
+        internalPinnedExecutor.submit(() -> {}).get();
+
+        Set receivedMsgs = new HashSet<>();
+        for (;;){
+            Message msg = consumer.receive(2, TimeUnit.SECONDS);
+            if (msg == null){
+                break;
+            }
+            receivedMsgs.add(msg.getValue());
+        }
+        Assert.assertEquals(receivedMsgs.size(), 10);
+
+        producer.close();
+        consumer.close();
+        admin.topics().deletePartitionedTopic("persistent://public/default/" + topic);
+    }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PartialPartitionedProducerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PartialPartitionedProducerTest.java
index 7fd992ae150f6..8086123384012 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PartialPartitionedProducerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PartialPartitionedProducerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java
index 49ee9892d7de0..76936334eb0ba 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplAuthTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
index 85be004b732e3..a05bfaa6e788c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
index 298a46916232e..d32882b7f2136 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProduceWithMessageIdTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProduceWithMessageIdTest.java
index e03f29677b99e..b8efdeb99696a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProduceWithMessageIdTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProduceWithMessageIdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 import java.nio.ByteBuffer;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerCloseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerCloseTest.java
index 5366937cd2801..1141af88e72b0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerCloseTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerCloseTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -121,6 +121,7 @@ public void testProducerCloseFailsPendingBatchWhenPreviousStateNotReadyCallback(
 
     @Test(timeOut = 10_000, dataProvider = "produceConf")
     public void brokerCloseTopicTest(boolean enableBatch, boolean isAsyncSend) throws Exception {
+        @Cleanup
         PulsarClient longBackOffClient = PulsarClient.builder()
                 .startingBackoffInterval(5, TimeUnit.SECONDS)
                 .maxBackoffInterval(5, TimeUnit.SECONDS)
@@ -147,9 +148,8 @@ public void brokerCloseTopicTest(boolean enableBatch, boolean isAsyncSend) throw
     }
 
     private void initClient() throws PulsarClientException {
-        pulsarClient = PulsarClient.builder().
-                serviceUrl(lookupUrl.toString())
-                .build();
+        replacePulsarClient(PulsarClient.builder().
+                serviceUrl(lookupUrl.toString()));
     }
 
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerMemoryLimitTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerMemoryLimitTest.java
index 2a981fcb6df82..e8e4355346e48 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerMemoryLimitTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerMemoryLimitTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -184,10 +184,9 @@ public void testProducerCloseMemoryRelease() throws Exception {
     }
 
     private void initClientWithMemoryLimit() throws PulsarClientException {
-        pulsarClient = PulsarClient.builder().
+        replacePulsarClient(PulsarClient.builder().
                 serviceUrl(lookupUrl.toString())
-                .memoryLimit(50, SizeUnit.KILO_BYTES)
-                .build();
+                .memoryLimit(50, SizeUnit.KILO_BYTES));
     }
 
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java
index f04f94d11b113..1d4f8c9b67471 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarClientConfigurationOverrideTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarClientConfigurationOverrideTest.java
index 4f885ecc46b07..f446975306dc0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarClientConfigurationOverrideTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarClientConfigurationOverrideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarMultiHostClientTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarMultiHostClientTest.java
index 656b8acbe2c0b..50f78c91d7ced 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarMultiHostClientTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarMultiHostClientTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarTestClient.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarTestClient.java
index 2177d1b2db520..0ba8511c0ca74 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarTestClient.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PulsarTestClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawMessageSerDeserTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawMessageSerDeserTest.java
index 9ea7b014a9acd..8c419db481ad9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawMessageSerDeserTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawMessageSerDeserTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java
index 2fa92bbfa80fa..fb09cd9951885 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -49,7 +49,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-@Test(groups = "flaky")
+@Test(groups = "broker-impl")
 public class RawReaderTest extends MockedPulsarServiceBaseTest {
 
     private static final String subscription = "foobar-sub";
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ReaderTest.java
index 9c6407ac71295..4aad4410c53d0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ReaderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RetryUtilTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RetryUtilTest.java
index f5544307c3711..604c468b1de45 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RetryUtilTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RetryUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SchemaDeleteTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SchemaDeleteTest.java
index f2cbfc7d001cc..8b633f2f24216 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SchemaDeleteTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SchemaDeleteTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SequenceIdWithErrorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SequenceIdWithErrorTest.java
index 39d8db6c2eda1..7d330bb82addd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SequenceIdWithErrorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/SequenceIdWithErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TableViewTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TableViewTest.java
index 8722f649212ac..950095871f724 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TableViewTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TableViewTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -41,6 +41,7 @@
 import org.apache.pulsar.client.api.ProducerBuilder;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.TableView;
+import org.apache.pulsar.common.naming.TopicDomain;
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.policies.data.ClusterData;
 import org.apache.pulsar.common.policies.data.TenantInfoImpl;
@@ -79,6 +80,11 @@ protected void cleanup() throws Exception {
         super.internalCleanup();
     }
 
+    @DataProvider(name = "topicDomain")
+    public static Object[] topicDomain() {
+       return new Object[]{ TopicDomain.persistent.value(), TopicDomain.non_persistent.value()};
+    }
+
     private Set publishMessages(String topic, int count, boolean enableBatch) throws Exception {
         Set keys = new HashSet<>();
         ProducerBuilder builder = pulsarClient.newProducer();
@@ -155,11 +161,12 @@ public void testTableView() throws Exception {
         }
     }
 
-    @Test(timeOut = 30 * 1000)
-    public void testTableViewUpdatePartitions() throws Exception {
-        String topic = "persistent://public/default/tableview-test-update-partitions";
+    @Test(timeOut = 30 * 1000, dataProvider = "topicDomain")
+    public void testTableViewUpdatePartitions(String topicDomain) throws Exception {
+        String topic = topicDomain + "://public/default/tableview-test-update-partitions";
         admin.topics().createPartitionedTopic(topic, 3);
         int count = 20;
+        // For non-persistent topic, this keys will never be received.
         Set keys = this.publishMessages(topic, count, false);
         @Cleanup
         TableView tv = pulsarClient.newTableViewBuilder(Schema.BYTES)
@@ -167,6 +174,9 @@ public void testTableViewUpdatePartitions() throws Exception {
                 .autoUpdatePartitionsInterval(5, TimeUnit.SECONDS)
                 .create();
         log.info("start tv size: {}", tv.size());
+        if (topicDomain.equals(TopicDomain.non_persistent.value())) {
+            keys = this.publishMessages(topic, count, false);
+        }
         tv.forEachAndListen((k, v) -> log.info("{} -> {}", k, new String(v)));
         Awaitility.await().untilAsserted(() -> {
             log.info("Current tv size: {}", tv.size());
@@ -178,6 +188,10 @@ public void testTableViewUpdatePartitions() throws Exception {
         admin.topics().updatePartitionedTopic(topic, 4);
         TopicName topicName = TopicName.get(topic);
 
+        // Make sure the new partition-3 consumer already started.
+        if (topic.startsWith(TopicDomain.non_persistent.toString())) {
+            TimeUnit.SECONDS.sleep(6);
+        }
         // Send more data to partition 3, which is not in the current TableView, need update partitions
         Set keys2 =
                 this.publishMessages(topicName.getPartition(3).toString(), count * 2, false);
@@ -188,9 +202,9 @@ public void testTableViewUpdatePartitions() throws Exception {
         assertEquals(tv.keySet(), keys2);
     }
 
-    @Test(timeOut = 30 * 1000)
-    public void testPublishNullValue() throws Exception {
-        String topic = "persistent://public/default/tableview-test-publish-null-value";
+    @Test(timeOut = 30 * 1000, dataProvider = "topicDomain")
+    public void testPublishNullValue(String topicDomain) throws Exception {
+        String topic = topicDomain + "://public/default/tableview-test-publish-null-value";
         admin.topics().createPartitionedTopic(topic, 3);
 
         final TableView tv = pulsarClient.newTableViewBuilder(Schema.STRING)
@@ -221,8 +235,12 @@ public void testPublishNullValue() throws Exception {
                 .autoUpdatePartitionsInterval(5, TimeUnit.SECONDS)
                 .create();
 
-        assertEquals(tv1.size(), 1);
-        assertEquals(tv.get("key2"), "value2");
+        if (topicDomain.equals(TopicDomain.persistent.value())) {
+            assertEquals(tv1.size(), 1);
+            assertEquals(tv.get("key2"), "value2");
+        } else {
+            assertEquals(tv1.size(), 0);
+        }
     }
 
     @DataProvider(name = "partitionedTopic")
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicDoesNotExistsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicDoesNotExistsTest.java
index 1fb42d5b98a11..31e32f36ad77b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicDoesNotExistsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicDoesNotExistsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicFromMessageTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicFromMessageTest.java
index 6863235217795..0bb1242296537 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicFromMessageTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicFromMessageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
index ee8961d008c78..1b8284c31e67e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicPublishThrottlingInitTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
index d3702d04e06f4..17287a4a12f59 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,8 +22,12 @@
 import com.google.common.collect.Sets;
 import io.netty.util.Timeout;
 import lombok.Cleanup;
+import org.apache.bookkeeper.mledger.Position;
+import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl;
+import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl;
 import org.apache.pulsar.broker.service.Topic;
 import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
+import org.apache.pulsar.broker.service.persistent.PersistentTopic;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
@@ -52,6 +56,7 @@
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
+import java.util.Set;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -163,6 +168,60 @@ public void testGetConsumersAndGetTopics() throws Exception {
         consumer.close();
     }
 
+    @Test
+    public void testMaxAcknowledgmentGroupSize() throws Exception {
+        final String namespace = "use/ns-abc";
+        final String topicName = "persistent://" + namespace + "/topic1";
+        TenantInfoImpl tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("use", tenantInfo);
+        admin.namespaces().createNamespace(namespace, Set.of("test"));
+        int acknowledgmentGroupSize = 6;
+
+        Producer producer = pulsarClient.newProducer()
+                .topic(topicName)
+                .enableBatching(false)
+                .messageRoutingMode(MessageRoutingMode.SinglePartition)
+                .create();
+        Consumer consumer = pulsarClient.newConsumer().topic(topicName)
+                .subscriptionName("my-sub")
+                .acknowledgmentGroupTime(10000, TimeUnit.SECONDS)
+                .maxAcknowledgmentGroupSize(acknowledgmentGroupSize)
+                .subscribe();
+
+        PersistentTopic topic = (PersistentTopic) pulsar.getBrokerService().getOrCreateTopic(topicName).get();
+        ManagedLedgerImpl managedLedger = (ManagedLedgerImpl) topic.getManagedLedger();
+        ManagedCursorImpl cursor = (ManagedCursorImpl) managedLedger.getCursors().iterator().next();
+
+        for (int i = 0; i < 10; i++) {
+            String message = "my-message-" + i;
+            producer.send(message.getBytes());
+        }
+
+        MessageIdImpl ackMessageId = new MessageIdImpl(-1, -1, -1);
+        for (int i = 0; i < 10; i++) {
+            Message msg = consumer.receive(5, TimeUnit.SECONDS);
+            if (msg != null) {
+                MessageId messageId = msg.getMessageId();
+                consumer.acknowledge(msg);
+                // When the acknowledgmentGroupSize message is confirmed, send ack will be triggered
+                if (i == (acknowledgmentGroupSize - 1)) {
+                    ackMessageId = (MessageIdImpl) messageId;
+                }
+            }
+        }
+
+        Awaitility.await().until(() -> cursor.getMarkDeletedPosition().getLedgerId() != -1);
+        Position markDeletedPosition = cursor.getMarkDeletedPosition();
+        long ledgerId = markDeletedPosition.getLedgerId();
+        long entryId = markDeletedPosition.getEntryId();
+
+        assertEquals(ledgerId, ackMessageId.getLedgerId());
+        assertEquals(entryId, ackMessageId.getEntryId());
+
+        producer.close();
+        consumer.close();
+    }
+
     @Test(timeOut = testTimeout)
     public void testSyncProducerAndConsumer() throws Exception {
         String key = "TopicsConsumerSyncTest";
@@ -1171,34 +1230,6 @@ public void testSubscriptionMustCompleteWhenOperationTimeoutOnMultipleTopics() t
         }
     }
 
-    @Test(timeOut = testTimeout)
-    public void testAutoDiscoverMultiTopicsPartitions() throws Exception {
-        final String topicName = "persistent://public/default/issue-9585";
-        admin.topics().createPartitionedTopic(topicName, 3);
-        PatternMultiTopicsConsumerImpl consumer = (PatternMultiTopicsConsumerImpl) pulsarClient.newConsumer(Schema.STRING)
-                .topicsPattern(topicName)
-                .subscriptionName("sub-issue-9585")
-                .subscribe();
-
-        Assert.assertEquals(consumer.getPartitionsOfTheTopicMap(), 3);
-        Assert.assertEquals(consumer.getConsumers().size(), 3);
-
-        admin.topics().deletePartitionedTopic(topicName, true);
-        consumer.getPartitionsAutoUpdateTimeout().task().run(consumer.getPartitionsAutoUpdateTimeout());
-        Awaitility.await().untilAsserted(() -> {
-            Assert.assertEquals(consumer.getPartitionsOfTheTopicMap(), 0);
-            Assert.assertEquals(consumer.getConsumers().size(), 0);
-        });
-
-        admin.topics().createPartitionedTopic(topicName, 7);
-        consumer.getPartitionsAutoUpdateTimeout().task().run(consumer.getPartitionsAutoUpdateTimeout());
-        Awaitility.await().untilAsserted(() -> {
-            Assert.assertEquals(consumer.getPartitionsOfTheTopicMap(), 7);
-            Assert.assertEquals(consumer.getConsumers().size(), 7);
-        });
-    }
-
-
     @Test(timeOut = testTimeout)
     public void testPartitionsUpdatesForMultipleTopics() throws Exception {
         final String topicName0 = "persistent://public/default/testPartitionsUpdatesForMultipleTopics-0";
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionClientConnectTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionClientConnectTest.java
index 30d608c458ff2..34e2362431dba 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionClientConnectTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionClientConnectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -35,9 +35,12 @@
 import org.apache.pulsar.broker.TransactionMetadataStoreService;
 import org.apache.pulsar.broker.transaction.TransactionTestBase;
 import org.apache.pulsar.client.api.MessageId;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.transaction.TransactionCoordinatorClientException;
 import org.apache.pulsar.client.api.transaction.TxnID;
 import org.apache.pulsar.client.impl.transaction.TransactionCoordinatorClientImpl;
+import org.apache.pulsar.common.naming.SystemTopicNames;
 import org.apache.pulsar.transaction.coordinator.TransactionCoordinatorID;
 import org.apache.pulsar.transaction.coordinator.TransactionMetadataStore;
 import org.apache.pulsar.transaction.coordinator.TransactionMetadataStoreState;
@@ -173,6 +176,15 @@ public void testHandlerStateChangeToReady() throws Exception {
         Assert.assertTrue(transactionMetaStoreHandler.changeToReadyState());
     }
 
+
+    @Test(expectedExceptions = PulsarClientException.class)
+    public void testNotEnableTransactionInBroker() throws Exception {
+        getPulsarServiceList().get(0).getPulsarResources().getNamespaceResources().getPartitionedTopicResources()
+                .deletePartitionedTopicAsync(SystemTopicNames.TRANSACTION_COORDINATOR_ASSIGN).get();
+        PulsarClient.builder().enableTransaction(true)
+                .serviceUrl(getPulsarServiceList().get(0).getBrokerServiceUrl()).build();
+    }
+
     public void start() throws Exception {
         // wait transaction coordinator init success
         pulsarClient.newTransaction()
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java
index e3fc05ae0424e..663c1c50ce79c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -27,21 +27,21 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.EventExecutor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.CompletableFuture;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.concurrent.EventExecutor;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bookkeeper.mledger.Position;
@@ -89,7 +89,7 @@
  * End to end transaction test.
  */
 @Slf4j
-@Test(groups = "flaky")
+@Test(groups = "broker-impl")
 public class TransactionEndToEndTest extends TransactionTestBase {
 
     protected static final int TOPIC_PARTITION = 3;
@@ -146,15 +146,15 @@ private void produceCommitTest(boolean enableBatch) throws Exception {
         int messageCnt = 1000;
         for (int i = 0; i < messageCnt; i++) {
             if (i % 5 == 0) {
-                producer.newMessage(txn1).value(("Hello Txn - " + i).getBytes(UTF_8)).sendAsync();
+                producer.newMessage(txn1).value(("Hello Txn - " + i).getBytes(UTF_8)).send();
             } else {
-                producer.newMessage(txn2).value(("Hello Txn - " + i).getBytes(UTF_8)).sendAsync();
+                producer.newMessage(txn2).value(("Hello Txn - " + i).getBytes(UTF_8)).send();
             }
             txnMessageCnt++;
         }
 
         // Can't receive transaction messages before commit.
-        Message message = consumer.receive(5, TimeUnit.SECONDS);
+        Message message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
 
         txn1.commit().get();
@@ -162,16 +162,13 @@ private void produceCommitTest(boolean enableBatch) throws Exception {
 
         int receiveCnt = 0;
         for (int i = 0; i < txnMessageCnt; i++) {
-            message = consumer.receive();
+            message = consumer.receive(5, TimeUnit.SECONDS);
             Assert.assertNotNull(message);
             receiveCnt ++;
         }
         Assert.assertEquals(txnMessageCnt, receiveCnt);
 
-        message = consumer.receive(5, TimeUnit.SECONDS);
-        Assert.assertNull(message);
-
-        message = consumer.receive(5, TimeUnit.SECONDS);
+        message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
 
         // cleanup.
@@ -208,13 +205,13 @@ public void produceAbortTest() throws Exception {
         Awaitility.await().until(consumer::isConnected);
 
         // Can't receive transaction messages before abort.
-        Message message = consumer.receive(2, TimeUnit.SECONDS);
+        Message message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
 
         txn.abort().get();
 
         // Cant't receive transaction messages after abort.
-        message = consumer.receive(2, TimeUnit.SECONDS);
+        message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
         Awaitility.await().until(() -> {
             boolean flag = true;
@@ -302,7 +299,7 @@ private void testAckWithTransactionReduceUnAckMessageCount(boolean enableBatch)
         Transaction txn = getTxn();
 
         for (int i = 0; i < messageCount / 2; i++) {
-            Message message = consumer.receive();
+            Message message = consumer.receive(5, TimeUnit.SECONDS);
             consumer.acknowledgeAsync(message.getMessageId(), txn).get();
         }
 
@@ -382,14 +379,14 @@ protected void txnAckTest(boolean batchEnable, int maxBatchSize,
 
             // consume and ack messages with txn
             for (int i = 0; i < messageCnt; i++) {
-                Message message = consumer.receive();
+                Message message = consumer.receive(5, TimeUnit.SECONDS);
                 Assert.assertNotNull(message);
                 log.info("receive msgId: {}, count : {}", message.getMessageId(), i);
                 consumer.acknowledgeAsync(message.getMessageId(), txn).get();
             }
 
             // the messages are pending ack state and can't be received
-            Message message = consumer.receive(2, TimeUnit.SECONDS);
+            Message message = consumer.receive(300, TimeUnit.MILLISECONDS);
             Assert.assertNull(message);
 
             // 1) txn abort
@@ -408,7 +405,7 @@ protected void txnAckTest(boolean batchEnable, int maxBatchSize,
             commitTxn.commit().get();
 
             // after transaction commit, the messages can't be received
-            message = consumer.receive(2, TimeUnit.SECONDS);
+            message = consumer.receive(300, TimeUnit.MILLISECONDS);
             Assert.assertNull(message);
 
             Field field = TransactionImpl.class.getDeclaredField("state");
@@ -445,7 +442,7 @@ public void testAfterDeleteTopicOtherTopicCanRecover() throws Exception {
                 .topic(topicTwo).subscriptionName(sub).subscribe();
         String content = "test";
         producer.send(content);
-        assertEquals(consumer.receive().getValue(), content);
+        assertEquals(consumer.receive(3, TimeUnit.SECONDS).getValue(), content);
 
         // cleanup.
         producer.close();
@@ -484,7 +481,7 @@ public void txnMessageAckTest() throws Exception {
         log.info("produce transaction messages finished");
 
         // Can't receive transaction messages before commit.
-        Message message = consumer.receive(2, TimeUnit.SECONDS);
+        Message message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
         log.info("transaction messages can't be received before transaction committed");
 
@@ -493,7 +490,7 @@ public void txnMessageAckTest() throws Exception {
         int ackedMessageCount = 0;
         int receiveCnt = 0;
         for (int i = 0; i < messageCnt; i++) {
-            message = consumer.receive();
+            message = consumer.receive(5, TimeUnit.SECONDS);
             Assert.assertNotNull(message);
             receiveCnt ++;
             if (i % 2 == 0) {
@@ -503,7 +500,7 @@ public void txnMessageAckTest() throws Exception {
         }
         Assert.assertEquals(messageCnt, receiveCnt);
 
-        message = consumer.receive(2, TimeUnit.SECONDS);
+        message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
 
         String checkTopic = TopicName.get(topic).getPartition(0).toString();
@@ -522,7 +519,7 @@ public void txnMessageAckTest() throws Exception {
         }
         Assert.assertEquals(messageCnt - ackedMessageCount, receiveCnt);
 
-        message = consumer.receive(2, TimeUnit.SECONDS);
+        message = consumer.receive(300, TimeUnit.MILLISECONDS);
         Assert.assertNull(message);
 
         topic = TopicName.get(topic).getPartition(0).toString();
@@ -638,7 +635,7 @@ private void txnCumulativeAckTest(boolean batchEnable, int maxBatchSize, Subscri
             }
 
             // the messages are pending ack state and can't be received
-            message = consumer.receive(2, TimeUnit.SECONDS);
+            message = consumer.receive(300, TimeUnit.MILLISECONDS);
             Assert.assertNull(message);
 
             abortTxn.abort().get();
@@ -667,7 +664,7 @@ private void txnCumulativeAckTest(boolean batchEnable, int maxBatchSize, Subscri
                 Assert.assertTrue(reCommitError.getCause() instanceof TransactionNotFoundException);
             }
 
-            message = consumer.receive(1, TimeUnit.SECONDS);
+            message = consumer.receive(300, TimeUnit.MILLISECONDS);
             Assert.assertNull(message);
         }
 
@@ -729,7 +726,7 @@ public void txnMetadataHandlerRecoverTest() throws Exception {
         Awaitility.await().until(consumer::isConnected);
 
         for (int i = 0; i < txnCnt * messageCnt; i++) {
-            Message message = consumer.receive();
+            Message message = consumer.receive(5, TimeUnit.SECONDS);
             Assert.assertNotNull(message);
         }
 
@@ -938,14 +935,14 @@ public void transactionTimeoutTest() throws Exception {
                 .withTransactionTimeout(3, TimeUnit.SECONDS)
                 .build().get();
 
-        Message message = consumer.receive();
+        Message message = consumer.receive(5, TimeUnit.SECONDS);
 
         consumer.acknowledgeAsync(message.getMessageId(), consumeTimeoutTxn).get();
 
-        Message reReceiveMessage = consumer.receive(2, TimeUnit.SECONDS);
+        Message reReceiveMessage = consumer.receive(300, TimeUnit.MILLISECONDS);
         assertNull(reReceiveMessage);
 
-        reReceiveMessage = consumer.receive(2, TimeUnit.SECONDS);
+        reReceiveMessage = consumer.receive(5, TimeUnit.SECONDS);
 
         assertEquals(reReceiveMessage.getValue(), message.getValue());
 
@@ -992,9 +989,9 @@ public void txnTransactionRedeliverNullDispatcher(CommandAck.AckType ackType) th
         }
         Transaction txn = getTxn();
         if (ackType == CommandAck.AckType.Individual) {
-            consumer.acknowledgeAsync(consumer.receive().getMessageId(), txn);
+            consumer.acknowledgeAsync(consumer.receive(5, TimeUnit.SECONDS).getMessageId(), txn);
         } else {
-            consumer.acknowledgeCumulativeAsync(consumer.receive().getMessageId(), txn);
+            consumer.acknowledgeCumulativeAsync(consumer.receive(5, TimeUnit.SECONDS).getMessageId(), txn);
         }
         topic = TopicName.get(topic).toString();
         boolean exist = false;
@@ -1117,7 +1114,7 @@ public void testTxnTimeOutInClient() throws Exception{
                     .InvalidTxnStatusException);
         }
         try {
-            Message message = consumer.receive();
+            Message message = consumer.receive(5, TimeUnit.SECONDS);
             consumer.acknowledgeAsync(message.getMessageId(), transaction).get();
             Assert.fail();
         } catch (Exception e) {
@@ -1159,7 +1156,7 @@ public void testCumulativeAckRedeliverMessages() throws Exception {
 
         Message message = null;
         for (int i = 0; i < transactionCumulativeAck; i++) {
-            message = consumer.receive();
+            message = consumer.receive(5, TimeUnit.SECONDS);
         }
 
         // receive transaction in order
@@ -1182,7 +1179,7 @@ public void testCumulativeAckRedeliverMessages() throws Exception {
 
         // receive the rest of the message
         for (int i = 0; i < count; i++) {
-            message = consumer.receive();
+            message = consumer.receive(5, TimeUnit.SECONDS);
         }
 
         Transaction commitTransaction = getTxn();
@@ -1195,7 +1192,7 @@ public void testCumulativeAckRedeliverMessages() throws Exception {
         commitTransaction.commit().get();
 
         // then redeliver will not receive any message
-        message = consumer.receive(3, TimeUnit.SECONDS);
+        message = consumer.receive(300, TimeUnit.MILLISECONDS);
         assertNull(message);
 
         // cleanup.
@@ -1270,7 +1267,7 @@ public void testAckWithTransactionReduceUnackCountNotInPendingAcks() throws Exce
 
         // receive the batch messages add to a list
         for (int i = 0; i < 5; i++) {
-            messageIds.add(consumer.receive().getMessageId());
+            messageIds.add(consumer.receive(5, TimeUnit.SECONDS).getMessageId());
         }
 
         MessageIdImpl messageId = (MessageIdImpl) messageIds.get(0);
@@ -1330,7 +1327,7 @@ public void testSendTxnAckMessageToDLQ() throws Exception {
                 .build().get();
 
         // consumer receive the message the first time, redeliverCount = 0
-        consumer.acknowledgeAsync(consumer.receive().getMessageId(), transaction).get();
+        consumer.acknowledgeAsync(consumer.receive(5, TimeUnit.SECONDS).getMessageId(), transaction).get();
 
         transaction.abort().get();
 
@@ -1338,13 +1335,13 @@ public void testSendTxnAckMessageToDLQ() throws Exception {
                 .build().get();
 
         // consumer receive the message the second time, redeliverCount = 1, also can be received
-        consumer.acknowledgeAsync(consumer.receive().getMessageId(), transaction).get();
+        consumer.acknowledgeAsync(consumer.receive(5, TimeUnit.SECONDS).getMessageId(), transaction).get();
 
         transaction.abort().get();
 
         // consumer receive the message the third time, redeliverCount = 2,
         // the message will be sent to DLQ, can't receive
-        assertNull(consumer.receive(3, TimeUnit.SECONDS));
+        assertNull(consumer.receive(300, TimeUnit.MILLISECONDS));
 
         assertEquals(((ConsumerImpl) consumer).getAvailablePermits(), 3);
 
@@ -1394,7 +1391,7 @@ public void testSendTxnAckBatchMessageToDLQ() throws Exception {
         Transaction transaction = pulsarClient.newTransaction().withTransactionTimeout(1, TimeUnit.MINUTES)
                 .build().get();
 
-        Message message = consumer.receive();
+        Message message = consumer.receive(5, TimeUnit.SECONDS);
         assertEquals(value1, new String(message.getValue()));
         // consumer receive the batch message one the first time, redeliverCount = 0
         consumer.acknowledgeAsync(message.getMessageId(), transaction).get();
@@ -1404,7 +1401,7 @@ public void testSendTxnAckBatchMessageToDLQ() throws Exception {
         // consumer will receive the batch message two and then receive
         // the message one and message two again, redeliverCount = 1
         for (int i = 0; i < 3; i ++) {
-            message = consumer.receive();
+            message = consumer.receive(5, TimeUnit.SECONDS);
         }
 
         transaction = pulsarClient.newTransaction().withTransactionTimeout(5, TimeUnit.MINUTES)
@@ -1418,7 +1415,7 @@ public void testSendTxnAckBatchMessageToDLQ() throws Exception {
 
         // consumer receive the batch message the third time, redeliverCount = 2,
         // the message will be sent to DLQ, can't receive
-        assertNull(consumer.receive(3, TimeUnit.SECONDS));
+        assertNull(consumer.receive(300, TimeUnit.MILLISECONDS));
 
         assertEquals(((ConsumerImpl) consumer).getAvailablePermits(), 6);
 
@@ -1473,7 +1470,7 @@ public void testDelayedTransactionMessages() throws Exception {
 
         // Failover consumer will receive the messages immediately while
         // the shared consumer will get them after the delay
-        Message msg = sharedConsumer.receive(1, TimeUnit.SECONDS);
+        Message msg = sharedConsumer.receive(300, TimeUnit.MILLISECONDS);
         assertNull(msg);
 
         for (int i = 0; i < 10; i++) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java
index 0b50be807be42..52faae2f8ea1f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -27,7 +27,7 @@
  * End to end transaction test.
  */
 @Slf4j
-@Test(groups = "flaky")
+@Test(groups = "broker-impl")
 public class TransactionEndToEndWithoutBatchIndexAckTest extends TransactionEndToEndTest {
 
     @BeforeClass
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/UnAcknowledgedMessagesTimeoutTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/UnAcknowledgedMessagesTimeoutTest.java
index ec98e8d154665..34e4f6a4d6d42 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/UnAcknowledgedMessagesTimeoutTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/UnAcknowledgedMessagesTimeoutTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ZeroQueueSizeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ZeroQueueSizeTest.java
index 73ebd56e2af4e..fd18cc06fce7f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ZeroQueueSizeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ZeroQueueSizeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchFormat.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchFormat.java
index 571d292aaa41e..41c03d80508cd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchFormat.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchFormat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchPayloadProcessor.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchPayloadProcessor.java
index c83b13b443087..17f45384b2b30 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchPayloadProcessor.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchPayloadProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchProducer.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchProducer.java
index bc0720661e3f9..319e2c9656a66 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchProducer.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/CustomBatchProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/DefaultProcessorWithRefCnt.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/DefaultProcessorWithRefCnt.java
index 63e295f2bbb0f..6f5d30ae796d8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/DefaultProcessorWithRefCnt.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/DefaultProcessorWithRefCnt.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/MessagePayloadProcessorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/MessagePayloadProcessorTest.java
index 6a12101fe68b6..70ae0967269f7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/MessagePayloadProcessorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/processor/MessagePayloadProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithmTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithmTest.java
index c7c1fd10263b7..4e429f66b4491 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithmTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/FlowOrQpsEquallyDivideBundleSplitAlgorithmTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithmTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithmTest.java
index 75f147e28298f..85f095fea1045 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithmTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithmTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleTest.java
index 5c1e2a3c52af0..afa815979951a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java
index 76cf937280b30..a8a4610f7f3fe 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithmTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithmTest.java
index 777d49d62ca9c..73ab1d1ba414d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithmTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithmTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
index 6dc93bd541f37..bfa5895409d8e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithmTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithmTest.java
index faa747dab5050..ec458def65bb7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithmTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/SpecifiedPositionsBundleSplitAlgorithmTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithmTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithmTest.java
index 28f62b046e24b..ccf6ac4149778 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithmTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithmTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java
index 015f1e9fe6232..c9933b7ef8f26 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
index ffdc4f76a8319..957671b7f8d9c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionRetentionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionRetentionTest.java
index 10d067d46958c..f613dda3bf356 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionRetentionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionRetentionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
index ddad53fbc829f..681b4a39c8e25 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,12 +22,13 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.netty.buffer.ByteBuf;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -45,7 +46,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import io.netty.buffer.ByteBuf;
 import lombok.Cleanup;
 import lombok.SneakyThrows;
 import org.apache.bookkeeper.client.BookKeeper;
@@ -90,7 +90,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-@Test(groups = "flaky")
+@Test(groups = "broker-impl")
 public class CompactionTest extends MockedPulsarServiceBaseTest {
     private ScheduledExecutorService compactionScheduler;
     private BookKeeper bk;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorMXBeanImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorMXBeanImplTest.java
index 0a7ab1aeb55b6..bbde59d7da8bd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorMXBeanImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorMXBeanImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java
index bd875384aecb3..8099cd5166829 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorToolTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorToolTest.java
index 85f6f16fdb01a..b1f653fae012a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorToolTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorToolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/FileServer.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/FileServer.java
index ce3d770638aa1..48d0a13d50154 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/FileServer.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/FileServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
index 6a4430e2669fa..edaf6b48a2f32 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
index d90b971b5fa36..4f52c3d507c7e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionMetadataStoreTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionMetadataStoreTest.java
index 8f80ce302f9e1..33007bc12c599 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionMetadataStoreTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionMetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
index 33366fa888ef0..59a3b0a0ba6c8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestTemporaryDirectory.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestTemporaryDirectory.java
index 156a4d945e68c..6742698033215 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestTemporaryDirectory.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestTemporaryDirectory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java
index e2b3a7dd0e633..292c571c3bc65 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTestUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
index bfc9928a7dec7..b46b3f4be7f36 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
index 66a0b31ee98ac..acb7f86ea88f3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java
index 5009fca019502..2866de2898ebf 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java
index e371190a0d0e5..90a1a53750261 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarBatchSourceE2ETest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
index 054bd4bce226f..f0b3ba1f8d0ad 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
index 1502862d67694..33ed806350b47 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java
index 04467b5f2045a..70e60bd34b13d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java
index 24bea1d59940c..7e0dbabb105f9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSinkE2ETest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -142,13 +142,15 @@ public void testPulsarSinkDLQ() throws Exception {
         admin.namespaces().createNamespace(replNamespace);
         Set clusters = Sets.newHashSet(Lists.newArrayList("use"));
         admin.namespaces().setNamespaceReplicationClusters(replNamespace, clusters);
-        // 1 create producer、DLQ consumer
+        // 1. create producer and DLQ consumer
+        @Cleanup
         Producer producer = pulsarClient.newProducer(Schema.STRING).topic(sourceTopic).create();
+        @Cleanup
         Consumer consumer = pulsarClient.newConsumer(Schema.STRING).topic(dlqTopic).subscriptionName(subscriptionName).subscribe();
 
-        // 2 setup sink
+        // 2. setup sink
         SinkConfig sinkConfig = createSinkConfig(tenant, namespacePortion, sinkName, sourceTopic, subscriptionName);
-        sinkConfig.setNegativeAckRedeliveryDelayMs(1001L);
+        sinkConfig.setNegativeAckRedeliveryDelayMs(1L);
         sinkConfig.setProcessingGuarantees(FunctionConfig.ProcessingGuarantees.ATLEAST_ONCE);
         sinkConfig.setMaxMessageRetries(2);
         sinkConfig.setDeadLetterTopic(dlqTopic);
@@ -180,7 +182,7 @@ public void testPulsarSinkDLQ() throws Exception {
             }
         }, 50, 150);
 
-        // 3 send message
+        // 3. send message
         int totalMsgs = 10;
         Set remainingMessagesToReceive = new HashSet<>();
         for (int i = 0; i < totalMsgs; i++) {
@@ -189,7 +191,7 @@ public void testPulsarSinkDLQ() throws Exception {
             remainingMessagesToReceive.add(messageBody);
         }
 
-        //4 All messages should enter DLQ
+        // 4. All messages should enter DLQ
         for (int i = 0; i < totalMsgs; i++) {
             Message message = consumer.receive(10, TimeUnit.SECONDS);
             assertNotNull(message);
@@ -197,10 +199,6 @@ public void testPulsarSinkDLQ() throws Exception {
         }
 
         assertEquals(remainingMessagesToReceive, Collections.emptySet());
-
-        //clean up
-        producer.close();
-        consumer.close();
     }
 
     private void testPulsarSinkStats(String jarFilePathUrl) throws Exception {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java
index 2dea2fb020edd..99d16447bf894 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarSourceE2ETest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/SinkForTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/SinkForTest.java
index 853019cc25b75..5ed5bbecd3790 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/SinkForTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/SinkForTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/PartitionedTopicSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/PartitionedTopicSchemaTest.java
index 6caf09df2348c..f82a4ec8c9ce9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/PartitionedTopicSchemaTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/PartitionedTopicSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
index 9974ac8c544b1..7257878aa2f1e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/SchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/Schemas.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/Schemas.java
index 101ab9ca1f434..b568aa05f4ee1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/Schemas.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/Schemas.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
index 1167eff2ab04d..7d3ed51a934be 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaCompatibilityCheckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckOnTopicLevelTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckOnTopicLevelTest.java
index 1e3d7b71053f9..a6ffb1d255b80 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckOnTopicLevelTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckOnTopicLevelTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckTest.java
index 2e7b840e5a60a..967d4dd3310b9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/SchemaTypeCompatibilityCheckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/Socks5Server.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/Socks5Server.java
index 7510b03bec655..8f1dae185f24d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/Socks5Server.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/Socks5Server.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/DefaultPasswordAuthImpl.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/DefaultPasswordAuthImpl.java
index 11d9b555b087e..83d4bb3354d68 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/DefaultPasswordAuthImpl.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/DefaultPasswordAuthImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/PasswordAuth.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/PasswordAuth.java
index b5181dff08439..beed9051f7b13 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/PasswordAuth.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/auth/PasswordAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/config/Socks5Config.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/config/Socks5Config.java
index 40310e657adda..414c44f509169 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/config/Socks5Config.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/config/Socks5Config.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/CommandRequestHandler.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/CommandRequestHandler.java
index a6450c5bc6223..9b72d626bf2eb 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/CommandRequestHandler.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/CommandRequestHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/IdleHandler.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/IdleHandler.java
index a4370d07b1ed5..0f40d7a13af64 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/IdleHandler.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/IdleHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/InitialRequestHandler.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/InitialRequestHandler.java
index 7fa0550132a3d..2a845beb317d2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/InitialRequestHandler.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/InitialRequestHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/PasswordAuthRequestHandler.java b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/PasswordAuthRequestHandler.java
index 49db70dcacd59..8609010692877 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/PasswordAuthRequestHandler.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/socks5/handler/PasswordAuthRequestHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
index af72a2564bb0c..b58ed1e40ba3c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/CmdTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/CmdTest.java
index 07426eef50c08..a571a1cd0c92d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/CmdTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/CmdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSetTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSetTest.java
index 3c53fc159d027..47379c3b6f17c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSetTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/ConcurrentBitmapSortedLongPairSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/LogIndexLagBackOffTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/LogIndexLagBackOffTest.java
index 8d4f2c356a692..9914ea875cb1b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/LogIndexLagBackOffTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/LogIndexLagBackOffTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/ResourceUtils.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/ResourceUtils.java
new file mode 100644
index 0000000000000..0e8f5c6d8c05e
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/ResourceUtils.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.utils;
+
+import com.google.common.io.Resources;
+import java.io.File;
+
+public class ResourceUtils {
+
+    public static String getAbsolutePath(String resourceName) {
+        // On Windows, URL#getPath might return a string that starts with a disk name, e.g. "/C:/"
+        // It's invalid to use this path to open a file, so we need to get the absolute path via File.
+        return new File(Resources.getResource(resourceName).getPath()).getAbsolutePath();
+    }
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java
index e463c8d45ad4d..6bd8fe672d8e3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/SimpleTextOutputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -118,4 +118,27 @@ public String str() {
         reset();
         return s;
     }
+
+    @Test
+    public void testWriteString() {
+        String str = "persistence://test/test/test_¬¬¬¬¬¬¬aabbcc";
+        stream.write(str);
+        assertEquals(str, str());
+    }
+
+
+    @Test
+    public void testWriteChar() {
+        String str = "persistence://test/test/test_¬¬¬¬¬¬¬aabbcc\"\n";
+        for (char c : str.toCharArray()) {
+            stream.write(c);
+        }
+        assertEquals(str, str());
+
+        buf.clear();
+
+        stream.write('\n').write('"').write('A').write('Z').write('a').write('z').write(' ').write(',').write('{')
+                .write('}').write('[').write(']').write('¬');
+        assertEquals(str(), "\n\"AZaz ,{}[]¬");
+    }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java
index 0be082f334f6c..4e6348d1d4ac3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/StatsOutputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtilsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtilsTest.java
index bca20941fcd3d..a488e4d958429 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtilsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockAuthenticationProvider.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockAuthenticationProvider.java
index 635572ff3aeb7..7e9e08445a940 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockAuthenticationProvider.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockAuthenticationProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockUnauthenticationProvider.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockUnauthenticationProvider.java
index 6be13832a55e7..31f0080364ad0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockUnauthenticationProvider.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/MockUnauthenticationProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthenticationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthenticationTest.java
index 35a7aa44391ca..b74f0d4ed6b8e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthenticationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthenticationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.websocket.proxy;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgs;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -26,7 +25,6 @@
 import com.google.common.collect.Sets;
 import java.net.URI;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import javax.ws.rs.client.Client;
@@ -35,13 +33,13 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import lombok.Cleanup;
 import org.apache.pulsar.client.api.ProducerConsumerBase;
 import org.apache.pulsar.metadata.impl.ZKMetadataStore;
 import org.apache.pulsar.websocket.WebSocketService;
 import org.apache.pulsar.websocket.service.ProxyServer;
 import org.apache.pulsar.websocket.service.WebSocketProxyConfiguration;
 import org.apache.pulsar.websocket.service.WebSocketServiceStarter;
+import org.awaitility.Awaitility;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -91,20 +89,12 @@ public void setup() throws Exception {
 
     @AfterMethod(alwaysRun = true)
     public void cleanup() throws Exception {
-        @Cleanup("shutdownNow")
-        ExecutorService executor = newFixedThreadPool(1);
         try {
-            executor.submit(() -> {
-                try {
-                    consumeClient.stop();
-                    produceClient.stop();
-                    log.info("proxy clients are stopped successfully");
-                } catch (Exception e) {
-                    log.error(e.getMessage());
-                }
-            }).get(2, TimeUnit.SECONDS);
+            consumeClient.stop();
+            produceClient.stop();
+            log.info("proxy clients are stopped successfully");
         } catch (Exception e) {
-            log.error("failed to close clients ", e);
+            log.error(e.getMessage());
         }
 
         super.internalCleanup();
@@ -140,10 +130,13 @@ private void checkSocket() throws Exception {
         Assert.assertTrue(consumerFuture.get().isOpen());
         Assert.assertTrue(producerFuture.get().isOpen());
 
+        Awaitility.await().untilAsserted(() -> {
+            Assert.assertTrue(produceSocket.getBuffer().size() > 0);
+            Assert.assertEquals(produceSocket.getBuffer(), consumeSocket.getBuffer());
+        });
+
         consumeSocket.awaitClose(1, TimeUnit.SECONDS);
         produceSocket.awaitClose(1, TimeUnit.SECONDS);
-        Assert.assertTrue(produceSocket.getBuffer().size() > 0);
-        Assert.assertEquals(produceSocket.getBuffer(), consumeSocket.getBuffer());
     }
 
     @Test(timeOut = 10000)
@@ -194,14 +187,7 @@ public void statsTest() throws Exception {
             Future producerFuture = produceClient.connect(produceSocket, produceUri, produceRequest);
             Assert.assertTrue(producerFuture.get().isOpen());
 
-            int retry = 0;
-            int maxRetry = 500;
-            while (consumeSocket.getReceivedMessagesCount() < 3) {
-                Thread.sleep(10);
-                if (retry++ > maxRetry) {
-                    break;
-                }
-            }
+            Awaitility.await().untilAsserted(() -> Assert.assertTrue(consumeSocket.getReceivedMessagesCount() >= 3));
 
             service.getProxyStats().generate();
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthorizationTest.java
index 982f4cd48ebe0..5f8d4e01c818d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthorizationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyAuthorizationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java
index e6eba5e32cb66..0b85cbce516b6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyEncryptionPublishConsumeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyEncryptionPublishConsumeTest.java
index 2b5fe4c55cb54..e9d18f4d4014a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyEncryptionPublishConsumeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyEncryptionPublishConsumeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,24 +18,19 @@
  */
 package org.apache.pulsar.websocket.proxy;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
-
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
 import org.apache.pulsar.client.api.CryptoKeyReader;
 import org.apache.pulsar.client.api.EncryptionKeyInfo;
 import org.apache.pulsar.client.api.ProducerConsumerBase;
@@ -45,6 +40,7 @@
 import org.apache.pulsar.websocket.service.ProxyServer;
 import org.apache.pulsar.websocket.service.WebSocketProxyConfiguration;
 import org.apache.pulsar.websocket.service.WebSocketServiceStarter;
+import org.awaitility.Awaitility;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -55,8 +51,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import lombok.Cleanup;
-
 @Test(groups = "websocket")
 public class ProxyEncryptionPublishConsumeTest extends ProducerConsumerBase {
     protected String methodName;
@@ -146,18 +140,11 @@ public void socketTest() throws Exception {
             Future producerFuture = produceClient.connect(produceSocket, produceUri, produceRequest);
             assertTrue(producerFuture.get().isOpen());
 
-            int retry = 0;
-            int maxRetry = 400;
-            while ((consumeSocket1.getReceivedMessagesCount() < 10 && consumeSocket2.getReceivedMessagesCount() < 10)
-                    || readSocket.getReceivedMessagesCount() < 10) {
-                Thread.sleep(10);
-                if (retry++ > maxRetry) {
-                    final String msg = String.format("Consumer still has not received the message after %s ms",
-                            (maxRetry * 10));
-                    log.warn(msg);
-                    throw new IllegalStateException(msg);
-                }
-            }
+            Awaitility.await().untilAsserted(() -> {
+                assertTrue(consumeSocket1.getReceivedMessagesCount() >= 10
+                        || consumeSocket2.getReceivedMessagesCount() >= 10);
+                assertTrue(readSocket.getReceivedMessagesCount() >= 10);
+            });
 
             // if the subscription type is exclusive (default), either of the
             // consumer
@@ -226,22 +213,14 @@ public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMe
     }
 
     private void stopWebSocketClient(WebSocketClient... clients) {
-        @Cleanup("shutdownNow")
-        ExecutorService executor = newFixedThreadPool(1);
-        try {
-            executor.submit(() -> {
-                for (WebSocketClient client : clients) {
-                    try {
-                        client.stop();
-                    } catch (Exception e) {
-                        log.error(e.getMessage());
-                    }
-                }
-                log.info("proxy clients are stopped successfully");
-            }).get(2, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            log.error("failed to close proxy clients", e);
+        for (WebSocketClient client : clients) {
+            try {
+                client.stop();
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
         }
+        log.info("proxy clients are stopped successfully");
     }
 
     private static final Logger log = LoggerFactory.getLogger(ProxyEncryptionPublishConsumeTest.class);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
index c89c5397c87fd..9a63f41e251bb 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.websocket.proxy;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgs;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -40,7 +39,6 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletResponse;
@@ -50,7 +48,6 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import lombok.Cleanup;
 import org.apache.pulsar.broker.BrokerTestUtil;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.ProducerAccessMode;
@@ -168,16 +165,12 @@ public void socketTest() throws Exception {
 
             int retry = 0;
             int maxRetry = 400;
-            while ((consumeSocket1.getReceivedMessagesCount() < 10 && consumeSocket2.getReceivedMessagesCount() < 10)
-                    || readSocket.getReceivedMessagesCount() < 10) {
-                Thread.sleep(10);
-                if (retry++ > maxRetry) {
-                    final String msg = String.format("Consumer still has not received the message after %s ms",
-                            (maxRetry * 10));
-                    log.warn(msg);
-                    throw new IllegalStateException(msg);
-                }
-            }
+
+            Awaitility.await().untilAsserted(() -> {
+                assertTrue(consumeSocket1.getReceivedMessagesCount() >= 10
+                        || consumeSocket2.getReceivedMessagesCount() >= 10);
+                assertTrue(readSocket.getReceivedMessagesCount() >= 10);
+            });
 
             // if the subscription type is exclusive (default), either of the consumer sessions has already been closed
             assertTrue(consumerFuture1.get().isOpen());
@@ -290,9 +283,9 @@ public void unsubscribeTest() throws Exception {
             // do unsubscribe
             consumeSocket.unsubscribe();
             //wait for delete
-            Thread.sleep(1000);
-            subs = admin.topics().getSubscriptions(topic);
-            assertEquals(subs.size(), 0);
+            Awaitility.await().untilAsserted(() -> {
+                assertEquals(admin.topics().getSubscriptions(topic).size(), 0);
+            });
         } finally {
             stopWebSocketClient(consumeClient);
         }
@@ -633,16 +626,9 @@ public void testProxyStats() throws Exception {
             assertTrue(producerFuture.get().isOpen());
 
             // sleep so, proxy can deliver few messages to consumers for stats
-            int retry = 0;
-            int maxRetry = 400;
-            while (consumeSocket1.getReceivedMessagesCount() < 2) {
-                Thread.sleep(10);
-                if (retry++ > maxRetry) {
-                    final String msg = String.format("Consumer still has not received the message after %s ms", (maxRetry * 10));
-                    log.warn(msg);
-                    break;
-                }
-            }
+            Awaitility.await().untilAsserted(() -> {
+                assertTrue(consumeSocket1.getReceivedMessagesCount() >= 2);
+            });
 
             Client client = ClientBuilder.newClient(new ClientConfig().register(LoggingFeature.class));
             final String baseUrl = pulsar.getSafeWebServiceAddress()
@@ -755,11 +741,10 @@ public void socketPullModeTest() throws Exception {
             consumeSocket2.sendPermits(2);
             consumeSocket2.sendPermits(2);
 
-            Thread.sleep(500);
-
-            assertEquals(consumeSocket1.getReceivedMessagesCount(), 3);
-            assertEquals(consumeSocket2.getReceivedMessagesCount(), 6);
-
+            Awaitility.await().untilAsserted(() -> {
+                assertEquals(consumeSocket1.getReceivedMessagesCount(), 3);
+                assertEquals(consumeSocket2.getReceivedMessagesCount(), 6);
+            });
         } finally {
             stopWebSocketClient(consumeClient1, consumeClient2, produceClient);
         }
@@ -1052,22 +1037,14 @@ private void verifyProxyStats(Client client, String baseUrl, String topic) {
     }
 
     private void stopWebSocketClient(WebSocketClient... clients) {
-        @Cleanup("shutdownNow")
-        ExecutorService executor = newFixedThreadPool(1);
-        try {
-            executor.submit(() -> {
-                for (WebSocketClient client : clients) {
-                    try {
-                        client.stop();
-                    } catch (Exception e) {
-                        log.error(e.getMessage());
-                    }
-                }
-                log.info("proxy clients are stopped successfully");
-            }).get(2, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            log.error("failed to close proxy clients", e);
+        for (WebSocketClient client : clients) {
+            try {
+                client.stop();
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
         }
+        log.info("proxy clients are stopped successfully");
     }
 
     private static final Logger log = LoggerFactory.getLogger(ProxyPublishConsumeTest.class);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTlsTest.java
index 5e40a7535a7bc..468e97fcc0f10 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.websocket.proxy;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgs;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -26,10 +25,8 @@
 import java.net.URI;
 import java.security.GeneralSecurityException;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import lombok.Cleanup;
 import org.apache.pulsar.client.api.TlsProducerConsumerBase;
 import org.apache.pulsar.client.impl.auth.AuthenticationTls;
 import org.apache.pulsar.common.util.SecurityUtility;
@@ -38,6 +35,7 @@
 import org.apache.pulsar.websocket.service.ProxyServer;
 import org.apache.pulsar.websocket.service.WebSocketProxyConfiguration;
 import org.apache.pulsar.websocket.service.WebSocketServiceStarter;
+import org.awaitility.Awaitility;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
@@ -123,26 +121,20 @@ public void socketTest() throws GeneralSecurityException {
 
             Assert.assertTrue(producerFuture.get().isOpen());
 
+            Awaitility.await().untilAsserted(() -> {
+                Assert.assertTrue(produceSocket.getBuffer().size() > 0);
+                Assert.assertEquals(produceSocket.getBuffer(), consumeSocket.getBuffer());
+            });
             consumeSocket.awaitClose(1, TimeUnit.SECONDS);
             produceSocket.awaitClose(1, TimeUnit.SECONDS);
-            Assert.assertTrue(produceSocket.getBuffer().size() > 0);
-            Assert.assertEquals(produceSocket.getBuffer(), consumeSocket.getBuffer());
         } catch (Throwable t) {
             log.error(t.getMessage());
             Assert.fail(t.getMessage());
         } finally {
-            @Cleanup("shutdownNow")
-            ExecutorService executor = newFixedThreadPool(1);
             try {
-                executor.submit(() -> {
-                    try {
-                        consumeClient.stop();
-                        produceClient.stop();
-                        log.info("proxy clients are stopped successfully");
-                    } catch (Exception e) {
-                        log.error(e.getMessage());
-                    }
-                }).get(2, TimeUnit.SECONDS);
+                consumeClient.stop();
+                produceClient.stop();
+                log.info("proxy clients are stopped successfully");
             } catch (Exception e) {
                 log.error("failed to close clients ", e);
             }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java
index c4f4e876c69db..5d4668cf7cd2a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/ProxyPublishConsumeWithoutZKTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,17 +18,13 @@
  */
 package org.apache.pulsar.websocket.proxy;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgs;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import java.net.URI;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import lombok.Cleanup;
 import org.apache.pulsar.client.api.ProducerConsumerBase;
 import org.apache.pulsar.metadata.impl.ZKMetadataStore;
 import org.apache.pulsar.websocket.WebSocketService;
@@ -113,18 +109,10 @@ public void socketTest() throws Exception {
             Assert.assertTrue(produceSocket.getBuffer().size() > 0);
             Assert.assertEquals(produceSocket.getBuffer(), consumeSocket.getBuffer());
         } finally {
-            @Cleanup("shutdownNow")
-            ExecutorService executor = newFixedThreadPool(1);
             try {
-                executor.submit(() -> {
-                    try {
-                        consumeClient.stop();
-                        produceClient.stop();
-                        log.info("proxy clients are stopped successfully");
-                    } catch (Exception e) {
-                        log.error(e.getMessage());
-                    }
-                }).get(2, TimeUnit.SECONDS);
+                consumeClient.stop();
+                produceClient.stop();
+                log.info("proxy clients are stopped successfully");
             } catch (Exception e) {
                 log.error("failed to close clients ", e);
             }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerMessageHandler.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerMessageHandler.java
index cc7302a777775..d7771920f2198 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerMessageHandler.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerMessageHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerSocket.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerSocket.java
index 8e5f20afe6782..6510c69d1ae5a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerSocket.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleConsumerSocket.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleProducerSocket.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleProducerSocket.java
index 04b24d5be2b7f..1b46f0f34b4fa 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleProducerSocket.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/SimpleProducerSocket.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java
index 4c4be4b68e44e..09a9719f141e5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/websocket/proxy/v1/V1_ProxyAuthenticationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.websocket.proxy.v1;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgs;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -26,16 +25,13 @@
 import com.google.common.collect.Sets;
 import java.net.URI;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import lombok.Cleanup;
 import org.apache.pulsar.client.api.v1.V1_ProducerConsumerBase;
 import org.apache.pulsar.metadata.impl.ZKMetadataStore;
 import org.apache.pulsar.websocket.WebSocketService;
@@ -94,20 +90,12 @@ public void setup() throws Exception {
 
     @AfterMethod(alwaysRun = true)
     public void cleanup() throws Exception {
-        @Cleanup("shutdownNow")
-        ExecutorService executor = newFixedThreadPool(1);
         try {
-            executor.submit(() -> {
-                try {
-                    consumeClient.stop();
-                    produceClient.stop();
-                    log.info("proxy clients are stopped successfully");
-                } catch (Exception e) {
-                    log.error(e.getMessage());
-                }
-            }).get(2, TimeUnit.SECONDS);
+            consumeClient.stop();
+            produceClient.stop();
+            log.info("proxy clients are stopped successfully");
         } catch (Exception e) {
-            log.error("failed to close clients ", e);
+            log.error(e.getMessage());
         }
 
         super.internalCleanup();
@@ -197,14 +185,7 @@ public void statsTest() throws Exception {
             Future producerFuture = produceClient.connect(produceSocket, produceUri, produceRequest);
             Assert.assertTrue(producerFuture.get().isOpen());
 
-            int retry = 0;
-            int maxRetry = 500;
-            while (consumeSocket.getReceivedMessagesCount() < 3) {
-                Thread.sleep(10);
-                if (retry++ > maxRetry) {
-                    break;
-                }
-            }
+            Awaitility.await().untilAsserted(() -> Assert.assertTrue(consumeSocket.getReceivedMessagesCount() >= 3));
 
             service.getProxyStats().generate();
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
index eae33ebf8e189..92899feda7371 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
index 132c3a37e5bfd..013bc23d6630f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone_with_rocksdb.conf b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone_with_rocksdb.conf
new file mode 100644
index 0000000000000..d8b26bbbfa99d
--- /dev/null
+++ b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone_with_rocksdb.conf
@@ -0,0 +1,97 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+applicationName="pulsar_broker"
+metadataStoreUrl=
+configurationMetadataStoreUrl=
+brokerServicePort=6650
+brokerServicePortTls=6651
+webServicePort=8080
+allowLoopback=true
+webServicePortTls=4443
+bindAddress=0.0.0.0
+advertisedAddress=
+advertisedListeners=
+internalListenerName=internal
+clusterName="test_cluster"
+brokerShutdownTimeoutMs=3000
+backlogQuotaCheckEnabled=true
+backlogQuotaCheckIntervalInSeconds=60
+backlogQuotaDefaultLimitGB=50
+brokerDeleteInactiveTopicsEnabled=true
+brokerDeleteInactiveTopicsFrequencySeconds=60
+allowAutoTopicCreation=true
+allowAutoTopicCreationType=non-partitioned
+defaultNumPartitions=1
+messageExpiryCheckIntervalInMinutes=5
+clientLibraryVersionCheckEnabled=false
+clientLibraryVersionCheckAllowUnversioned=true
+statusFilePath=/tmp/status.html
+tlsEnabled=false
+tlsCertificateFilePath=/usr/local/conf/pulsar/server.crt
+tlsKeyFilePath=/home/local/conf/pulsar/server.key
+tlsTrustCertsFilePath=
+tlsAllowInsecureConnection=false
+authenticationEnabled=false
+authorizationEnabled=false
+superUserRoles="test_user"
+brokerClientAuthenticationPlugin="org.apache.pulsar.client.impl.auth.AuthenticationDisabled"
+brokerClientAuthenticationParameters=
+bookkeeperClientAuthenticationPlugin="test_auth_plugin"
+bookkeeperClientAuthenticationAppId="test_auth_id"
+bookkeeperClientTimeoutInSeconds=30
+bookkeeperClientSpeculativeReadTimeoutInMillis=0
+bookkeeperClientHealthCheckEnabled=true
+bookkeeperClientHealthCheckIntervalSeconds=60
+bookkeeperClientHealthCheckErrorThresholdPerInterval=5
+bookkeeperClientHealthCheckQuarantineTimeInSeconds=1800
+bookkeeperClientRackawarePolicyEnabled=true
+bookkeeperClientRegionawarePolicyEnabled=false
+bookkeeperClientMinNumRacksPerWriteQuorum=2
+bookkeeperClientEnforceMinNumRacksPerWriteQuorum=false
+bookkeeperClientReorderReadSequenceEnabled=false
+bookkeeperClientIsolationGroups="test_group"
+managedLedgerDefaultEnsembleSize=3
+managedLedgerDefaultWriteQuorum=2
+managedLedgerDefaultAckQuorum=2
+managedLedgerCacheSizeMB=1024
+managedLedgerCacheEvictionWatermark=10
+managedLedgerDefaultMarkDeleteRateLimit=0.1
+managedLedgerMaxEntriesPerLedger=50000
+managedLedgerMinLedgerRolloverTimeMinutes=10
+managedLedgerMaxLedgerRolloverTimeMinutes=240
+managedLedgerCursorMaxEntriesPerLedger=50000
+managedLedgerCursorRolloverTimeInSeconds = 14400
+managedLedgerDataReadPriority = bookkeeper-first
+loadBalancerEnabled = false
+loadBalancerReportUpdateThresholdPercentage=10
+loadBalancerReportUpdateMaxIntervalMinutes=15
+loadBalancerHostUsageCheckIntervalMinutes=1
+loadBalancerSheddingIntervalMinutes=30
+loadBalancerSheddingGracePeriodMinutes=30
+loadBalancerBrokerUnderloadedThresholdPercentage=50
+loadBalancerBrokerOverloadedThresholdPercentage=85
+replicationMetricsEnabled=true
+replicationConnectionsPerBroker=16
+replicationProducerQueueSize=1000
+replicatorPrefix=pulsar.repl
+brokerDeleteInactiveTopicsMode=delete_when_subscriptions_caught_up
+supportedNamespaceBundleSplitAlgorithms=[range_equally_divide]
+defaultNamespaceBundleSplitAlgorithm=topic_count_equally_divide
+maxMessagePublishBufferSizeInMB=-1
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
index 6ccb442c70487..3b0efe64cf588 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Consumer.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Consumer.java
index 70323e3b5e176..d84b9981b0320 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Consumer.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Consumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ConsumerConfiguration.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ConsumerConfiguration.java
index f0befa0b7540f..81956db56f774 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ConsumerConfiguration.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ConsumerConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageBuilder.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageBuilder.java
index 7de9ed95e100a..084312ed28c07 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageBuilder.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageListener.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageListener.java
index acb2ecf17e517..301740be398c0 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageListener.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/MessageListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Producer.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Producer.java
index 1f08e36655bce..0b431050377c3 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Producer.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Producer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java
index f3fb5102cc808..761c49ec24221 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/PulsarClient.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/PulsarClient.java
index 484d9c82b0e8d..8ac1dfb71e092 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/PulsarClient.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/PulsarClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Reader.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Reader.java
index a6644c55fa63c..451b9fa638203 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Reader.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/Reader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderConfiguration.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderConfiguration.java
index 99bdaea5431a1..885436a11336e 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderConfiguration.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderListener.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderListener.java
index dd656ae7edd90..26d694d589ac0 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderListener.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ReaderListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/package-info.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/package-info.java
index 9dff44d44864d..57896b5e27235 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/package-info.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/MessageBuilderImpl.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/MessageBuilderImpl.java
index 254e0b40e3ecf..6d6a08725d7da 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/MessageBuilderImpl.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/MessageBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/package-info.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/package-info.java
index 589fda54f18d3..e429b403ec6b3 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/package-info.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Client API.
  */
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ConsumerV1Impl.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ConsumerV1Impl.java
index 0b9b6f6d3b9f9..ab17beee4f7d2 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ConsumerV1Impl.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ConsumerV1Impl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ProducerV1Impl.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ProducerV1Impl.java
index a81cf90b55ec7..12c8d0f1527ce 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ProducerV1Impl.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ProducerV1Impl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/PulsarClientV1Impl.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/PulsarClientV1Impl.java
index 54d1991273e84..ca4373d37f4c1 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/PulsarClientV1Impl.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/PulsarClientV1Impl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ReaderV1Impl.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ReaderV1Impl.java
index aa2397e49c7f5..2e6384459e160 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ReaderV1Impl.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/ReaderV1Impl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/package-info.java b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/package-info.java
index aedb9c28ca64b..97705e7d567ca 100644
--- a/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/package-info.java
+++ b/pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/impl/v1/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Client API.
  */
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Bookies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Bookies.java
index 6734925b1ff49..8f4497cdb4435 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Bookies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Bookies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/BrokerStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/BrokerStats.java
index 100ba1056d5fa..1127e5d409784 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/BrokerStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/BrokerStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Brokers.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Brokers.java
index 9f77e4615b197..464d02121cfc2 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Brokers.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Brokers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Clusters.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Clusters.java
index 2e8a43a826045..4178bc7483df5 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Clusters.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Clusters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Functions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Functions.java
index 55e0855ca5523..3932ccf6c9180 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Functions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Functions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/GetStatsOptions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/GetStatsOptions.java
index c0f5e92f42ae8..14e99ac014ba8 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/GetStatsOptions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/GetStatsOptions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListNamespaceTopicsOptions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListNamespaceTopicsOptions.java
index 8c5bc4b974138..c5a0875a4df63 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListNamespaceTopicsOptions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListNamespaceTopicsOptions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListTopicsOptions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListTopicsOptions.java
index 2fa9c069f8f9d..9a5e77e1ed997 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListTopicsOptions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ListTopicsOptions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/LongRunningProcessStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/LongRunningProcessStatus.java
index c300a25f0f300..3264bb85ea357 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/LongRunningProcessStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/LongRunningProcessStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Lookup.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Lookup.java
index ee69c3b84e2ce..89b356f1451c3 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Lookup.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Lookup.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Mode.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Mode.java
index 7f732d9052e94..d3cf2d8ce73e1 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Mode.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Mode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Namespaces.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Namespaces.java
index 4fc50bf5b2e00..f4c284bb48434 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Namespaces.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Namespaces.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -3532,6 +3532,45 @@ CompletableFuture removeMaxUnackedMessagesPerSubscriptionAsync(
      */
     CompletableFuture getOffloadThresholdAsync(String namespace);
 
+
+    /**
+     * Get the offloadThresholdInSeconds for a namespace.
+     *
+     * 

+     * Response example:
+     *
+     * 
+     * 10000000
+     * 

+     *
+     * @param namespace
+     *            Namespace name
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    long getOffloadThresholdInSeconds(String namespace) throws PulsarAdminException;
+
+
+    /**
+     * Get the offloadThresholdInSeconds for a namespace.
+     *
+     * 

+     * Response example:
+     *
+     * 
+     * 10000000
+     * 

+     *
+     * @param namespace
+     *            Namespace name
+     */
+    CompletableFuture getOffloadThresholdInSecondsAsync(String namespace);
+
     /**
      * Set the offloadThreshold for a namespace.
      * 

@@ -3581,6 +3620,50 @@ CompletableFuture removeMaxUnackedMessagesPerSubscriptionAsync(
      */
     CompletableFuture setOffloadThresholdAsync(String namespace, long offloadThreshold);
 
+
+    /**
+     * Set the offloadThresholdInSeconds for a namespace.
+     * 

+     * Negative values disabled automatic offloading. Setting a threshold of 0 will offload data as soon as possible.
+     * 

+     * Request example:
+     *
+     * 
+     * 10000000
+     * 

+     *
+     * @param namespace
+     *            Namespace name
+     * @param offloadThresholdInSeconds
+     *            maximum number of bytes stored before offloading is triggered
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void setOffloadThresholdInSeconds(String namespace, long offloadThresholdInSeconds) throws PulsarAdminException;
+
+    /**
+     * Set the offloadThresholdInSeconds for a namespace.
+     * 

+     * Negative values disabled automatic offloading. Setting a threshold of 0 will offload data as soon as possible.
+     * 

+     * Request example:
+     *
+     * 
+     * 10000000
+     * 

+     *
+     * @param namespace
+     *            Namespace name
+     * @param offloadThresholdInSeconds
+     *            maximum number of seconds stored before offloading is triggered
+     */
+    CompletableFuture setOffloadThresholdInSecondsAsync(String namespace, long offloadThresholdInSeconds);
+
     /**
      * Get the offload deletion lag for a namespace, in milliseconds.
      * The number of milliseconds to wait before deleting a ledger segment which has been offloaded from
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/NonPersistentTopics.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/NonPersistentTopics.java
index 4fbda45283dc2..9c9a3ceabf3e0 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/NonPersistentTopics.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/NonPersistentTopics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/OffloadProcessStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/OffloadProcessStatus.java
index 9e070f8ba7cf1..e6c97c2b0c56e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/OffloadProcessStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/OffloadProcessStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Packages.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Packages.java
index ec5779ca29602..85ee7aeec176e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Packages.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Packages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Properties.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Properties.java
index 06cd3d6dddb2e..2b5403022d650 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Properties.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Properties.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ProxyStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ProxyStats.java
index 66eb411ee3720..9a2b462c81e53 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ProxyStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ProxyStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
index 29cc7af710615..12d225676dc18 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminBuilder.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminBuilder.java
index 60d4c2dbc7138..1260555a7c43f 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminBuilder.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
index 6e0285d7d1e9c..baea3bae1414a 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/PulsarAdminException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceGroups.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceGroups.java
index bbed3dbb9b825..843976eb13d42 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceGroups.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceGroups.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceQuotas.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceQuotas.java
index 0e09314ea8e5a..76184631720ab 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceQuotas.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/ResourceQuotas.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Schemas.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Schemas.java
index 345342b2b6dc4..9a1eb67d2e53a 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Schemas.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Schemas.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sink.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sink.java
index c270a758e0f7a..95a68b1d48261 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sink.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sinks.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sinks.java
index dae91c7260056..5376f5db388a6 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sinks.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sinks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Source.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Source.java
index aba325113f22d..a5059fefb027c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Source.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Source.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sources.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sources.java
index 822020b7fd403..ec614a71aa03e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sources.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Sources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Tenants.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Tenants.java
index 0c23ebcc91386..11591b8c20b5a 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Tenants.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Tenants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/TopicPolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/TopicPolicies.java
index 827bb99132b62..f6cd2a5a0ef23 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/TopicPolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/TopicPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride;
 import org.apache.pulsar.common.policies.data.BacklogQuota;
 import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
 import org.apache.pulsar.common.policies.data.DispatchRate;
@@ -1814,4 +1815,102 @@ SchemaCompatibilityStrategy getSchemaCompatibilityStrategy(String topic, boolean
     CompletableFuture removeEntryFiltersPerTopicAsync(String topic);
 
 
+    /**
+     * Sets the autoSubscriptionCreation policy for a given topic, overriding namespace settings.
+     * 

+     * When autoSubscriptionCreationOverride is enabled, new subscriptions will be created upon connection,
+     * regardless of the namespace level configuration.
+     * 

+     * Request example:
+     *
+     * 
+     * 
+     *  {
+     *      "allowAutoSubscriptionCreation" : true
+     *  }
+     * 
+     * 

+     *
+     * @param topic
+     *            Topic name
+     * @param autoSubscriptionCreationOverride
+     *            Override policies for auto subscription creation
+     *
+     * @throws PulsarAdminException.NotAuthorizedException
+     *             Don't have admin permission
+     * @throws PulsarAdminException.NotFoundException
+     *             Topic does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void setAutoSubscriptionCreation(
+            String topic, AutoSubscriptionCreationOverride autoSubscriptionCreationOverride)
+            throws PulsarAdminException;
+
+    /**
+     * Sets the autoSubscriptionCreation policy for a given topic, overriding namespace settings asynchronously.
+     * 

+     * When autoSubscriptionCreationOverride is enabled, new subscriptions will be created upon connection,
+     * regardless of the namespace level configuration.
+     * 

+     * Request example:
+     *
+     * 
+     * 
+     *  {
+     *      "allowAutoSubscriptionCreation" : true
+     *  }
+     * 
+     * 

+     *
+     * @param topic
+     *            Topic name
+     * @param autoSubscriptionCreationOverride
+     *            Override policies for auto subscription creation
+     */
+    CompletableFuture setAutoSubscriptionCreationAsync(
+            String topic, AutoSubscriptionCreationOverride autoSubscriptionCreationOverride);
+
+    /**
+     * Get the autoSubscriptionCreation info within a topic.
+     *
+     * @param topic
+     * @param applied
+     * @return
+     * @throws PulsarAdminException
+     */
+    AutoSubscriptionCreationOverride getAutoSubscriptionCreation(String topic,
+                                                                 boolean applied) throws PulsarAdminException;
+
+    /**
+     * Get the autoSubscriptionCreation info within a topic asynchronously.
+     *
+     * @param topic
+     * @param applied
+     * @return
+     */
+    CompletableFuture getAutoSubscriptionCreationAsync(String topic, boolean applied);
+
+    /**
+     * Removes the autoSubscriptionCreation policy for a given topic.
+     *
+     * @param topic
+     *            Topic name
+     *
+     * @throws PulsarAdminException.NotAuthorizedException
+     *             Don't have admin permission
+     * @throws PulsarAdminException.NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void removeAutoSubscriptionCreation(String topic) throws PulsarAdminException;
+
+    /**
+     * Removes the autoSubscriptionCreation policy for a given topic asynchronously.
+     *
+     * @param topic
+     *            Topic name
+     */
+    CompletableFuture removeAutoSubscriptionCreationAsync(String topic);
 }
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Topics.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Topics.java
index d2d0754f1d112..16b9afca5f2cd 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Topics.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Topics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Transactions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Transactions.java
index 3bd5a188dced9..57adf263a574f 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Transactions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Transactions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,11 +18,13 @@
  */
 package org.apache.pulsar.client.admin;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import org.apache.pulsar.client.api.transaction.TxnID;
 import org.apache.pulsar.common.policies.data.TransactionBufferStats;
+import org.apache.pulsar.common.policies.data.TransactionCoordinatorInfo;
 import org.apache.pulsar.common.policies.data.TransactionCoordinatorInternalStats;
 import org.apache.pulsar.common.policies.data.TransactionCoordinatorStats;
 import org.apache.pulsar.common.policies.data.TransactionInBufferStats;
@@ -34,6 +36,21 @@
 
 public interface Transactions {
 
+    /**
+     * List transaction coordinators.
+     *
+     * @return the transaction coordinators list.
+     */
+    List listTransactionCoordinators() throws PulsarAdminException;
+
+    /**
+     * List transaction coordinators.
+     *
+     * @return the future of the transaction coordinators list.
+     */
+    CompletableFuture> listTransactionCoordinatorsAsync();
+
+
     /**
      * Get transaction metadataStore stats.
      *
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Worker.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Worker.java
index 3e9dbb3926d21..8b9ee8594f82c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Worker.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/Worker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/package-info.java
index 718606be4837c..de1ca87bcb3dd 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/DefaultImplementation.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/DefaultImplementation.java
index 3e236623925b8..1d7b07c6c3fe9 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/DefaultImplementation.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/DefaultImplementation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
index b6313e58876ae..01f15de9256e4 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/package-info.java
index 6ec0b73941e59..54479200dc6a4 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/InternalConfigurationData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/InternalConfigurationData.java
index 1099debfc178c..9dfd117021632 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/InternalConfigurationData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/InternalConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/package-info.java
index 28e95d0c4a505..95ac74bd9e6ec 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/conf/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/AuthenticationConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/AuthenticationConfig.java
index 017747458f3e9..77ffd5ac5de29 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/AuthenticationConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/AuthenticationConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ConsumerConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ConsumerConfig.java
index dbdae19f65b6f..b1c4519fc94c0 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ConsumerConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ConsumerConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/CryptoConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/CryptoConfig.java
index e070f7e9b9170..972f0bbd03017 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/CryptoConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/CryptoConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.functions;
 
 import java.util.Map;
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java
index dd8a46b7d8b29..2dddb67c9503c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionDefinition.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionDefinition.java
index 44163cbb7580f..299d760788870 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionDefinition.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionState.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionState.java
index 34f50571d36ec..0a1c5926e9770 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionState.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/FunctionState.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ProducerConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ProducerConfig.java
index 0d2f4b48b19be..f6af7a663fa0c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ProducerConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/ProducerConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
index 11642ca654540..f3ffee4047afe 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/UpdateOptions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/UpdateOptions.java
index f1d946dc9c40a..28f4665c36c61 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/UpdateOptions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/UpdateOptions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WindowConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WindowConfig.java
index 1f5071379173b..bb090d8864601 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WindowConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WindowConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java
index 753ea989ca856..a60cc34990aa2 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/package-info.java
index d2c8bd8218958..ec5532250d683 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/BatchSourceConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/BatchSourceConfig.java
index 9664cecada7ad..b1657bf09950e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/BatchSourceConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/BatchSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/ConnectorDefinition.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/ConnectorDefinition.java
index 99c3738bd943a..a6849960bd71b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/ConnectorDefinition.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/ConnectorDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SinkConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SinkConfig.java
index 316cdd69e073b..09b98249a4df1 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SinkConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SourceConfig.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SourceConfig.java
index 79a5f81f3b9cf..17b37008127ba 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SourceConfig.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/SourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/package-info.java
index 809ad0dcf9534..654582b4c010f 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/io/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicDomain.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicDomain.java
index 4ad91d60fe4a2..0f7ccfe912577 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicDomain.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicDomain.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicVersion.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicVersion.java
index 48bed0040f717..c6904a383365e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicVersion.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/TopicVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/package-info.java
index 39d55c38269eb..f451c124a7a9b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/naming/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/PartitionedTopicMetadata.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/PartitionedTopicMetadata.java
index 4aec745f0b693..469a58c6190c5 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/PartitionedTopicMetadata.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/PartitionedTopicMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,6 +28,7 @@ public class PartitionedTopicMetadata {
 
     /* Number of partitions for the topic */
     public int partitions;
+    public boolean deleted;
 
     /* Topic properties */
     public Map properties;
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/package-info.java
index ba27c989725a1..039efa2927e55 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/partition/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/AutoFailoverPolicy.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/AutoFailoverPolicy.java
index 92abf3ff43d0f..2d7043b4dad52 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/AutoFailoverPolicy.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/AutoFailoverPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthAction.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthAction.java
index 9a1b36cf302b6..71aa63dba9ad1 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthAction.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthPolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthPolicies.java
index 6ca81170d6946..5f8bc82a53b6e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthPolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AuthPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyData.java
index c9b6073b0801f..d27fea3e36353 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyType.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyType.java
index 31d01231778f1..14b71af957136 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyType.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoSubscriptionCreationOverride.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoSubscriptionCreationOverride.java
index bb444aa798517..78748fbe25808 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoSubscriptionCreationOverride.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoSubscriptionCreationOverride.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverride.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverride.java
index 1ad981c5be7b1..24e3a57d2a33c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverride.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverride.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BacklogQuota.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BacklogQuota.java
index 4604710c3a68c..4045eade3db87 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BacklogQuota.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BacklogQuota.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieAffinityGroupData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieAffinityGroupData.java
index c0fd572b99597..21ea8bc701c06 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieAffinityGroupData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieAffinityGroupData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieInfo.java
index 808cbbd0b41a7..ecbf218c79cad 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieInfo.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookieInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesClusterInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesClusterInfo.java
index 818f69d8201ac..e5007a104863e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesClusterInfo.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesClusterInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesRackConfiguration.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesRackConfiguration.java
index f7f477c0e06c9..0640263235caf 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesRackConfiguration.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BookiesRackConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerAssignment.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerAssignment.java
index b165104050e11..ef1482d8b7f94 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerAssignment.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerAssignment.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerInfo.java
index c62f3707c733f..8955fe7a0ac78 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerInfo.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationData.java
index a53ffd3d5f1fe..8fef1b28c2998 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerStatus.java
index 82a2544912d49..1d0fc09de4b1e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BrokerStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BundlesData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BundlesData.java
index 450d17c749d53..2f4c38ad73285 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BundlesData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/BundlesData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
index f8cdf294d96e5..212a1575f9934 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -58,6 +58,16 @@ public interface ClusterData {
 
     String getBrokerClientTrustCertsFilePath();
 
+    String getBrokerClientCertificateFilePath();
+
+    String getBrokerClientKeyFilePath();
+
+    String getBrokerClientTlsKeyStoreType();
+
+    String getBrokerClientTlsKeyStorePassword();
+
+    String getBrokerClientTlsKeyStore();
+
     String getListenerName();
 
     boolean isMigrated();
@@ -97,6 +107,16 @@ interface Builder {
 
         Builder brokerClientTrustCertsFilePath(String trustCertsFilePath);
 
+        Builder brokerClientCertificateFilePath(String certificateFilePath);
+
+        Builder brokerClientKeyFilePath(String keyFilePath);
+
+        Builder brokerClientTlsKeyStoreType(String keyStoreType);
+
+        Builder brokerClientTlsKeyStorePassword(String keyStorePassword);
+
+        Builder brokerClientTlsKeyStore(String keyStore);
+
         Builder listenerName(String listenerName);
 
         Builder migrated(boolean migrated);
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/CompactionStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/CompactionStats.java
index 0500017064625..0d3e73551c6c0 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/CompactionStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/CompactionStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java
index 5cccd437be430..8c9a615d6d01c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java
index 17f1ab71ceb52..555896ab3e597 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DispatchRate.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DispatchRate.java
index a8bc65bd0ed73..516f8121d390b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DispatchRate.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/DispatchRate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/EntryFilters.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/EntryFilters.java
index 785fbce39e13d..5192e9bad3aae 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/EntryFilters.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/EntryFilters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ErrorData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ErrorData.java
index c5892dfaca09f..4729278ecdbfc 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ErrorData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ErrorData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ExceptionInformation.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ExceptionInformation.java
index 574f600dfff4b..50da1e8ddae9c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ExceptionInformation.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ExceptionInformation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FailureDomain.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FailureDomain.java
index 401acecec29ea..5a82e46eb8d38 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FailureDomain.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FailureDomain.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStats.java
index bd087b0103670..e2cd6b12a3b77 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsData.java
index 7832e4c3993d5..468bbb068bad2 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBase.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBase.java
index 759f5f9b33bb0..6516cb19eb7eb 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBase.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStats.java
index 5637c72375be4..9a1068c282aa7 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatus.java
index 8f4f7e2562909..e41196b770b3b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicDeleteMode.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicDeleteMode.java
index eb7d1ba3ee75f..6c00004d5963d 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicDeleteMode.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicDeleteMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,7 +29,7 @@ public enum InactiveTopicDeleteMode {
     delete_when_no_subscriptions,
 
     /**
-     * The topic can be deleted when all subscriptions catchup and no active producers/consumers.
+     * The topic can be deleted when all subscriptions catchup and no active producers.
      */
     delete_when_subscriptions_caught_up
 }
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicPolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicPolicies.java
index ac4607bb180bd..80e91fdf320e0 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicPolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/InactiveTopicPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java
index ee67f826ee678..95a45d37d9556 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ManagedLedgerInternalStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationData.java
index 24cf030e761aa..aa48e69c14571 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.java
index 39a7e3a28fcd1..754192906fe05 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStats.java
index 68be7316091f2..f527cc51fb719 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPublisherStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPublisherStats.java
index fd6622980d11f..fec645c2e258d 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPublisherStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentPublisherStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentReplicatorStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentReplicatorStats.java
index a506aa51d87ef..6c77de9195786 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentReplicatorStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentReplicatorStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentSubscriptionStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentSubscriptionStats.java
index 515f0a5e8dd20..1661b115a137a 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentSubscriptionStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentSubscriptionStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentTopicStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentTopicStats.java
index 2c952e8d2988d..3e7f98299dbde 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentTopicStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/NonPersistentTopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java
index f99258aeb79d2..9073de658d405 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -31,6 +31,8 @@ public interface OffloadPolicies {
 
     Long getManagedLedgerOffloadThresholdInBytes();
 
+    Long getManagedLedgerOffloadThresholdInSeconds();
+
     Long getManagedLedgerOffloadDeletionLagInMillis();
 
     OffloadedReadPriority getManagedLedgerOffloadedReadPriority();
@@ -89,6 +91,8 @@ interface Builder {
 
         Builder managedLedgerOffloadThresholdInBytes(Long managedLedgerOffloadThresholdInBytes);
 
+        Builder managedLedgerOffloadThresholdInSeconds(Long managedLedgerOffloadThresholdInSeconds);
+
         Builder managedLedgerOffloadDeletionLagInMillis(Long managedLedgerOffloadDeletionLagInMillis);
 
         Builder managedLedgerOffloadedReadPriority(OffloadedReadPriority managedLedgerOffloadedReadPriority);
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadedReadPriority.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadedReadPriority.java
index 245ec6068920f..332354c55e98e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadedReadPriority.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/OffloadedReadPriority.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicInternalStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicInternalStats.java
index dad2985b5a362..afef906c3a764 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicInternalStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicInternalStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicStats.java
index f5ed8b290deef..36ed29190f080 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PartitionedTopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistencePolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistencePolicies.java
index 345695040d0f5..df4e086748f30 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistencePolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistencePolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.java
index 5306a530484c5..c4e4471962044 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/Policies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/Policies.java
index e2b186a5a1606..066fdf1df4f09 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/Policies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/Policies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -94,6 +94,8 @@ public class Policies {
     @SuppressWarnings("checkstyle:MemberName")
     public long offload_threshold = -1;
     @SuppressWarnings("checkstyle:MemberName")
+    public long offload_threshold_in_seconds = -1;
+    @SuppressWarnings("checkstyle:MemberName")
     public Long offload_deletion_lag_ms = null;
     @SuppressWarnings("checkstyle:MemberName")
     public Integer max_topics_per_namespace = null;
@@ -145,7 +147,7 @@ public int hashCode() {
                 max_producers_per_topic,
                 max_consumers_per_topic, max_consumers_per_subscription,
                 max_unacked_messages_per_consumer, max_unacked_messages_per_subscription,
-                compaction_threshold, offload_threshold,
+                compaction_threshold, offload_threshold, offload_threshold_in_seconds,
                 offload_deletion_lag_ms,
                 schema_auto_update_compatibility_strategy,
                 schema_validation_enforced,
@@ -191,6 +193,7 @@ public boolean equals(Object obj) {
                     && Objects.equals(max_consumers_per_subscription, other.max_consumers_per_subscription)
                     && Objects.equals(compaction_threshold, other.compaction_threshold)
                     && offload_threshold == other.offload_threshold
+                    && offload_threshold_in_seconds == other.offload_threshold_in_seconds
                     && Objects.equals(offload_deletion_lag_ms, other.offload_deletion_lag_ms)
                     && schema_auto_update_compatibility_strategy == other.schema_auto_update_compatibility_strategy
                     && schema_validation_enforced == other.schema_validation_enforced
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublishRate.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublishRate.java
index fdec9e4bf3a26..e9c19e4903e8e 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublishRate.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublishRate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublisherStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublisherStats.java
index fb50e33abf8ed..78af224d28c02 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublisherStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/PublisherStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RawBookieInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RawBookieInfo.java
index 004bd9e199ec4..1b2da605f31bd 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RawBookieInfo.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RawBookieInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ReplicatorStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ReplicatorStats.java
index 06e881ba1c210..24be2f9380bb7 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ReplicatorStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ReplicatorStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceGroup.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceGroup.java
index 0bfc38637c10f..bd47427e9aa82 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceGroup.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceGroup.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuota.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuota.java
index 27816df08f425..114d281224d59 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuota.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuota.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RetentionPolicies.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RetentionPolicies.java
index 2010ce0bf1eb2..4206220c5ee58 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RetentionPolicies.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/RetentionPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,7 +29,7 @@
  */
 public class RetentionPolicies {
     private int retentionTimeInMinutes;
-    private long retentionSizeInMB;
+    private int retentionSizeInMB;
 
     public RetentionPolicies() {
         this(0, 0);
@@ -44,7 +44,7 @@ public int getRetentionTimeInMinutes() {
         return retentionTimeInMinutes;
     }
 
-    public long getRetentionSizeInMB() {
+    public int getRetentionSizeInMB() {
         return retentionSizeInMB;
     }
 
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.java
index e10144e33bf62..5fab566a3103b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaCompatibilityStrategy.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaCompatibilityStrategy.java
index f3b4569bad8f3..6ba2fe0ad75f6 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaCompatibilityStrategy.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SchemaCompatibilityStrategy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SinkStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SinkStatus.java
index 8bd539c369825..56cd1656f62ab 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SinkStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SinkStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SourceStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SourceStatus.java
index bb7ed2d2dafdd..5a87cb4b58c99 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SourceStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SourceStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscribeRate.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscribeRate.java
index ea641b44b2a31..7f196beb6d904 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscribeRate.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscribeRate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.java
index 9f9d24b8b97e5..5f83c8e1a8710 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java
index 57d2d16d62c20..75bbb0f86d89a 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TenantInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TenantInfo.java
index f1f6658f0a13a..9b6c1f446f39b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TenantInfo.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TenantInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicHashPositions.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicHashPositions.java
index bf7b3a5e4d7de..ec1576563f4a7 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicHashPositions.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicHashPositions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java
index 686aaf263d0e4..a5e99e218fbb7 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicType.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicType.java
index b184bf6cd9bbd..2a348556d5179 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicType.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TopicType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionBufferStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionBufferStats.java
index d1ad64002075b..73d66b8c230bb 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionBufferStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionBufferStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInfo.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInfo.java
new file mode 100644
index 0000000000000..8150f0125aa6e
--- /dev/null
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInfo.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.policies.data;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * Transaction coordinator information.
+ */
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class TransactionCoordinatorInfo {
+    private long id;
+    private String brokerServiceUrl;
+}
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInternalStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInternalStats.java
index 4f099229e155b..276182c7e76ab 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInternalStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorInternalStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStats.java
index 1764c1c33a854..0e6635e390efd 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStatus.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStatus.java
index 033a66af8e8cc..bc913b29dd191 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStatus.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionCoordinatorStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInBufferStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInBufferStats.java
index 194f5f38ae851..a7bbe8a61a143 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInBufferStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInBufferStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInPendingAckStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInPendingAckStats.java
index 12383b94d5a9b..c66689fcac930 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInPendingAckStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionInPendingAckStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionLogStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionLogStats.java
index 35fadd18c85b8..0e26e757102a1 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionLogStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionLogStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionMetadata.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionMetadata.java
index 4f987014c7413..73fb43e45da68 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionMetadata.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckInternalStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckInternalStats.java
index cf513018c65ba..d2f292d65a881 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckInternalStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckInternalStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckStats.java
index d4480d9e4c13e..9fb6015829f75 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/TransactionPendingAckStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ValidateResult.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ValidateResult.java
index 13821947cf217..0844a7c522aff 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ValidateResult.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/ValidateResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/WorkerFunctionInstanceStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/WorkerFunctionInstanceStats.java
index ce70d65b48f73..a7c47a148eb09 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/WorkerFunctionInstanceStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/WorkerFunctionInstanceStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoSubscriptionCreationOverrideImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoSubscriptionCreationOverrideImpl.java
index ac1af07d044a1..f5fd1602b2733 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoSubscriptionCreationOverrideImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoSubscriptionCreationOverrideImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,7 +24,7 @@
 import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride;
 
 /**
- * Override of autoSubscriptionCreation settings on a namespace level.
+ * Override of autoSubscriptionCreation settings on a topic or namespace level.
  */
 @Data
 @AllArgsConstructor
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoTopicCreationOverrideImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoTopicCreationOverrideImpl.java
index ba6bc07780a08..52cf1f1829b8d 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoTopicCreationOverrideImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/AutoTopicCreationOverrideImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BacklogQuotaImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BacklogQuotaImpl.java
index c8073d8fb4066..05da03f1090b6 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BacklogQuotaImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BacklogQuotaImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieAffinityGroupDataImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieAffinityGroupDataImpl.java
index 017afe4506217..7873c2a3fbe34 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieAffinityGroupDataImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieAffinityGroupDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieInfoImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieInfoImpl.java
index b58498903ab48..b17d368278833 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieInfoImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookieInfoImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookiesClusterInfoImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookiesClusterInfoImpl.java
index 0e983d3b35027..ad415fc28817f 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookiesClusterInfoImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BookiesClusterInfoImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerInfoImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerInfoImpl.java
index 43bb05fd41f97..e4d0a68b50ad0 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerInfoImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerInfoImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerStatusImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerStatusImpl.java
index a2cb6ac357b41..097c5e0641ed3 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerStatusImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BrokerStatusImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BundlesDataImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BundlesDataImpl.java
index 92e8900a9cb2e..e84ba49da668c 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BundlesDataImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/BundlesDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DelayedDeliveryPoliciesImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DelayedDeliveryPoliciesImpl.java
index 45ab10f6500d8..408217f363709 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DelayedDeliveryPoliciesImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DelayedDeliveryPoliciesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DispatchRateImpl.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DispatchRateImpl.java
index bc2bcce1ef44e..b10f2eefc8bf3 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DispatchRateImpl.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/DispatchRateImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/package-info.java
index 7567a1d390b76..4f8f6d59c18ec 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/package-info.java
index e27dd7e0e591a..d00003e4eeb53 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactory.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactory.java
index 267eea147d6bb..615379ef37d56 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactory.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
index 6d9cece4ae5f2..4a4fc26f31ff5 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java
index 47e3597d14cdf..30cf028e09d29 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/package-info.java
index c4c4f9a16f071..bf91382f248c3 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/IsCompatibilityResponse.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/IsCompatibilityResponse.java
index 0361e1685e96a..d5edd96fab563 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/IsCompatibilityResponse.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/IsCompatibilityResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaPayload.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaPayload.java
index cac4149e0d418..07dc146f53879 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaPayload.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaPayload.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java
index 3819274fc324a..22f963e0e09bd 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java
index fed108111a5ac..3dbe831053a4b 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AnalyzeSubscriptionBacklogResult.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AnalyzeSubscriptionBacklogResult.java
index a97ccb0bb96ff..059026b80c575 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AnalyzeSubscriptionBacklogResult.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AnalyzeSubscriptionBacklogResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/Metrics.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/Metrics.java
index 617bfbfbe5907..708a14cf0ad07 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/Metrics.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/Metrics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/PositionInPendingAckStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/PositionInPendingAckStats.java
index 4772f8350bfed..e3bb31e40d0d3 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/PositionInPendingAckStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/PositionInPendingAckStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/package-info.java
index 95ee28e89fe14..194220b47d823 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadata.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadata.java
index 164e6c7cdc4ce..249dd2b3933a0 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadata.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.packages.management.core.common;
 
 import java.io.Serializable;
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageType.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageType.java
index c4b0f723ff971..8b62150f50ebe 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageType.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/PackageType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java
index 12302ebdf53f5..66faf846ec752 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Packages management general classes.
  */
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/PackagesManagementException.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/PackagesManagementException.java
index a9d80ddb78193..6b1d6fa37063f 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/PackagesManagementException.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/PackagesManagementException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/package-info.java
index c68db979453a1..6f56950e09878 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/packages/management/core/exceptions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Exceptions of the packages management service thrown.
  */
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadManagerReport.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadManagerReport.java
index f30e53374f747..bf7371e6dd014 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadManagerReport.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadManagerReport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceBundleStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceBundleStats.java
index ea237fbbe8e3a..dc1cdd3d5cbce 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceBundleStats.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceBundleStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUsage.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUsage.java
index 28621e12757be..eed8b33b39178 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUsage.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUsage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ServiceLookupData.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ServiceLookupData.java
index 44e43cf6a9285..2d138edd924bc 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ServiceLookupData.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ServiceLookupData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java
index 0639c1aeb5bed..0dcb9fe333edc 100644
--- a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java
+++ b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index 2cb7b85bef0c2..b54082c9cf135 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -125,6 +125,7 @@
                   com.google.code.gson:gson
                   com.fasterxml.jackson.core
                   io.netty:*
+                  io.netty.incubator:*
                   org.apache.pulsar:pulsar-common
                   org.apache.bookkeeper:*
                   com.yahoo.datasketches:sketches-core
diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml
index 89fccfccd5660..983dfbdaf080d 100644
--- a/pulsar-client-admin/pom.xml
+++ b/pulsar-client-admin/pom.xml
@@ -107,6 +107,12 @@
       pulsar-package-core
       ${project.version}
     
+
+    
+      org.hamcrest
+      hamcrest
+      test
+    
   
 
   
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java
index 55c47363cd4a9..f6c8af3d9b21b 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BookiesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BookiesImpl.java
index f5f9a248b12dd..2286fb8c8a381 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BookiesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BookiesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
index 86d9af6a8fbe9..e409d6f4492de 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokersImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokersImpl.java
index a9b89cd33fd29..0e6296724b3da 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokersImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokersImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ClustersImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ClustersImpl.java
index 1d4e3a4f28eeb..02e44aca62604 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ClustersImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ClustersImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ComponentResource.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ComponentResource.java
index 2aa8a884b4b88..1f6ec17e888c4 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ComponentResource.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ComponentResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
index f358764c070e3..85e76f13b0647 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/JacksonConfigurator.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/JacksonConfigurator.java
index ad9a5e61cf4bd..ac1844ac079e5 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/JacksonConfigurator.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/JacksonConfigurator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java
index fc5f7528cef7f..ff7a02ca3275e 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/LookupImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java
index d62312ee7d7b4..6d4889a751d37 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -1518,6 +1518,16 @@ public CompletableFuture getOffloadThresholdAsync(String namespace) {
         return asyncGetNamespaceParts(new FutureCallback(){}, namespace, "offloadThreshold");
     }
 
+    @Override
+    public long getOffloadThresholdInSeconds(String namespace) throws PulsarAdminException {
+        return sync(() -> getOffloadThresholdInSecondsAsync(namespace));
+    }
+
+    @Override
+    public CompletableFuture getOffloadThresholdInSecondsAsync(String namespace) {
+        return asyncGetNamespaceParts(new FutureCallback(){}, namespace, "offloadThresholdInSeconds");
+    }
+
     @Override
     public void setOffloadThreshold(String namespace, long offloadThreshold) throws PulsarAdminException {
         sync(() -> setOffloadThresholdAsync(namespace, offloadThreshold));
@@ -1530,6 +1540,19 @@ public CompletableFuture setOffloadThresholdAsync(String namespace, long o
         return asyncPutRequest(path, Entity.entity(offloadThreshold, MediaType.APPLICATION_JSON));
     }
 
+    @Override
+    public void setOffloadThresholdInSeconds(String namespace, long offloadThresholdInSeconds)
+            throws PulsarAdminException {
+        sync(() -> setOffloadThresholdInSecondsAsync(namespace, offloadThresholdInSeconds));
+    }
+
+    @Override
+    public CompletableFuture setOffloadThresholdInSecondsAsync(String namespace, long offloadThresholdInSeconds) {
+        NamespaceName ns = NamespaceName.get(namespace);
+        WebTarget path = namespacePath(ns, "offloadThresholdInSeconds");
+        return asyncPutRequest(path, Entity.entity(offloadThresholdInSeconds, MediaType.APPLICATION_JSON));
+    }
+
     @Override
     public Long getOffloadDeleteLagMs(String namespace) throws PulsarAdminException {
         return sync(() -> getOffloadDeleteLagMsAsync(namespace));
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NonPersistentTopicsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NonPersistentTopicsImpl.java
index 635df52561947..76727cd1e0fc4 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NonPersistentTopicsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NonPersistentTopicsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/OffloadProcessStatusImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/OffloadProcessStatusImpl.java
index ea63a33564322..96fa1ab77100b 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/OffloadProcessStatusImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/OffloadProcessStatusImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PackagesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PackagesImpl.java
index 885e39c1ce6f5..694c2160b0f80 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PackagesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PackagesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ProxyStatsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ProxyStatsImpl.java
index 084e3b65dbc6a..e98d9bf57b31e 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ProxyStatsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ProxyStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImpl.java
index 7e7922be6caf8..98d1c95dc5ca1 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -33,21 +33,12 @@
 public class PulsarAdminBuilderImpl implements PulsarAdminBuilder {
 
     protected ClientConfigurationData conf;
-    private int connectTimeout = PulsarAdminImpl.DEFAULT_CONNECT_TIMEOUT_SECONDS;
-    private int readTimeout = PulsarAdminImpl.DEFAULT_READ_TIMEOUT_SECONDS;
-    private int requestTimeout = PulsarAdminImpl.DEFAULT_REQUEST_TIMEOUT_SECONDS;
-    private int autoCertRefreshTime = PulsarAdminImpl.DEFAULT_CERT_REFRESH_SECONDS;
-    private TimeUnit connectTimeoutUnit = TimeUnit.SECONDS;
-    private TimeUnit readTimeoutUnit = TimeUnit.SECONDS;
-    private TimeUnit requestTimeoutUnit = TimeUnit.SECONDS;
-    private TimeUnit autoCertRefreshTimeUnit = TimeUnit.SECONDS;
+
     private ClassLoader clientBuilderClassLoader = null;
 
     @Override
     public PulsarAdmin build() throws PulsarClientException {
-        return new PulsarAdminImpl(conf.getServiceUrl(), conf, connectTimeout, connectTimeoutUnit, readTimeout,
-                readTimeoutUnit, requestTimeout, requestTimeoutUnit, autoCertRefreshTime,
-                autoCertRefreshTimeUnit, clientBuilderClassLoader);
+        return new PulsarAdminImpl(conf.getServiceUrl(), conf, clientBuilderClassLoader);
     }
 
     public PulsarAdminBuilderImpl() {
@@ -187,29 +178,25 @@ public PulsarAdminBuilder tlsProtocols(Set tlsProtocols) {
 
     @Override
     public PulsarAdminBuilder connectionTimeout(int connectionTimeout, TimeUnit connectionTimeoutUnit) {
-        this.connectTimeout = connectionTimeout;
-        this.connectTimeoutUnit = connectionTimeoutUnit;
+        this.conf.setConnectionTimeoutMs((int) connectionTimeoutUnit.toMillis(connectionTimeout));
         return this;
     }
 
     @Override
     public PulsarAdminBuilder readTimeout(int readTimeout, TimeUnit readTimeoutUnit) {
-        this.readTimeout = readTimeout;
-        this.readTimeoutUnit = readTimeoutUnit;
+        this.conf.setReadTimeoutMs((int) readTimeoutUnit.toMillis(readTimeout));
         return this;
     }
 
     @Override
     public PulsarAdminBuilder requestTimeout(int requestTimeout, TimeUnit requestTimeoutUnit) {
-        this.requestTimeout = requestTimeout;
-        this.requestTimeoutUnit = requestTimeoutUnit;
+        this.conf.setRequestTimeoutMs((int) requestTimeoutUnit.toMillis(requestTimeout));
         return this;
     }
 
     @Override
     public PulsarAdminBuilder autoCertRefreshTime(int autoCertRefreshTime, TimeUnit autoCertRefreshTimeUnit) {
-        this.autoCertRefreshTime = autoCertRefreshTime;
-        this.autoCertRefreshTimeUnit = autoCertRefreshTimeUnit;
+        this.conf.setAutoCertRefreshSeconds((int) autoCertRefreshTimeUnit.toSeconds(autoCertRefreshTime));
         return this;
     }
 
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminImpl.java
index dbfaf9af7619f..5c04596da7554 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -73,10 +73,7 @@
 public class PulsarAdminImpl implements PulsarAdmin {
     private static final Logger LOG = LoggerFactory.getLogger(PulsarAdmin.class);
 
-    public static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 60;
-    public static final int DEFAULT_READ_TIMEOUT_SECONDS = 60;
     public static final int DEFAULT_REQUEST_TIMEOUT_SECONDS = 300;
-    public static final int DEFAULT_CERT_REFRESH_SECONDS = 300;
 
     private final Clusters clusters;
     private final Brokers brokers;
@@ -106,38 +103,11 @@ public class PulsarAdminImpl implements PulsarAdmin {
     private final Transactions transactions;
     protected final WebTarget root;
     protected final Authentication auth;
-    private final int connectTimeout;
-    private final TimeUnit connectTimeoutUnit;
-    private final int readTimeout;
-    private final TimeUnit readTimeoutUnit;
-    private final int requestTimeout;
-    private final TimeUnit requestTimeoutUnit;
-
-    public PulsarAdminImpl(String serviceUrl, ClientConfigurationData clientConfigData) throws PulsarClientException {
-        this(serviceUrl, clientConfigData, DEFAULT_CONNECT_TIMEOUT_SECONDS, TimeUnit.SECONDS,
-                DEFAULT_READ_TIMEOUT_SECONDS, TimeUnit.SECONDS, DEFAULT_REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS,
-                DEFAULT_CERT_REFRESH_SECONDS, TimeUnit.SECONDS, null);
-    }
-
-    public PulsarAdminImpl(String serviceUrl,
-                       ClientConfigurationData clientConfigData,
-                       int connectTimeout,
-                       TimeUnit connectTimeoutUnit,
-                       int readTimeout,
-                       TimeUnit readTimeoutUnit,
-                       int requestTimeout,
-                       TimeUnit requestTimeoutUnit,
-                       int autoCertRefreshTime,
-                       TimeUnit autoCertRefreshTimeUnit,
-                       ClassLoader clientBuilderClassLoader) throws PulsarClientException {
+
+    public PulsarAdminImpl(String serviceUrl, ClientConfigurationData clientConfigData,
+                           ClassLoader clientBuilderClassLoader) throws PulsarClientException {
         checkArgument(StringUtils.isNotBlank(serviceUrl), "Service URL needs to be specified");
 
-        this.connectTimeout = connectTimeout;
-        this.connectTimeoutUnit = connectTimeoutUnit;
-        this.readTimeout = readTimeout;
-        this.readTimeoutUnit = readTimeoutUnit;
-        this.requestTimeout = requestTimeout;
-        this.requestTimeoutUnit = requestTimeoutUnit;
         this.clientConfigData = clientConfigData;
         this.auth = clientConfigData != null ? clientConfigData.getAuthentication() : new AuthenticationDisabled();
         LOG.debug("created: serviceUrl={}, authMethodName={}", serviceUrl,
@@ -152,7 +122,7 @@ public PulsarAdminImpl(String serviceUrl,
         }
 
         AsyncHttpConnectorProvider asyncConnectorProvider = new AsyncHttpConnectorProvider(clientConfigData,
-                (int) autoCertRefreshTimeUnit.toSeconds(autoCertRefreshTime));
+                clientConfigData.getAutoCertRefreshSeconds());
 
         ClientConfig httpConfig = new ClientConfig();
         httpConfig.property(ClientProperties.FOLLOW_REDIRECTS, true);
@@ -168,8 +138,8 @@ public PulsarAdminImpl(String serviceUrl,
 
         ClientBuilder clientBuilder = ClientBuilder.newBuilder()
                 .withConfig(httpConfig)
-                .connectTimeout(this.connectTimeout, this.connectTimeoutUnit)
-                .readTimeout(this.readTimeout, this.readTimeoutUnit)
+                .connectTimeout(this.clientConfigData.getConnectionTimeoutMs(), TimeUnit.MILLISECONDS)
+                .readTimeout(this.clientConfigData.getReadTimeoutMs(), TimeUnit.MILLISECONDS)
                 .register(JacksonConfigurator.class).register(JacksonFeature.class);
 
         boolean useTls = clientConfigData.getServiceUrl().startsWith("https://");
@@ -181,12 +151,12 @@ public PulsarAdminImpl(String serviceUrl,
         root = client.target(serviceUri.selectOne());
 
         this.asyncHttpConnector = asyncConnectorProvider.getConnector(
-                Math.toIntExact(connectTimeoutUnit.toMillis(this.connectTimeout)),
-                Math.toIntExact(readTimeoutUnit.toMillis(this.readTimeout)),
-                Math.toIntExact(requestTimeoutUnit.toMillis(this.requestTimeout)),
-                (int) autoCertRefreshTimeUnit.toSeconds(autoCertRefreshTime));
+                Math.toIntExact(clientConfigData.getConnectionTimeoutMs()),
+                Math.toIntExact(clientConfigData.getReadTimeoutMs()),
+                Math.toIntExact(clientConfigData.getRequestTimeoutMs()),
+                clientConfigData.getAutoCertRefreshSeconds());
 
-        long readTimeoutMs = readTimeoutUnit.toMillis(this.readTimeout);
+        long readTimeoutMs = clientConfigData.getReadTimeoutMs();
         this.clusters = new ClustersImpl(root, auth, readTimeoutMs);
         this.brokers = new BrokersImpl(root, auth, readTimeoutMs);
         this.brokerStats = new BrokerStatsImpl(root, auth, readTimeoutMs);
@@ -228,7 +198,7 @@ public PulsarAdminImpl(String serviceUrl,
      */
     @Deprecated
     public PulsarAdminImpl(URL serviceUrl, Authentication auth) throws PulsarClientException {
-        this(serviceUrl.toString(), getConfigData(auth));
+        this(serviceUrl.toString(), getConfigData(auth), null);
     }
 
     private static ClientConfigurationData getConfigData(Authentication auth) {
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceGroupsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceGroupsImpl.java
index 99d60bcf25991..a8cef60232fc0 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceGroupsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceGroupsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceQuotasImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceQuotasImpl.java
index 7ab917a85320c..1e80c9eda94a5 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceQuotasImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/ResourceQuotasImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SchemasImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SchemasImpl.java
index 4920cadf608aa..593eb67fc0dc3 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SchemasImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SchemasImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SinksImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SinksImpl.java
index 9e110b018e2b5..5aecbb8e2da3a 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SinksImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SinksImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SourcesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SourcesImpl.java
index ac1243f0b6935..7a993d4936835 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SourcesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/SourcesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TenantsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TenantsImpl.java
index 37fd2ba753b0c..9b70e39ec4986 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TenantsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TenantsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java
index 821a4e13e18da..915b22a25898a 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicPoliciesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -30,6 +30,7 @@
 import org.apache.pulsar.client.api.Authentication;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride;
 import org.apache.pulsar.common.policies.data.BacklogQuota;
 import org.apache.pulsar.common.policies.data.BacklogQuota.BacklogQuotaType;
 import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
@@ -1217,6 +1218,48 @@ public CompletableFuture removeEntryFiltersPerTopicAsync(String topic) {
         return asyncDeleteRequest(path);
     }
 
+    @Override
+    public void setAutoSubscriptionCreation(
+            String topic, AutoSubscriptionCreationOverride autoSubscriptionCreationOverride)
+            throws PulsarAdminException {
+        sync(() -> setAutoSubscriptionCreationAsync(topic, autoSubscriptionCreationOverride));
+    }
+
+    @Override
+    public CompletableFuture setAutoSubscriptionCreationAsync(
+            String topic, AutoSubscriptionCreationOverride autoSubscriptionCreationOverride) {
+        TopicName tn = validateTopic(topic);
+        WebTarget path = topicPath(tn, "autoSubscriptionCreation");
+        return asyncPostRequest(path, Entity.entity(autoSubscriptionCreationOverride, MediaType.APPLICATION_JSON));
+    }
+
+    @Override
+    public AutoSubscriptionCreationOverride getAutoSubscriptionCreation(String topic,
+                                                                        boolean applied) throws PulsarAdminException {
+        return sync(() -> getAutoSubscriptionCreationAsync(topic, applied));
+    }
+
+    @Override
+    public CompletableFuture getAutoSubscriptionCreationAsync(String topic,
+                                                                                                boolean applied) {
+        TopicName tn = validateTopic(topic);
+        WebTarget path = topicPath(tn, "autoSubscriptionCreation");
+        path = path.queryParam("applied", applied);
+        return asyncGetRequest(path, new FutureCallback() {});
+    }
+
+    @Override
+    public void removeAutoSubscriptionCreation(String topic) throws PulsarAdminException {
+        sync(() -> removeAutoSubscriptionCreationAsync(topic));
+    }
+
+    @Override
+    public CompletableFuture removeAutoSubscriptionCreationAsync(String topic) {
+        TopicName tn = validateTopic(topic);
+        WebTarget path = topicPath(tn, "autoSubscriptionCreation");
+        return asyncDeleteRequest(path);
+    }
+
     /*
      * returns topic name with encoded Local Name
      */
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
index 4312080ac2233..3b50737ffc027 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TransactionsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TransactionsImpl.java
index 6af80344287cf..5693ebc8f60aa 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TransactionsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TransactionsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,6 +19,7 @@
 package org.apache.pulsar.client.admin.internal;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -31,6 +32,7 @@
 import org.apache.pulsar.client.api.transaction.TxnID;
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.policies.data.TransactionBufferStats;
+import org.apache.pulsar.common.policies.data.TransactionCoordinatorInfo;
 import org.apache.pulsar.common.policies.data.TransactionCoordinatorInternalStats;
 import org.apache.pulsar.common.policies.data.TransactionCoordinatorStats;
 import org.apache.pulsar.common.policies.data.TransactionInBufferStats;
@@ -48,6 +50,17 @@ public TransactionsImpl(WebTarget web, Authentication auth, long readTimeoutMs)
         adminV3Transactions = web.path("/admin/v3/transactions");
     }
 
+    @Override
+    public List listTransactionCoordinators() throws PulsarAdminException {
+        return sync(() -> listTransactionCoordinatorsAsync());
+    }
+
+    @Override
+    public CompletableFuture> listTransactionCoordinatorsAsync() {
+        WebTarget path = adminV3Transactions.path("coordinators");
+        return asyncGetRequest(path, new FutureCallback>(){});
+    }
+
     @Override
     public CompletableFuture getCoordinatorStatsByIdAsync(int coordinatorId) {
         WebTarget path = adminV3Transactions.path("coordinatorStats");
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
index f5469b8093821..29da42ce54d4a 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java
index 2e57ee9710a4d..60b1226d5817e 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
index ea00930e54650..318c404282a94 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnectorProvider.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnectorProvider.java
index c73bdfd3f0266..4467f77d1f993 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnectorProvider.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnectorProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/package-info.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/package-info.java
index dd4ae1d075372..aec70be74dfb1 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/package-info.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/package-info.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/package-info.java
index 57178962f7938..3da16a25b6846 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/package-info.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/package-info.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/package-info.java
index 718606be4837c..de1ca87bcb3dd 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/package-info.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImplTest.java b/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImplTest.java
index 1ea45401eec76..54a53236033c9 100644
--- a/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImplTest.java
+++ b/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,8 +21,13 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminBuilder;
 import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
+import org.testng.Assert;
 import org.testng.annotations.Test;
+import java.util.HashMap;
+import java.util.Map;
 
 public class PulsarAdminBuilderImplTest {
 
@@ -35,4 +40,21 @@ public void testAdminBuilderWithServiceUrlNotSet() throws PulsarClientException
             assertEquals("Service URL needs to be specified", exception.getMessage());
         }
     }
+
+    @Test
+    public void testGetPropertiesFromConf() throws Exception {
+        Map config = new HashMap<>();
+        config.put("serviceUrl", "pulsar://localhost:6650");
+        config.put("requestTimeoutMs", 10);
+        config.put("autoCertRefreshSeconds", 20);
+        config.put("connectionTimeoutMs", 30);
+        config.put("readTimeoutMs", 40);
+        PulsarAdminBuilder adminBuilder = PulsarAdmin.builder().loadConf(config);
+        PulsarAdminImpl admin = (PulsarAdminImpl) adminBuilder.build();
+        ClientConfigurationData clientConfigData = admin.getClientConfigData();
+        Assert.assertEquals(clientConfigData.getRequestTimeoutMs(), 10);
+        Assert.assertEquals(clientConfigData.getAutoCertRefreshSeconds(), 20);
+        Assert.assertEquals(clientConfigData.getConnectionTimeoutMs(), 30);
+        Assert.assertEquals(clientConfigData.getReadTimeoutMs(), 40);
+    }
 }
diff --git a/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/SinksImplTest.java b/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/SinksImplTest.java
index 61afa5e403f87..50729fb15a28f 100644
--- a/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/SinksImplTest.java
+++ b/pulsar-client-admin/src/test/java/org/apache/pulsar/client/admin/internal/SinksImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index 1adaafbb90dff..7c7b2ed7f80f0 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -176,6 +176,7 @@
                   io.perfmark:*
                   com.yahoo.datasketches:*
                   io.netty:*
+                  io.netty.incubator:*
                   com.squareup.*:*
                   com.google.*:*
                   commons-*:*
@@ -411,6 +412,9 @@
               
                 
                   ${pulsar.client.compiler.release}
+                  
+                    test
+                  
                 
               
             
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Authentication.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Authentication.java
index 68edd3ae07d36..9bf1b24cbdb32 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Authentication.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Authentication.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationDataProvider.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationDataProvider.java
index c0155fe66c05f..27c7a1d4edb4f 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationDataProvider.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationDataProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationFactory.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationFactory.java
index cddb265eae938..5a75de572cc14 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationFactory.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AuthenticationFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AutoClusterFailoverBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AutoClusterFailoverBuilder.java
index f3c1de2227e36..ce86cf29f345b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AutoClusterFailoverBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/AutoClusterFailoverBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchMessageContainer.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchMessageContainer.java
index 31e9af5b946c6..03357d9e67518 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchMessageContainer.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchMessageContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -54,6 +54,12 @@ public interface BatchMessageContainer {
      */
     long getCurrentBatchSize();
 
+    /**
+     * Get current allocated buffer size of the message batch container in bytes.
+     * @return allocated buffer size in bytes
+     */
+    int getBatchAllocatedSizeBytes();
+
     /**
      * Release the payload and clear the container.
      *
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchReceivePolicy.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchReceivePolicy.java
index 548916034d5c6..6f1cafa31af09 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchReceivePolicy.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatchReceivePolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatcherBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatcherBuilder.java
index ba692066693b4..a3f37bb69b295 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatcherBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/BatcherBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
index 17852bc545dc0..8f2813ed14fff 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CompressionType.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CompressionType.java
index d3abd64f1c544..127b100ef70b0 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CompressionType.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CompressionType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Consumer.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Consumer.java
index be267982b23a4..3fbab236a60ee 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Consumer.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Consumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,12 +19,10 @@
 package org.apache.pulsar.client.api;
 
 import java.io.Closeable;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import org.apache.pulsar.client.api.transaction.Transaction;
 import org.apache.pulsar.common.classification.InterfaceAudience;
 import org.apache.pulsar.common.classification.InterfaceStability;
 
@@ -35,7 +33,7 @@
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
-public interface Consumer extends Closeable {
+public interface Consumer extends Closeable, MessageAcknowledger {
 
     /**
      * Get a topic for the consumer.
@@ -156,42 +154,6 @@ public interface Consumer extends Closeable {
      */
     CompletableFuture> batchReceiveAsync();
 
-    /**
-     * Acknowledge the consumption of a single message.
-     *
-     * @param message
-     *            The {@code Message} to be acknowledged
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     */
-    void acknowledge(Message message) throws PulsarClientException;
-
-    /**
-     * Acknowledge the consumption of a single message, identified by its {@link MessageId}.
-     *
-     * @param messageId
-     *            The {@link MessageId} to be acknowledged
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     */
-    void acknowledge(MessageId messageId) throws PulsarClientException;
-
-    /**
-     * Acknowledge the consumption of {@link Messages}.
-     *
-     * @param messages messages
-     * @throws PulsarClientException.AlreadyClosedException
-     *              if the consumer was already closed
-     */
-    void acknowledge(Messages messages) throws PulsarClientException;
-
-    /**
-     * Acknowledge the consumption of a list of message.
-     * @param messageIdList
-     * @throws PulsarClientException
-     */
-    void acknowledge(List messageIdList) throws PulsarClientException;
-
     /**
      * Acknowledge the failure to process a single message.
      *
@@ -356,78 +318,6 @@ void reconsumeLater(Message message,
      */
     void reconsumeLater(Messages messages, long delayTime, TimeUnit unit) throws PulsarClientException;
 
-    /**
-     * Acknowledge the reception of all the messages in the stream up to (and including) the provided message.
-     *
-     * 
This method will block until the acknowledge has been sent to the broker. After that, the messages will not be
-     * re-delivered to this consumer.
-     *
-     * 
Cumulative acknowledge cannot be used when the consumer type is set to ConsumerShared.
-     *
-     * 
It's equivalent to calling asyncAcknowledgeCumulative(Message) and waiting for the callback to be triggered.
-     *
-     * @param message
-     *            The {@code Message} to be cumulatively acknowledged
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     */
-    void acknowledgeCumulative(Message message) throws PulsarClientException;
-
-    /**
-     * Acknowledge the reception of all the messages in the stream up to (and including) the provided message.
-     *
-     * 
This method will block until the acknowledge has been sent to the broker. After that, the messages will not be
-     * re-delivered to this consumer.
-     *
-     * 
Cumulative acknowledge cannot be used when the consumer type is set to ConsumerShared.
-     *
-     * 
It's equivalent to calling asyncAcknowledgeCumulative(MessageId) and waiting for the callback to be triggered.
-     *
-     * @param messageId
-     *            The {@code MessageId} to be cumulatively acknowledged
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     */
-    void acknowledgeCumulative(MessageId messageId) throws PulsarClientException;
-
-    /**
-     * Acknowledge the reception of all the messages in the stream up to (and including) the provided message with this
-     * transaction, it will store in transaction pending ack.
-     *
-     * 
After the transaction commit, the end of previous transaction acked message until this transaction
-     * acked message will actually ack.
-     *
-     * 
After the transaction abort, the end of previous transaction acked message until this transaction
-     * acked message will be redelivered to this consumer.
-     *
-     * 
Cumulative acknowledge with transaction only support cumulative ack and now have not support individual and
-     * cumulative ack sharing.
-     *
-     * 
If cumulative ack with a transaction success, we can cumulative ack messageId with the same transaction
-     * more than previous messageId.
-     *
-     * 
It will not be allowed to cumulative ack with a transaction different from the previous one when the previous
-     * transaction haven't commit or abort.
-     *
-     * 
Cumulative acknowledge cannot be used when the consumer type is set to ConsumerShared.
-     *
-     * @param messageId
-     *            The {@code MessageId} to be cumulatively acknowledged
-     * @param txn {@link Transaction} the transaction to cumulative ack
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     * @throws org.apache.pulsar.client.api.PulsarClientException.TransactionConflictException
-     *             if the ack with messageId is less than the messageId in pending ack state or ack with transaction is
-     *             different from the transaction in pending ack.
-     * @throws org.apache.pulsar.client.api.PulsarClientException.NotAllowedException
-     *             broker don't support transaction
-     * @return {@link CompletableFuture} the future of the ack result
-     *
-     * @since 2.7.0
-     */
-    CompletableFuture acknowledgeCumulativeAsync(MessageId messageId,
-                                                       Transaction txn);
-
     /**
      * reconsumeLater the reception of all the messages in the stream up to (and including) the provided message.
      *
@@ -442,98 +332,6 @@ CompletableFuture acknowledgeCumulativeAsync(MessageId messageId,
      */
     void reconsumeLaterCumulative(Message message, long delayTime, TimeUnit unit) throws PulsarClientException;
 
-    /**
-     * Asynchronously acknowledge the consumption of a single message.
-     *
-     * @param message
-     *            The {@code Message} to be acknowledged
-     * @return a future that can be used to track the completion of the operation
-     */
-    CompletableFuture acknowledgeAsync(Message message);
-
-    /**
-     * Asynchronously acknowledge the consumption of a single message.
-     *
-     * @param messageId
-     *            The {@code MessageId} to be acknowledged
-     * @return a future that can be used to track the completion of the operation
-     */
-    CompletableFuture acknowledgeAsync(MessageId messageId);
-
-    /**
-     * Asynchronously acknowledge the consumption of a single message, it will store in pending ack.
-     *
-     * 
After the transaction commit, the message will actually ack.
-     *
-     * 
After the transaction abort, the message will be redelivered.
-     *
-     * @param messageId {@link MessageId} to be individual acknowledged
-     * @param txn {@link Transaction} the transaction to cumulative ack
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     * @throws org.apache.pulsar.client.api.PulsarClientException.TransactionConflictException
-     *             if the ack with messageId has been acked by another transaction
-     * @throws org.apache.pulsar.client.api.PulsarClientException.NotAllowedException
-     *             broker don't support transaction
-     *             don't find batch size in consumer pending ack
-     * @return {@link CompletableFuture} the future of the ack result
-     *
-     * @since 2.7.0
-     */
-    CompletableFuture acknowledgeAsync(MessageId messageId, Transaction txn);
-
-    /**
-     * Asynchronously acknowledge the consumption of {@link Messages}.
-     *
-     * @param messages
-     *            The {@link Messages} to be acknowledged
-     * @return a future that can be used to track the completion of the operation
-     */
-    CompletableFuture acknowledgeAsync(Messages messages);
-
-
-    /**
-     * Asynchronously acknowledge the consumption of {@link Messages}, it will store in pending ack.
-     * After the transaction commit, the message will actually ack.
-     * After the transaction abort, the message will be redelivered.
-     * @param messages
-     *            The {@link Messages} to be acknowledged
-     * @param txn {@link Transaction} The transaction to ack messages.
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     * @throws org.apache.pulsar.client.api.PulsarClientException.TransactionConflictException
-     *             if the ack with messageId is less than the messageId in pending ack state or ack with transaction is
-     *             different from the transaction in pending ack.
-     * @throws org.apache.pulsar.client.api.PulsarClientException.NotAllowedException
-     *             broker don't support transaction
-     * @return {@link CompletableFuture} the future of the ack result
-     * */
-    CompletableFuture acknowledgeAsync(Messages messages, Transaction txn);
-
-
-    /**
-     * Asynchronously acknowledge the consumption of a list of message.
-     * @param messageIdList
-     * @return
-     */
-    CompletableFuture acknowledgeAsync(List messageIdList);
-
-
-    /**
-     * Acknowledge the consumption of a list of message, it will store in pending ack.
-     * After the transaction commit, the message will actually ack.
-     * After the transaction abort, the message will be redelivered.
-     * @param messageIdList A list of message Id.
-     * @param txn {@link Transaction} The transaction to ack messages.
-     * @throws PulsarClientException.AlreadyClosedException
-     *             if the consumer was already closed
-     * @throws org.apache.pulsar.client.api.PulsarClientException.TransactionConflictException
-     *             if the ack with messageId is less than the messageId in pending ack state or ack with transaction is
-     *             different from the transaction in pending ack.
-     * @throws org.apache.pulsar.client.api.PulsarClientException.NotAllowedException
-     *             broker don't support transaction
-     * @return {@link CompletableFuture} the future of the ack result     */
-    CompletableFuture acknowledgeAsync(List messageIdList, Transaction txn);
 
     /**
      * Asynchronously reconsumeLater the consumption of a single message.
@@ -578,30 +376,6 @@ CompletableFuture reconsumeLaterAsync(Message message,
      */
     CompletableFuture reconsumeLaterAsync(Messages messages, long delayTime, TimeUnit unit);
 
-    /**
-     * Asynchronously Acknowledge the reception of all the messages in the stream up to (and including) the provided
-     * message.
-     *
-     * 
Cumulative acknowledge cannot be used when the consumer type is set to ConsumerShared.
-     *
-     * @param message
-     *            The {@code Message} to be cumulatively acknowledged
-     * @return a future that can be used to track the completion of the operation
-     */
-    CompletableFuture acknowledgeCumulativeAsync(Message message);
-
-    /**
-     * Asynchronously Acknowledge the reception of all the messages in the stream up to (and including) the provided
-     * message.
-     *
-     * 
Cumulative acknowledge cannot be used when the consumer type is set to ConsumerShared.
-     *
-     * @param messageId
-     *            The {@code MessageId} to be cumulatively acknowledged
-     * @return a future that can be used to track the completion of the operation
-     */
-    CompletableFuture acknowledgeCumulativeAsync(MessageId messageId);
-
     /**
      * Asynchronously ReconsumeLater the reception of all the messages in the stream up to (and including) the provided
      * message.
@@ -695,8 +469,7 @@ CompletableFuture reconsumeLaterCumulativeAsync(Message message,
      * 
  • MessageId.latest : Reset the subscription on the latest message in the topic
      * 
      *
-     * 
    Note: this operation can only be done on non-partitioned topics. For these, one can rather perform
-     * the seek() on the individual partitions.
+     * 
    Note: For multi-topics consumer, you can only seek to the earliest or latest message.
      *
      * @param messageId
      *            the message id where to reposition the subscription
@@ -752,8 +525,7 @@ CompletableFuture reconsumeLaterCumulativeAsync(Message message,
      * 
  • MessageId.latest : Reset the subscription on the latest message in the topic
      * 
      *
-     * 
    Note: this operation can only be done on non-partitioned topics. For these, one can rather perform
-     * the seek() on the individual partitions.
+     * 
    Note: For multi-topics consumer, you can only seek to the earliest or latest message.
      *
      * @param messageId
      *            the message id where to reposition the subscription
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
index 4806875e2f66f..86ff95626c6bb 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -378,6 +378,17 @@ public interface ConsumerBuilder extends Cloneable {
      */
     ConsumerBuilder acknowledgmentGroupTime(long delay, TimeUnit unit);
 
+    /**
+     * Group the consumer acknowledgments for the max size.
+     *
+     * 
    By default, the consumer uses at most 1000 messages to send out the acknowledgments to the broker.
+     *
+     * @param messageNum
+     *
+     * @return the consumer builder instance
+     */
+    ConsumerBuilder maxAcknowledgmentGroupSize(int messageNum);
+
     /**
      *
      * @param replicateSubscriptionState
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerCryptoFailureAction.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerCryptoFailureAction.java
index bfb2b8384c2d2..8dc7dbdc8d35c 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerCryptoFailureAction.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerCryptoFailureAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 import org.apache.pulsar.common.classification.InterfaceAudience;
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerEventListener.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerEventListener.java
index d81fe02913d09..4e315cfb5be6b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerEventListener.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerEventListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerInterceptor.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerInterceptor.java
index 4f96c98d4de1f..d6d91cd88500b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerInterceptor.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerStats.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerStats.java
index cd24c06c764b7..529101ecde39c 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerStats.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,6 +19,7 @@
 package org.apache.pulsar.client.api;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.Map;
 import org.apache.pulsar.common.classification.InterfaceAudience;
 import org.apache.pulsar.common.classification.InterfaceStability;
@@ -114,4 +115,11 @@ public interface ConsumerStats extends Serializable {
      * @return
      */
     Map getMsgNumInSubReceiverQueue();
+
+    /**
+     * @return stats for each partition if topic is partitioned topic
+     */
+    default Map getPartitionStats() {
+        return Collections.emptyMap();
+    }
 }
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ControlledClusterFailoverBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ControlledClusterFailoverBuilder.java
index 21f745bb8cdb8..c1d3d1148eb7b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ControlledClusterFailoverBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ControlledClusterFailoverBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CryptoKeyReader.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CryptoKeyReader.java
index f9cfa1cebc5d4..7e6a80805d2e1 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CryptoKeyReader.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/CryptoKeyReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java
index ed70ca31e2c68..f0b75ff57dd7b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/DeadLetterPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.java
index c381e04625107..0797869f5d230 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncryptionKeyInfo.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncryptionKeyInfo.java
index 256de3881a5e9..2025ece678df9 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncryptionKeyInfo.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/EncryptionKeyInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/HashingScheme.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/HashingScheme.java
index a705c994647d1..719b97cc992fc 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/HashingScheme.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/HashingScheme.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedMode.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedMode.java
index 67184de4f3354..910571389ec24 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedMode.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedPolicy.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedPolicy.java
index 67528c11967eb..f5bc5b846b6db 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedPolicy.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeySharedPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeyStoreParams.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeyStoreParams.java
index 5a2214f49686c..89d12e4369089 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeyStoreParams.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/KeyStoreParams.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java
index 079a42c63b357..e5876b849e1f5 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageAcknowledger.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageAcknowledger.java
new file mode 100644
index 0000000000000..c0a53983c5adb
--- /dev/null
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageAcknowledger.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.api;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import org.apache.pulsar.client.api.transaction.Transaction;
+
+/**
+ * The interface to acknowledge one or more messages individually or cumulatively.
+ * 
    
+ * It contains two methods of various overloads:
+ * - `acknowledge`: acknowledge individually
+ * - `acknowledgeCumulative`: acknowledge cumulatively
+ * Each of them has an associated asynchronous API that has the "Async" suffix in the name.
+ * 
    
+ * The 1st method parameter is
+ * - {@link MessageId} or {@link Message} when acknowledging a single message
+ * - {@link java.util.List} or {@link Messages} when acknowledging multiple messages
+ * 
    
+ * The 2nd method parameter is optional. Specify a non-null {@link Transaction} instance for transaction usages:
+ * - After the transaction is committed, the message will be actually acknowledged (individually or cumulatively).
+ * - After the transaction is aborted, the message will be redelivered.
+ * @see Transaction#commit()
+ * @see Transaction#abort()
+ */
+public interface MessageAcknowledger {
+
+    /**
+     * Acknowledge the consumption of a single message.
+     *
+     * @param messageId {@link MessageId} to be individual acknowledged
+     *
+     * @throws PulsarClientException.AlreadyClosedException}
+     *             if the consumer was already closed
+     */
+    void acknowledge(MessageId messageId) throws PulsarClientException;
+
+    default void acknowledge(Message message) throws PulsarClientException {
+        acknowledge(message.getMessageId());
+    }
+
+    /**
+     * Acknowledge the consumption of a list of message.
+     * @param messageIdList the list of message IDs.
+     */
+    void acknowledge(List messageIdList) throws PulsarClientException;
+
+    default void acknowledge(Messages messages) throws PulsarClientException {
+        for (Message message : messages) {
+            acknowledge(message.getMessageId());
+        }
+    }
+
+    /**
+     * Acknowledge the reception of all the messages in the stream up to (and including) the provided message.
+     *
+     * 
    This method will block until the acknowledge has been sent to the broker. After that, the messages will not be
+     * re-delivered to this consumer.
+     *
+     * 
    Cumulative acknowledge cannot be used when the consumer type is set to ConsumerShared.
+     *
+     * 
    It's equivalent to calling asyncAcknowledgeCumulative(MessageId) and waiting for the callback to be triggered.
+     *
+     * @param messageId
+     *            The {@code MessageId} to be cumulatively acknowledged
+     * @throws PulsarClientException.AlreadyClosedException
+     *             if the consumer was already closed
+     */
+    void acknowledgeCumulative(MessageId messageId) throws PulsarClientException;
+
+    default void acknowledgeCumulative(Message message) throws PulsarClientException {
+        acknowledgeCumulative(message.getMessageId());
+    }
+
+    /**
+     * The asynchronous version of {@link #acknowledge(MessageId)} with transaction support.
+     */
+    CompletableFuture acknowledgeAsync(MessageId messageId, Transaction txn);
+
+    /**
+     * The asynchronous version of {@link #acknowledge(MessageId)}.
+     */
+    default CompletableFuture acknowledgeAsync(MessageId messageId) {
+        return acknowledgeAsync(messageId, null);
+    }
+
+    /**
+     * The asynchronous version of {@link #acknowledge(List)} with transaction support.
+     */
+    CompletableFuture acknowledgeAsync(List messageIdList, Transaction txn);
+
+    /**
+     * The asynchronous version of {@link #acknowledge(List)}.
+     */
+    CompletableFuture acknowledgeAsync(List messageIdList);
+
+    /**
+     * The asynchronous version of {@link #acknowledge(Message)}.
+     */
+    CompletableFuture acknowledgeAsync(Message message);
+
+    /**
+     * The asynchronous version of {@link #acknowledge(Messages)}.
+     */
+    CompletableFuture acknowledgeAsync(Messages messages);
+
+    /**
+     * The asynchronous version of {@link #acknowledge(Messages)} with transaction support.
+     */
+    CompletableFuture acknowledgeAsync(Messages messages, Transaction txn);
+
+    /**
+     * The asynchronous version of {@link #acknowledgeCumulative(MessageId)} with transaction support.
+     *
+     * @apiNote It's not allowed to cumulative ack with a transaction different from the previous one when the previous
+     * transaction is not committed or aborted.
+     * @apiNote It cannot be used for {@link SubscriptionType#Shared} subscription.
+     *
+     * @param messageId
+     *            The {@code MessageId} to be cumulatively acknowledged
+     * @param txn {@link Transaction} the transaction to cumulative ack
+     */
+    CompletableFuture acknowledgeCumulativeAsync(MessageId messageId,
+                                                       Transaction txn);
+
+    /**
+     * The asynchronous version of {@link #acknowledgeCumulative(Message)}.
+     */
+    default CompletableFuture acknowledgeCumulativeAsync(Message message) {
+        return acknowledgeCumulativeAsync(message.getMessageId());
+    }
+
+    /**
+     * The asynchronous version of {@link #acknowledgeCumulative(MessageId)}.
+     */
+    default CompletableFuture acknowledgeCumulativeAsync(MessageId messageId) {
+        return acknowledgeCumulativeAsync(messageId, null);
+    }
+}
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageCrypto.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageCrypto.java
index 6953491eb9f22..f3b88e0304986 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageCrypto.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageCrypto.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageId.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageId.java
index a8783dc39f9ab..883c1c12f8f66 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageId.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageId.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageListener.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageListener.java
index e77363053cc90..11aaeb77f00dc 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageListener.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayload.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayload.java
index 5d2ff6361f69f..c264596938c2e 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayload.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayload.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadContext.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadContext.java
index a444de724166f..2999837c0f783 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadContext.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadFactory.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadFactory.java
index 0181d6dbd2942..d1b2ff6bc60a5 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadFactory.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadProcessor.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadProcessor.java
index 1d50a50627942..a108f51987b64 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadProcessor.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessagePayloadProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRouter.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRouter.java
index 616f0f569bcc0..0f328d843a9a0 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRouter.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRouter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRoutingMode.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRoutingMode.java
index 4f66647645163..17bb832ac9d62 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRoutingMode.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MessageRoutingMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Messages.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Messages.java
index 82b8c404723de..70b7e22bc6f3b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Messages.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Messages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MultiTopicConsumerStats.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MultiTopicConsumerStats.java
new file mode 100644
index 0000000000000..e1c1d3372c391
--- /dev/null
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/MultiTopicConsumerStats.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.api;
+
+import java.util.Map;
+import org.apache.pulsar.common.classification.InterfaceAudience;
+import org.apache.pulsar.common.classification.InterfaceStability;
+
+/**
+ * Multi-topic Consumer statistics recorded by client.
+ *
+ * 
    All the stats are relative to the last recording period. The interval of the stats refreshes is configured with
+ * {@link ClientBuilder#statsInterval(long, java.util.concurrent.TimeUnit)} with a default of 1 minute.
+ */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
+public interface MultiTopicConsumerStats extends ConsumerStats {
+
+    /**
+     * @return stats for each partition if topic is partitioned topic
+     */
+    Map getPartitionStats();
+}
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PartitionedTopicProducerStats.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PartitionedTopicProducerStats.java
new file mode 100644
index 0000000000000..5fd3c1f34a0e0
--- /dev/null
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PartitionedTopicProducerStats.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.api;
+
+import java.util.Map;
+import org.apache.pulsar.common.classification.InterfaceAudience;
+import org.apache.pulsar.common.classification.InterfaceStability;
+
+/**
+ * Partitioned topic Producer statistics recorded by client.
+ *
+ * 
    All the stats are relative to the last recording period. The interval of the stats refreshes is configured with
+ * {@link ClientBuilder#statsInterval(long, java.util.concurrent.TimeUnit)} with a default of 1 minute.
+ */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
+public interface PartitionedTopicProducerStats extends ProducerStats {
+
+    /**
+     * @return stats for each partition if topic is partitioned topic
+     */
+    Map getPartitionStats();
+
+}
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Producer.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Producer.java
index 590e0256ee7f0..4cf3d6b81642b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Producer.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Producer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerAccessMode.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerAccessMode.java
index 33492802d161b..eb6da1e4fdee9 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerAccessMode.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerAccessMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 /**
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilder.java
index d1778685f84c1..c67dc039f99a3 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerCryptoFailureAction.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerCryptoFailureAction.java
index 3612d282c2ad7..b60f1b54f99cc 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerCryptoFailureAction.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerCryptoFailureAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 import org.apache.pulsar.common.classification.InterfaceAudience;
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerInterceptor.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerInterceptor.java
index 094638d0b2f90..4989e80cf4b96 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerInterceptor.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerStats.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerStats.java
index de028cddab460..a26c20e740d37 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerStats.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,6 +19,8 @@
 package org.apache.pulsar.client.api;
 
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
 import org.apache.pulsar.common.classification.InterfaceAudience;
 import org.apache.pulsar.common.classification.InterfaceStability;
 
@@ -116,4 +118,10 @@ public interface ProducerStats extends Serializable {
      */
     int getPendingQueueSize();
 
+    /**
+     * @return stats for each partition if topic is partitioned topic
+     */
+    default Map getPartitionStats() {
+        return Collections.emptyMap();
+    }
 }
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProxyProtocol.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProxyProtocol.java
index ec4c706e9a645..c0f704625e23c 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProxyProtocol.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProxyProtocol.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClient.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClient.java
index 83097f6872136..05a21fa1585bf 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClient.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
index e04d150597768..9409eefe2e0f0 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Range.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Range.java
index 96eaee7cde617..4437ffc4ac6a2 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Range.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Range.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Reader.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Reader.java
index ba50883f0efc0..419a759f118ba 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Reader.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Reader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderBuilder.java
index f9ca85cd45f79..7241bd4cf4ff8 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderInterceptor.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderInterceptor.java
index 1a2d25b83b2b7..3a2e93d9c35ad 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderInterceptor.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderListener.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderListener.java
index 9c0d0b49a2938..b36c7513a72f8 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderListener.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ReaderListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RedeliveryBackoff.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RedeliveryBackoff.java
index 770caa0d3e43a..61ee5d272d179 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RedeliveryBackoff.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RedeliveryBackoff.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RegexSubscriptionMode.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RegexSubscriptionMode.java
index bfec0941353b9..53dfe2e6f18aa 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RegexSubscriptionMode.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/RegexSubscriptionMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Schema.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Schema.java
index e1cbb62975753..ef1e0cc1feade 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Schema.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Schema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -384,10 +384,12 @@ static  Schema> KeyValue(Class key, Class value) {
     }
 
     /**
-     * Key Value Schema using passed in key and value schemas.
+     * Key Value Schema using passed in key and value schemas with {@link KeyValueEncodingType#INLINE} encoding type.
+     *
+     * @see Schema#KeyValue(Schema, Schema, KeyValueEncodingType)
      */
     static  Schema> KeyValue(Schema key, Schema value) {
-        return DefaultImplementation.getDefaultImplementation().newKeyValueSchema(key, value);
+        return KeyValue(key, value, KeyValueEncodingType.INLINE);
     }
 
     /**
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SchemaSerializationException.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SchemaSerializationException.java
index e307807db114b..0c9b1cd21dd06 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SchemaSerializationException.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SchemaSerializationException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ServiceUrlProvider.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ServiceUrlProvider.java
index 3d3d799d2dc5b..5cb22276553ab 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ServiceUrlProvider.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ServiceUrlProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SizeUnit.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SizeUnit.java
index cc49ecf0e3a5d..13152e5f082de 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SizeUnit.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SizeUnit.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionInitialPosition.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionInitialPosition.java
index 3b7fa42d2838a..cacec08882d64 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionInitialPosition.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionInitialPosition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionMode.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionMode.java
index bead59013cbd3..5f4f0bfc79ede 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionMode.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionType.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionType.java
index 8371b99323e87..d910512d89284 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionType.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/SubscriptionType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableView.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableView.java
index 60676216cd486..136d8f5382304 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableView.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableView.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 import java.io.Closeable;
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableViewBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableViewBuilder.java
index 346f00267d578..7387b2ee37b58 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableViewBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TableViewBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.api;
 
 import java.util.Map;
@@ -92,4 +91,13 @@ public interface TableViewBuilder {
      * @return the {@link TableViewBuilder} builder instance
      */
     TableViewBuilder autoUpdatePartitionsInterval(int interval, TimeUnit unit);
+
+
+    /**
+     * Set the subscription name of the {@link TableView}.
+     *
+     * @param subscriptionName the name of the subscription to the topic
+     * @return the {@link TableViewBuilder} builder instance
+     */
+    TableViewBuilder subscriptionName(String subscriptionName);
 }
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicConsumerBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicConsumerBuilder.java
index 5096f52577625..cbf292c96545c 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicConsumerBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicConsumerBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicMetadata.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicMetadata.java
index 40e6c6bc00c0b..2614f10a00fba 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicMetadata.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TopicMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TypedMessageBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TypedMessageBuilder.java
index 7733d81c9fb8d..9fcbeb4d11264 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TypedMessageBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/TypedMessageBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptor.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptor.java
index 00a1cd908d271..d84b7578ed3af 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptor.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptorWrapper.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptorWrapper.java
index 6068a032650ea..d1f553cc5daab 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptorWrapper.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/ProducerInterceptorWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/package-info.java
index 9690150d857a5..c702effb0826b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/interceptor/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/package-info.java
index 9dff44d44864d..57896b5e27235 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/Field.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/Field.java
index 42439778ad092..98a03133cf995 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/Field.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/Field.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/FieldSchemaBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/FieldSchemaBuilder.java
index 8f12f4200a5df..bd240fc1d9b4f 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/FieldSchemaBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/FieldSchemaBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericObject.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericObject.java
index db6d9e8738bad..a47f5c3fd85cd 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericObject.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericObject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecord.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecord.java
index f83c01fa31310..e91aa16889207 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecord.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecordBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecordBuilder.java
index 8a08ca4e92bf2..8dcaa69aee42c 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecordBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericRecordBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericSchema.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericSchema.java
index f4ac7189b9eac..fcbb66d97753b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericSchema.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/GenericSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/KeyValueSchema.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/KeyValueSchema.java
index f21ecf41df0fe..b656236a7b333 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/KeyValueSchema.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/KeyValueSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/RecordSchemaBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/RecordSchemaBuilder.java
index dde445cba150d..74c3fecc72280 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/RecordSchemaBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/RecordSchemaBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaBuilder.java
index 8448757bc96b9..e845180dca034 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinition.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinition.java
index 88dd367060817..8a7bbbb0374ed 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinition.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinitionBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinitionBuilder.java
index 97d822b927d20..8543f80f7b163 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinitionBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaDefinitionBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaInfoProvider.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaInfoProvider.java
index 0b609fce250aa..876a0dbd0e4fa 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaInfoProvider.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaInfoProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaReader.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaReader.java
index 7afafde6fc0f5..34dced51fc4bc 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaReader.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaWriter.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaWriter.java
index 059b4c1c9ab7f..0e9763dc40291 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaWriter.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/SchemaWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/package-info.java
index ee69e451d74fb..2357e83e55880 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/Transaction.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/Transaction.java
index 33e96d5c2764d..0af32623cbb19 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/Transaction.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/Transaction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClient.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClient.java
index d35f8be73ea8c..befd26fc8922f 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClient.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClientException.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClientException.java
index b70cc29b34ed3..617689f49057b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClientException.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBufferClientException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBuilder.java
index ff3025ff4a136..7d9a07f122b33 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClient.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClient.java
index 82d0aa4a852bb..923f47e69cab5 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClient.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClientException.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClientException.java
index cdf8c583c8c9d..7c3b9027c71f6 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClientException.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TransactionCoordinatorClientException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TxnID.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TxnID.java
index d503abeafc239..772c709bfc07c 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TxnID.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TxnID.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,7 +20,9 @@
 
 import java.io.Serializable;
 import java.util.Objects;
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
 import org.apache.pulsar.common.classification.InterfaceAudience;
 import org.apache.pulsar.common.classification.InterfaceStability;
 
@@ -48,22 +50,35 @@ public class TxnID implements Serializable {
      */
     private final long leastSigBits;
 
+    @Getter(AccessLevel.NONE)
+    private final transient int hashCode;
+
+    @Getter(AccessLevel.NONE)
+    private final transient String txnStr;
+
+    public TxnID(long mostSigBits, long leastSigBits) {
+        this.mostSigBits = mostSigBits;
+        this.leastSigBits = leastSigBits;
+        this.hashCode = Objects.hash(mostSigBits, leastSigBits);
+        this.txnStr = "(" + mostSigBits + "," + leastSigBits + ")";
+    }
+
     @Override
     public String toString() {
-        return "(" + mostSigBits + "," + leastSigBits + ")";
+        return txnStr;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(mostSigBits, leastSigBits);
+        return hashCode;
     }
 
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof TxnID) {
             TxnID other = (TxnID) obj;
-            return Objects.equals(mostSigBits, other.mostSigBits)
-                    && Objects.equals(leastSigBits, other.leastSigBits);
+            return mostSigBits == other.mostSigBits
+                    && leastSigBits == other.leastSigBits;
         }
 
         return false;
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/package-info.java
index 4f450acedd972..654030bf57460 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/DefaultImplementation.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/DefaultImplementation.java
index 76e4367fc19f7..dd678b2304158 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/DefaultImplementation.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/DefaultImplementation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PropertiesUtils.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PropertiesUtils.java
index 4a418b1d5158e..f0c44b82fa7b1 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PropertiesUtils.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PropertiesUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PulsarClientImplementationBinding.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PulsarClientImplementationBinding.java
index da85d3645be64..875a793023523 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PulsarClientImplementationBinding.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/PulsarClientImplementationBinding.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -131,8 +131,6 @@  Schema newProtobufNativeSc
 
     Schema> newKeyValueBytesSchema();
 
-     Schema> newKeyValueSchema(Schema keySchema, Schema valueSchema);
-
      Schema> newKeyValueSchema(Schema keySchema, Schema valueSchema,
                                                            KeyValueEncodingType keyValueEncodingType);
 
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/ReflectionUtils.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/ReflectionUtils.java
index c33f1f1fdb7a9..59ced1a32032a 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/ReflectionUtils.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/ReflectionUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/package-info.java
index 142ee91677950..1747e24e6fe3d 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/internal/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/AuthData.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/AuthData.java
index f3c6ccf286a0a..18328a7d1cb56 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/AuthData.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/AuthData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/EncryptionContext.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/EncryptionContext.java
index 0ae120b9cb926..1d5ef7e81c3d9 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/EncryptionContext.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/EncryptionContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/package-info.java
index b2fcb7f4a6733..e5efc7b6cde26 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceAudience.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceAudience.java
index 296b8060300b4..e09b66da9d19b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceAudience.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceAudience.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceStability.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceStability.java
index 6428be979637e..07bd695f751ca 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceStability.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/InterfaceStability.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/package-info.java
index d2fa221cc61b6..645fbb49d0eef 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/classification/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValue.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValue.java
index d9b25c333790f..489efc5825a89 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValue.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValueEncodingType.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValueEncodingType.java
index 73327d8503203..d28ab9a15aa53 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValueEncodingType.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/KeyValueEncodingType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfo.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfo.java
index d47118ac92869..eb985c3fe236e 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfo.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfoWithVersion.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfoWithVersion.java
index 8ee742ddd8bbb..c5288c62b212b 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfoWithVersion.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaInfoWithVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaType.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaType.java
index 188f40f347930..fe9ae1f586a9f 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaType.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/SchemaType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/package-info.java b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/package-info.java
index 610e9249c3b09..4a0f1a631ac85 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/package-info.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/common/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenz.java b/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenz.java
index 8c719b861b0bc..ec1dcf602adf2 100644
--- a/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenz.java
+++ b/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenz.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataAthenz.java b/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataAthenz.java
index 392f8d20c84af..056cc60a0176e 100644
--- a/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataAthenz.java
+++ b/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataAthenz.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java b/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
index 726a94dc51f61..5432d336de19c 100644
--- a/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
+++ b/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Helper class to access AirCompressor package private classes.
  */
diff --git a/pulsar-client-auth-athenz/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenzTest.java b/pulsar-client-auth-athenz/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenzTest.java
index 319e25db79766..2ae5ba71f2cb6 100644
--- a/pulsar-client-auth-athenz/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenzTest.java
+++ b/pulsar-client-auth-athenz/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenzTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationSasl.java b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationSasl.java
index ff160efcb96ed..f51fb766f03db 100644
--- a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationSasl.java
+++ b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationSasl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl.auth;
 
 import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
diff --git a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/PulsarSaslClient.java b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/PulsarSaslClient.java
index 61233f10a6616..9948e4ce68aed 100644
--- a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/PulsarSaslClient.java
+++ b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/PulsarSaslClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/SaslAuthenticationDataProvider.java b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/SaslAuthenticationDataProvider.java
index 40add8cbf34c0..675a340af8cd0 100644
--- a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/SaslAuthenticationDataProvider.java
+++ b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/SaslAuthenticationDataProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
index 726a94dc51f61..5432d336de19c 100644
--- a/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
+++ b/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Helper class to access AirCompressor package private classes.
  */
diff --git a/pulsar-client-cpp/README.md b/pulsar-client-cpp/README.md
new file mode 100644
index 0000000000000..63ea98007afc9
--- /dev/null
+++ b/pulsar-client-cpp/README.md
@@ -0,0 +1,3 @@
+# NOTICE
+
+The Apache Pulsar C++ Client code now lives here: https://github.com/apache/pulsar-client-cpp
diff --git a/pulsar-client-cpp/python/README.md b/pulsar-client-cpp/python/README.md
new file mode 100644
index 0000000000000..cea8847df5139
--- /dev/null
+++ b/pulsar-client-cpp/python/README.md
@@ -0,0 +1,3 @@
+# NOTICE
+
+The Apache Pulsar Python Client code now lives here: https://github.com/apache/pulsar-client-python
diff --git a/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/MessageCryptoBc.java b/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/MessageCryptoBc.java
index fbbd326ddf54b..2d7b779fa7b6c 100644
--- a/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/MessageCryptoBc.java
+++ b/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/MessageCryptoBc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/package-info.java b/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/package-info.java
index 00cce17f4e432..1ff9c63db51dd 100644
--- a/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/package-info.java
+++ b/pulsar-client-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Helper class to for message encrypt or decrypt.
  */
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index 87957c719e4d0..dd1f2e194850b 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -150,6 +150,7 @@
                   com.fasterxml.jackson.core:jackson-core
                   com.fasterxml.jackson.dataformat
                   io.netty:*
+                  io.netty.incubator:*
                   io.perfmark:*
                   org.eclipse.jetty:*
                   com.yahoo.datasketches:*
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CommandExecutionContext.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CommandExecutionContext.java
index 47f28479ab1e6..dd71309a3ea7c 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CommandExecutionContext.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CommandExecutionContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommand.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommand.java
index bae1698eed649..444b006734ed8 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommand.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandFactory.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandFactory.java
index d4412703d0fe0..82a5f9c3190b2 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandFactory.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandGroup.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandGroup.java
index b20f5c6895c00..ffcabcfd6f517 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandGroup.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/CustomCommandGroup.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterDescriptor.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterDescriptor.java
index 21f1074f86480..fe5933097b1a5 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterDescriptor.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterType.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterType.java
index a4f491cf49220..2cde7fcf40821 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterType.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/ParameterType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/package-info.java b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/package-info.java
index dbefcce751631..e0c39a7e0d180 100644
--- a/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/package-info.java
+++ b/pulsar-client-tools-api/src/main/java/org/apache/pulsar/admin/cli/extensions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-customcommand-example/src/main/java/org/apache/pulsar/admin/cli/examples/MyCommandFactory.java b/pulsar-client-tools-customcommand-example/src/main/java/org/apache/pulsar/admin/cli/examples/MyCommandFactory.java
index e431d002465ab..f125ed8f6f31b 100644
--- a/pulsar-client-tools-customcommand-example/src/main/java/org/apache/pulsar/admin/cli/examples/MyCommandFactory.java
+++ b/pulsar-client-tools-customcommand-example/src/main/java/org/apache/pulsar/admin/cli/examples/MyCommandFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
index 4fc723e5f4c87..39ede3bb7aef1 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/DeprecatedCommanderTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/DeprecatedCommanderTest.java
index 53d78dda8bf3f..3112344bedcda 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/DeprecatedCommanderTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/DeprecatedCommanderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index bcb1fca1705e5..2229c5b31e635 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,7 +28,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,7 +36,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
-import java.lang.reflect.Field;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
@@ -292,22 +290,32 @@ public void clusters() throws Exception {
         clusters = new CmdClusters(() -> admin);
         clusters.run(split("create my-tls-cluster --url-secure https://my-service.url:4443 --tls-enable "
                 + "--tls-enable-keystore --tls-trust-store-type JKS --tls-trust-store /var/private/tls/client.truststore.jks "
-                + "--tls-trust-store-pwd clientpw"));
+                + "--tls-trust-store-pwd clientpw --tls-key-store-type KEYSTORE_TYPE --tls-key-store /var/private/tls/client.keystore.jks "
+                + "--tls-key-store-pwd KEYSTORE_STORE_PWD"));
         ClusterData.Builder data = ClusterData.builder()
                 .serviceUrlTls("https://my-service.url:4443")
                 .brokerClientTlsEnabled(true)
                 .brokerClientTlsEnabledWithKeyStore(true)
                 .brokerClientTlsTrustStoreType("JKS")
                 .brokerClientTlsTrustStore("/var/private/tls/client.truststore.jks")
-                .brokerClientTlsTrustStorePassword("clientpw");
+                .brokerClientTlsTrustStorePassword("clientpw")
+                .brokerClientTlsKeyStoreType("KEYSTORE_TYPE")
+                .brokerClientTlsKeyStore("/var/private/tls/client.keystore.jks")
+                .brokerClientTlsKeyStorePassword("KEYSTORE_STORE_PWD");
+
         verify(mockClusters).createCluster("my-tls-cluster", data.build());
 
         clusters.run(split("update my-tls-cluster --url-secure https://my-service.url:4443 --tls-enable "
-                + "--tls-trust-certs-filepath /path/to/ca.cert.pem"));
+                + "--tls-trust-certs-filepath /path/to/ca.cert.pem --tls-key-filepath KEY_FILEPATH --tls-certs-filepath CERTS_FILEPATH"));
         data.brokerClientTlsEnabledWithKeyStore(false)
                 .brokerClientTlsTrustStore(null)
                 .brokerClientTlsTrustStorePassword(null)
-                .brokerClientTrustCertsFilePath("/path/to/ca.cert.pem");
+                .brokerClientTlsKeyStoreType("JKS")
+                .brokerClientTlsKeyStore(null)
+                .brokerClientTlsKeyStorePassword(null)
+                .brokerClientTrustCertsFilePath("/path/to/ca.cert.pem")
+                .brokerClientKeyFilePath("KEY_FILEPATH")
+                .brokerClientCertificateFilePath("CERTS_FILEPATH");
         verify(mockClusters).updateCluster("my-tls-cluster", data.build());
     }
 
@@ -804,11 +812,11 @@ public void namespaces() throws Exception {
         verify(mockNamespaces).clearOffloadDeleteLag("myprop/clust/ns1");
 
         namespaces.run(split(
-                "set-offload-policies myprop/clust/ns1 -r test-region -d aws-s3 -b test-bucket -e http://test.endpoint -mbs 32M -rbs 5M -oat 10M -oae 10s -orp tiered-storage-first"));
+                "set-offload-policies myprop/clust/ns1 -r test-region -d aws-s3 -b test-bucket -e http://test.endpoint -mbs 32M -rbs 5M -oat 10M -oats 100 -oae 10s -orp tiered-storage-first"));
         verify(mockNamespaces).setOffloadPolicies("myprop/clust/ns1",
                 OffloadPoliciesImpl.create("aws-s3", "test-region", "test-bucket",
                         "http://test.endpoint",null, null, null, null, 32 * 1024 * 1024, 5 * 1024 * 1024,
-                        10 * 1024 * 1024L, 10000L, OffloadedReadPriority.TIERED_STORAGE_FIRST));
+                        10 * 1024 * 1024L, 100L, 10000L, OffloadedReadPriority.TIERED_STORAGE_FIRST));
 
         namespaces.run(split("remove-offload-policies myprop/clust/ns1"));
         verify(mockNamespaces).removeOffloadPolicies("myprop/clust/ns1");
@@ -964,11 +972,11 @@ public void topicPolicies() throws Exception {
         verify(mockTopicsPolicies).removeOffloadPolicies("persistent://myprop/clust/ns1/ds1");
 
         cmdTopics.run(split("set-offload-policies persistent://myprop/clust/ns1/ds1 -d s3 -r" +
-                " region -b bucket -e endpoint -m 8 -rb 9 -t 10 -orp tiered-storage-first"));
+                " region -b bucket -e endpoint -m 8 -rb 9 -t 10 -ts 10 -orp tiered-storage-first"));
         verify(mockTopicsPolicies)
                 .setOffloadPolicies("persistent://myprop/clust/ns1/ds1",
                         OffloadPoliciesImpl.create("s3", "region", "bucket" , "endpoint", null, null, null, null,
-                8, 9, 10L, null, OffloadedReadPriority.TIERED_STORAGE_FIRST));
+                                8, 9, 10L, 10L, null, OffloadedReadPriority.TIERED_STORAGE_FIRST));
 
         cmdTopics.run(split("get-retention persistent://myprop/clust/ns1/ds1"));
         verify(mockTopicsPolicies).getRetention("persistent://myprop/clust/ns1/ds1", false);
@@ -1414,11 +1422,21 @@ public void topicPolicies() throws Exception {
         verify(mockGlobalTopicsPolicies).removeOffloadPolicies("persistent://myprop/clust/ns1/ds1");
 
         cmdTopics.run(split("set-offload-policies persistent://myprop/clust/ns1/ds1 -d s3 -r" +
-                " region -b bucket -e endpoint -m 8 -rb 9 -t 10 -orp tiered-storage-first -g"));
+                " region -b bucket -e endpoint -m 8 -rb 9 -t 10 -ts 100 -orp tiered-storage-first -g"));
         verify(mockGlobalTopicsPolicies)
                 .setOffloadPolicies("persistent://myprop/clust/ns1/ds1",
                         OffloadPoliciesImpl.create("s3", "region", "bucket" , "endpoint", null, null, null, null,
-                                8, 9, 10L, null, OffloadedReadPriority.TIERED_STORAGE_FIRST));
+                                8, 9, 10L, 100L, null, OffloadedReadPriority.TIERED_STORAGE_FIRST));
+
+        cmdTopics.run(split("set-auto-subscription-creation persistent://prop/clust/ns1/ds1 -e -g"));
+        verify(mockGlobalTopicsPolicies).setAutoSubscriptionCreation("persistent://prop/clust/ns1/ds1",
+                AutoSubscriptionCreationOverride.builder()
+                        .allowAutoSubscriptionCreation(true)
+                        .build());
+        cmdTopics.run(split("get-auto-subscription-creation persistent://prop/clust/ns1/ds1 -a -g"));
+        verify(mockGlobalTopicsPolicies).getAutoSubscriptionCreation("persistent://prop/clust/ns1/ds1", true);
+        cmdTopics.run(split("remove-auto-subscription-creation persistent://prop/clust/ns1/ds1 -g"));
+        verify(mockGlobalTopicsPolicies).removeAutoSubscriptionCreation("persistent://prop/clust/ns1/ds1");
     }
 
     @Test
@@ -1701,10 +1719,10 @@ public void topics() throws Exception {
         cmdTopics.run(split("remove-delayed-delivery persistent://myprop/clust/ns1/ds1"));
         verify(mockTopics).removeDelayedDeliveryPolicy("persistent://myprop/clust/ns1/ds1") ;
 
-        cmdTopics.run(split("set-offload-policies persistent://myprop/clust/ns1/ds1 -d s3 -r region -b bucket -e endpoint -m 8 -rb 9 -t 10 -orp tiered-storage-first"));
+        cmdTopics.run(split("set-offload-policies persistent://myprop/clust/ns1/ds1 -d s3 -r region -b bucket -e endpoint -ts 50 -m 8 -rb 9 -t 10 -orp tiered-storage-first"));
         OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl.create("s3", "region", "bucket"
                 , "endpoint", null, null, null, null,
-                8, 9, 10L, null, OffloadedReadPriority.TIERED_STORAGE_FIRST);
+                8, 9, 10L, 50L, null, OffloadedReadPriority.TIERED_STORAGE_FIRST);
         verify(mockTopics).setOffloadPolicies("persistent://myprop/clust/ns1/ds1", offloadPolicies);
 
         cmdTopics.run(split("get-max-unacked-messages-on-consumer persistent://myprop/clust/ns1/ds1"));
@@ -2162,19 +2180,9 @@ public void requestTimeout() throws Exception {
             //Ok
         }
 
+        ClientConfigurationData conf =  ((PulsarAdminImpl)tool.getPulsarAdminSupplier().get()).getClientConfigData();
 
-        final PulsarAdmin admin = tool.getPulsarAdminSupplier().get();
-        Field requestTimeoutField =
-                PulsarAdminImpl.class.getDeclaredField("requestTimeout");
-        requestTimeoutField.setAccessible(true);
-        int requestTimeout = (int) requestTimeoutField.get(admin);
-
-        Field requestTimeoutUnitField =
-                PulsarAdminImpl.class.getDeclaredField("requestTimeoutUnit");
-        requestTimeoutUnitField.setAccessible(true);
-        TimeUnit requestTimeoutUnit = (TimeUnit) requestTimeoutUnitField.get(admin);
-        assertEquals(1, requestTimeout);
-        assertEquals(TimeUnit.SECONDS, requestTimeoutUnit);
+        assertEquals(1000, conf.getRequestTimeoutMs());
     }
 
     @Test
@@ -2215,8 +2223,8 @@ public void testAuthTlsWithJsonParam() throws Exception {
         conf = conf = ((PulsarAdminImpl)tool.getPulsarAdminSupplier().get())
                 .getClientConfigData();
         atuh = (AuthenticationTls) conf.getAuthentication();
-        assertNull(atuh.getCertFilePath());
-        assertNull(atuh.getKeyFilePath());
+        assertEquals(atuh.getCertFilePath(), certFilePath);
+        assertEquals(atuh.getKeyFilePath(), keyFilePath);
     }
 
     @Test
@@ -2294,6 +2302,10 @@ void transactions() throws Exception {
         cmdTransactions = new CmdTransactions(() -> admin);
         cmdTransactions.run(split("position-stats-in-pending-ack -t test -s test -l 1 -e 1 -b 1"));
         verify(transactions).getPositionStatsInPendingAck("test", "test", 1L, 1L, 1);
+
+        cmdTransactions = new CmdTransactions(() -> admin);
+        cmdTransactions.run(split("coordinators-list"));
+        verify(transactions).listTransactionCoordinators();
     }
 
     @Test
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java
index 007c1c883b28d..e3b69b7a468fd 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitterTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitterTest.java
index e2950bc45ed6d..1bf4f3fedeca4 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitterTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/DocumentTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/DocumentTest.java
index c4243ad72fcb4..c565fadd2fc9a 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/DocumentTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/DocumentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolForceBatchNum.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolForceBatchNum.java
index b9f7b3f5e6f82..e296ab0e0357a 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolForceBatchNum.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolForceBatchNum.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
index 29b82ae401e43..52edde856b7f3 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,7 +19,7 @@
 package org.apache.pulsar.client.cli;
 
 import static org.testng.Assert.assertEquals;
-
+import static org.testng.Assert.assertNull;
 import java.time.Duration;
 import java.util.Properties;
 import java.util.UUID;
@@ -28,13 +28,12 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
-import com.beust.jcommander.JCommander;
 import lombok.Cleanup;
 import org.apache.pulsar.broker.service.BrokerTestBase;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.ProxyProtocol;
 import org.apache.pulsar.client.impl.BatchMessageIdImpl;
 import org.apache.pulsar.common.policies.data.TenantInfoImpl;
 import org.awaitility.Awaitility;
@@ -284,8 +283,8 @@ public void testArgs() throws Exception {
         final String message = "test msg";
         final int numberOfMessages = 1;
         final String topicName = getTopicWithRandomSuffix("test-topic");
-        
-        String[] args = {"--url", url, 
+
+        String[] args = {"--url", url,
                 "--auth-plugin", authPlugin,
                 "--auth-params", authParams,
                 "--tlsTrustCertsFilePath", tlsTrustCertsFilePath,
@@ -296,8 +295,52 @@ public void testArgs() throws Exception {
         assertEquals(pulsarClientTool.rootParams.getAuthParams(), authParams);
         assertEquals(pulsarClientTool.rootParams.getAuthPluginClassName(), authPlugin);
         assertEquals(pulsarClientTool.rootParams.getServiceURL(), url);
+        assertNull(pulsarClientTool.rootParams.getProxyServiceURL());
+        assertNull(pulsarClientTool.rootParams.getProxyProtocol());
+    }
+
+    @Test
+    public void testParsingProxyServiceUrlAndProxyProtocolFromProperties() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("proxyServiceUrl", "pulsar+ssl://my-proxy-pulsar:4443");
+        properties.setProperty("proxyProtocol", "SNI");
+        PulsarClientTool pulsarClientTool = new PulsarClientTool(properties);
+        final String url = "pulsar+ssl://localhost:6651";
+        final String message = "test msg";
+        final int numberOfMessages = 1;
+        final String topicName = getTopicWithRandomSuffix("test-topic");
+
+        String[] args = {"--url", url,
+                "produce", "-m", message,
+                "-n", Integer.toString(numberOfMessages), topicName};
+        pulsarClientTool.jcommander.parse(args);
+        assertEquals(pulsarClientTool.rootParams.getServiceURL(), url);
+        assertEquals(pulsarClientTool.rootParams.getProxyServiceURL(), "pulsar+ssl://my-proxy-pulsar:4443");
+        assertEquals(pulsarClientTool.rootParams.getProxyProtocol(), ProxyProtocol.SNI);
     }
     
+    @Test
+    public void testSendMultipleMessage() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("serviceUrl", brokerUrl.toString());
+        properties.setProperty("useTls", "false");
+
+        final String topicName = getTopicWithRandomSuffix("test-multiple-msg");
+
+        @Cleanup
+        Consumer consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName("sub").subscribe();
+
+        PulsarClientTool pulsarClientTool = new PulsarClientTool(properties);
+        String[] args1 = {"produce", "-m", "msg0", "-m", "msg1,msg2", topicName};
+        Assert.assertEquals(pulsarClientTool.run(args1), 0);
+
+        for (int i = 0; i < 3; i++) {
+            Message msg = consumer.receive(10, TimeUnit.SECONDS);
+            Assert.assertNotNull(msg);
+            Assert.assertEquals(new String(msg.getData()), "msg" + i);
+        }
+    }
+
     private static String getTopicWithRandomSuffix(String localNameBase) {
         return String.format("persistent://prop/ns-abc/test/%s-%s", localNameBase, UUID.randomUUID().toString());
     }
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolWsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolWsTest.java
index be75cf873e17c..5a12e77f99eb1 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolWsTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolWsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/pom.xml b/pulsar-client-tools/pom.xml
index 948e420ee1860..c81c0da4c0b25 100644
--- a/pulsar-client-tools/pom.xml
+++ b/pulsar-client-tools/pom.xml
@@ -126,7 +126,6 @@
     
       org.jline
       jline
-      ${jline3.version}
     
     
       net.java.dev.jna
@@ -136,7 +135,6 @@
     
       org.apache.commons
       commons-text
-      ${commons-text.version}
     
 
   
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java
index 1a2136ee967df..f8f895769b67e 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java
index 8a3ecf14ec857..ba0a292c113e0 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java
index cb7a6a28a71ce..8c8f0f4e8a2d1 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokerStats.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokerStats.java
index 54f1e2a479ba6..c83beec330f39 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokerStats.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokerStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokers.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokers.java
index a713198db108d..1e86edcf59c60 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokers.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBrokers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
index 12def9a9a96c1..173595c9b19a4 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -336,10 +336,30 @@ abstract class ClusterDetailsCommand extends BaseCommand {
                 description = "TLS TrustStore password for internal client", required = false)
         protected String brokerClientTlsTrustStorePassword;
 
+        @Parameter(names = "--tls-key-store-type",
+                description = "TLS TrustStore type configuration for internal client eg: JKS", required = false)
+        protected String brokerClientTlsKeyStoreType;
+
+        @Parameter(names = "--tls-key-store",
+                description = "TLS KeyStore path for internal client", required = false)
+        protected String brokerClientTlsKeyStore;
+
+        @Parameter(names = "--tls-key-store-pwd",
+                description = "TLS KeyStore password for internal client", required = false)
+        protected String brokerClientTlsKeyStorePassword;
+
         @Parameter(names = "--tls-trust-certs-filepath",
                 description = "path for the trusted TLS certificate file", required = false)
         protected String brokerClientTrustCertsFilePath;
 
+        @Parameter(names = "--tls-key-filepath",
+                description = "path for the TLS private key file", required = false)
+        protected String brokerClientKeyFilePath;
+
+        @Parameter(names = "--tls-certs-filepath",
+                description = "path for the TLS certificate file", required = false)
+        protected String brokerClientCertificateFilePath;
+
         @Parameter(names = "--listener-name",
                 description = "listenerName when client would like to connect to cluster", required = false)
         protected String listenerName;
@@ -403,9 +423,24 @@ void processArguments() throws Exception {
             if (brokerClientTlsTrustStorePassword != null) {
                 builder.brokerClientTlsTrustStorePassword(brokerClientTlsTrustStorePassword);
             }
+            if (brokerClientTlsKeyStoreType != null) {
+                builder.brokerClientTlsKeyStoreType(brokerClientTlsKeyStoreType);
+            }
+            if (brokerClientTlsKeyStore != null) {
+                builder.brokerClientTlsKeyStore(brokerClientTlsKeyStore);
+            }
+            if (brokerClientTlsKeyStorePassword != null) {
+                builder.brokerClientTlsKeyStorePassword(brokerClientTlsKeyStorePassword);
+            }
             if (brokerClientTrustCertsFilePath != null) {
                 builder.brokerClientTrustCertsFilePath(brokerClientTrustCertsFilePath);
             }
+            if (brokerClientKeyFilePath != null) {
+                builder.brokerClientKeyFilePath(brokerClientKeyFilePath);
+            }
+            if (brokerClientCertificateFilePath != null) {
+                builder.brokerClientCertificateFilePath(brokerClientCertificateFilePath);
+            }
 
             if (listenerName != null) {
                 builder.listenerName(listenerName);
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java
index 4fff0e1152619..8fa2cbad955ef 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index e1872fbe9c684..9d64981a2c680 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdGenerateDocument.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdGenerateDocument.java
index 2721c2ea3ab8e..764351a4f5e2e 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdGenerateDocument.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdGenerateDocument.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -107,9 +107,6 @@ private void generateDocument(StringBuilder sb, String module, JCommander obj) {
                     .append("\n```");
             sb.append("\n\n");
             CmdBase cmdObj = (CmdBase) obj.getObjects().get(0);
-            for (String s : cmdObj.jcommander.getCommands().keySet()) {
-                sb.append("* `").append(s).append("`\n");
-            }
             cmdObj.jcommander.getCommands().forEach((subK, subV) -> {
                 sb.append("\n\n## ").append(subK).append("\n\n");
                 sb.append(cmdObj.getUsageFormatter().getCommandDescription(subK)).append("\n\n");
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaceIsolationPolicy.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaceIsolationPolicy.java
index e37430a6c735f..8de7ef500eaa0 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaceIsolationPolicy.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaceIsolationPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
index 7dee55f694d6f..b64df272b4468 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -2273,6 +2273,13 @@ private class SetOffloadPolicies extends CliCommand {
                 required = false)
         private String offloadAfterThresholdStr;
 
+        @Parameter(
+                names = {"--offloadAfterThresholdInSeconds", "-oats"},
+                description = "Offload after threshold seconds (eg: 1,5,10)",
+                required = false
+        )
+        private String offloadAfterThresholdInSecondsStr;
+
         @Parameter(
                 names = {"--offloadedReadPriority", "-orp"},
                 description = "Read priority for offloaded messages. By default, once messages are offloaded to "
@@ -2366,6 +2373,15 @@ && maxValueCheck("OffloadAfterElapsed", offloadAfterElapsed, Long.MAX_VALUE)) {
                     offloadAfterThresholdInBytes = offloadAfterThreshold;
                 }
             }
+
+            Long offloadThresholdInSeconds = OffloadPoliciesImpl.DEFAULT_OFFLOAD_THRESHOLD_IN_SECONDS;
+            if (StringUtils.isNotEmpty(offloadAfterThresholdInSecondsStr)) {
+                long offloadThresholdInSeconds0 = Long.parseLong(offloadAfterThresholdInSecondsStr.trim());
+                if (maxValueCheck("OffloadAfterThresholdInSeconds", offloadThresholdInSeconds0, Long.MAX_VALUE)) {
+                    offloadThresholdInSeconds = offloadThresholdInSeconds0;
+                }
+            }
+
             OffloadedReadPriority offloadedReadPriority = OffloadPoliciesImpl.DEFAULT_OFFLOADED_READ_PRIORITY;
 
             if (this.offloadReadPriorityStr != null) {
@@ -2384,7 +2400,7 @@ && maxValueCheck("OffloadAfterElapsed", offloadAfterElapsed, Long.MAX_VALUE)) {
                     s3Role, s3RoleSessionName,
                     awsId, awsSecret,
                     maxBlockSizeInBytes, readBufferSizeInBytes, offloadAfterThresholdInBytes,
-                    offloadAfterElapsedInMillis, offloadedReadPriority);
+                    offloadThresholdInSeconds, offloadAfterElapsedInMillis, offloadedReadPriority);
 
             getAdmin().namespaces().setOffloadPolicies(namespace, offloadPolicies);
         }
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNonPersistentTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNonPersistentTopics.java
index 376e3c8c58f42..c344a76853c1d 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNonPersistentTopics.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNonPersistentTopics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPackages.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPackages.java
index 5c1f03cf7925d..ba9e67a5b4173 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPackages.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPackages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java
index 8e3683ac86130..5dbb3935ce98a 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -347,7 +347,7 @@ private class GetStats extends CliCommand {
         @Override
         void run() throws PulsarAdminException {
             String persistentTopic = validatePersistentTopic(params);
-            print(persistentTopics.getStats(persistentTopic, getPreciseBacklog));
+            print(getPersistentTopics().getStats(persistentTopic, getPreciseBacklog));
         }
     }
 
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdProxyStats.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdProxyStats.java
index 75de4464f9e26..a5ec14a3ed725 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdProxyStats.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdProxyStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceGroups.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceGroups.java
index afc9fc1c3aba7..7ed853be44d9f 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceGroups.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceGroups.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.admin.cli;
 
 import com.beust.jcommander.Parameter;
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceQuotas.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceQuotas.java
index af8c6a21d479d..25940f52a1be3 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceQuotas.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdResourceQuotas.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSchemas.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSchemas.java
index 3dbcca3bcf97f..1233a84a8ab67 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSchemas.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSchemas.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 183071c5d4ab9..c2321bc6ac9f0 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index 26c61587b95e8..1731da80e458c 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTenants.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTenants.java
index 0dcc3ddd6bfdb..0d5502e506ceb 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTenants.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTenants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopicPolicies.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopicPolicies.java
index 4a539d519de5e..98e6530082634 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopicPolicies.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopicPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -33,6 +33,7 @@
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.TopicPolicies;
 import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.common.policies.data.AutoSubscriptionCreationOverride;
 import org.apache.pulsar.common.policies.data.BacklogQuota;
 import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
 import org.apache.pulsar.common.policies.data.DispatchRate;
@@ -151,6 +152,10 @@ public CmdTopicPolicies(Supplier admin) {
         jcommander.addCommand("get-entry-filters-per-topic", new GetEntryFiltersPerTopic());
         jcommander.addCommand("set-entry-filters-per-topic", new SetEntryFiltersPerTopic());
         jcommander.addCommand("remove-entry-filters-per-topic", new RemoveEntryFiltersPerTopic());
+
+        jcommander.addCommand("set-auto-subscription-creation", new SetAutoSubscriptionCreation());
+        jcommander.addCommand("get-auto-subscription-creation", new GetAutoSubscriptionCreation());
+        jcommander.addCommand("remove-auto-subscription-creation", new RemoveAutoSubscriptionCreation());
     }
 
     @Parameters(commandDescription = "Get entry filters for a topic")
@@ -1758,6 +1763,10 @@ private class SetOffloadPolicies extends CliCommand {
                 , description = "ManagedLedger offload threshold in bytes", required = true)
         private long offloadThresholdInBytes;
 
+        @Parameter(names = {"-ts", "--offloadThresholdInSeconds"}
+                , description = "ManagedLedger offload threshold in seconds")
+        private Long offloadThresholdInSeconds;
+
         @Parameter(names = {"-dl", "--offloadDeletionLagInMillis"}
                 , description = "ManagedLedger offload deletion lag in bytes")
         private Long offloadDeletionLagInMillis;
@@ -1799,7 +1808,8 @@ void run() throws PulsarAdminException {
                     s3Role, s3RoleSessionName,
                     awsId, awsSecret,
                     maxBlockSizeInBytes,
-                    readBufferSizeInBytes, offloadThresholdInBytes, offloadDeletionLagInMillis, offloadedReadPriority);
+                    readBufferSizeInBytes, offloadThresholdInBytes, offloadThresholdInSeconds,
+                    offloadDeletionLagInMillis, offloadedReadPriority);
 
             getTopicPolicies(isGlobal).setOffloadPolicies(persistentTopic, offloadPolicies);
         }
@@ -1852,6 +1862,63 @@ void run() throws PulsarAdminException {
         }
     }
 
+    @Parameters(commandDescription = "Enable autoSubscriptionCreation for a topic")
+    private class SetAutoSubscriptionCreation extends CliCommand {
+        @Parameter(description = "persistent://tenant/namespace/topic", required = true)
+        private java.util.List params;
+
+        @Parameter(names = {"--enable", "-e"}, description = "Enable allowAutoSubscriptionCreation on topic")
+        private boolean enable = false;
+
+        @Parameter(names = { "--global", "-g" }, description = "Whether to set this policy globally. "
+                + "If set to true, the policy will be replicate to other clusters asynchronously")
+        private boolean isGlobal = false;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String persistentTopic = validatePersistentTopic(params);
+            getTopicPolicies(isGlobal).setAutoSubscriptionCreation(persistentTopic,
+                    AutoSubscriptionCreationOverride.builder()
+                            .allowAutoSubscriptionCreation(enable)
+                            .build());
+        }
+    }
+
+    @Parameters(commandDescription = "Get the autoSubscriptionCreation for a topic")
+    private class GetAutoSubscriptionCreation extends CliCommand {
+        @Parameter(description = "persistent://tenant/namespace/topic", required = true)
+        private java.util.List params;
+
+        @Parameter(names = {"--applied", "-a"}, description = "Get the applied policy of the topic")
+        private boolean applied = false;
+
+        @Parameter(names = {"--global", "-g"}, description = "Whether to get this policy globally. "
+                + "If set to true, broker returned global topic policies")
+        private boolean isGlobal = false;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String persistentTopic = validatePersistentTopic(params);
+            print(getTopicPolicies(isGlobal).getAutoSubscriptionCreation(persistentTopic, applied));
+        }
+    }
+
+    @Parameters(commandDescription = "Remove override of autoSubscriptionCreation for a topic")
+    private class RemoveAutoSubscriptionCreation extends CliCommand {
+        @Parameter(description = "persistent://tenant/namespace/topic", required = true)
+        private java.util.List params;
+
+        @Parameter(names = {"--global", "-g"}, description = "Whether to remove this policy globally. "
+                + "If set to true, the policy will be replicate to other clusters asynchronously")
+        private boolean isGlobal = false;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String persistentTopic = validatePersistentTopic(params);
+            getTopicPolicies(isGlobal).removeAutoSubscriptionCreation(persistentTopic);
+        }
+    }
+
     private TopicPolicies getTopicPolicies(boolean isGlobal) {
         return getAdmin().topicPolicies(isGlobal);
     }
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
index 245cfc1b85506..60aa649737878 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -2150,6 +2150,10 @@ private class SetOffloadPolicies extends CliCommand {
                 , description = "ManagedLedger offload threshold in bytes", required = true)
         private long offloadThresholdInBytes;
 
+        @Parameter(names = {"-ts", "--offloadThresholdInSeconds"}
+                , description = "ManagedLedger offload threshold in seconds")
+        private Long offloadThresholdInSeconds;
+
         @Parameter(names = {"-dl", "--offloadDeletionLagInMillis"}
                 , description = "ManagedLedger offload deletion lag in bytes")
         private Long offloadDeletionLagInMillis;
@@ -2186,7 +2190,8 @@ void run() throws PulsarAdminException {
                     s3Role, s3RoleSessionName,
                     awsId, awsSecret,
                     maxBlockSizeInBytes,
-                    readBufferSizeInBytes, offloadThresholdInBytes, offloadDeletionLagInMillis, offloadedReadPriority);
+                    readBufferSizeInBytes, offloadThresholdInBytes, offloadThresholdInSeconds,
+                    offloadDeletionLagInMillis, offloadedReadPriority);
 
             getTopics().setOffloadPolicies(persistentTopic, offloadPolicies);
         }
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTransactions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTransactions.java
index a79966035cded..08ffba1451f23 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTransactions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTransactions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,8 +23,10 @@
 import com.beust.jcommander.Parameters;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.api.transaction.TxnID;
+import org.apache.pulsar.common.policies.data.TransactionCoordinatorInfo;
 import org.apache.pulsar.common.util.RelativeTimeUtil;
 
 @Parameters(commandDescription = "Operations on transactions")
@@ -219,6 +221,22 @@ void run() throws Exception {
         }
     }
 
+    @Parameters(commandDescription = "List transaction coordinators")
+    private class ListTransactionCoordinators extends CliCommand {
+        @Override
+        void run() throws Exception {
+            print(getAdmin()
+                    .transactions()
+                    .listTransactionCoordinators()
+                    .stream()
+                    .collect(Collectors.toMap(
+                            TransactionCoordinatorInfo::getId,
+                            TransactionCoordinatorInfo::getBrokerServiceUrl
+                    ))
+            );
+        }
+    }
+
 
     public CmdTransactions(Supplier admin) {
         super("transactions", admin);
@@ -233,6 +251,7 @@ public CmdTransactions(Supplier admin) {
         jcommander.addCommand("slow-transactions", new GetSlowTransactions());
         jcommander.addCommand("scale-transactionCoordinators", new ScaleTransactionCoordinators());
         jcommander.addCommand("position-stats-in-pending-ack", new GetPositionStatsInPendingAck());
+        jcommander.addCommand("coordinators-list", new ListTransactionCoordinators());
 
     }
 }
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdUsageFormatter.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdUsageFormatter.java
index 6e0d642af4267..a1771a07cc96b 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdUsageFormatter.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdUsageFormatter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CustomCommandsUtils.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CustomCommandsUtils.java
index 9063d0d1d0c85..e1968d0349ad2 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CustomCommandsUtils.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CustomCommandsUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminSupplier.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminSupplier.java
index 42db04ad754cb..6aa8d2b9c610a 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminSupplier.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
index f34f5bef9382e..a358fac665bfe 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/package-info.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/package-info.java
index 68b94b134e738..9ddaaca133574 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/package-info.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java
index ce5e7e329816d..7e04a99136d11 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinition.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinition.java
index f91f4bb6dd4db..68316021b2861 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinition.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinitions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinitions.java
index fdd73c2fc37c7..e555c529cee1b 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinitions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryDefinitions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryMetaData.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryMetaData.java
index fce33157435cc..e556e78855eb8 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryMetaData.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryMetaData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java
index 7aa581ef7e04f..3ec6953567f73 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/IOUtils.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/IOUtils.java
index 14a630868fdd8..e67ca47f38972 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/IOUtils.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/IOUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitter.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitter.java
index ca4fb7790b51c..011f93e18f1f0 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitter.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/NameValueParameterSplitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/SchemaExtractor.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/SchemaExtractor.java
index f9f7771e3fb11..7a566010e11f5 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/SchemaExtractor.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/SchemaExtractor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/package-info.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/package-info.java
index 79c8984105f88..42a2f2f5390aa 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/package-info.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
index 5850e557a9523..ef3db09a8830c 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdGenerateDocumentation.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdGenerateDocumentation.java
index b992843643aed..cb5c5ef3c5b5a 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdGenerateDocumentation.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdGenerateDocumentation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -68,9 +68,6 @@ protected String generateDocument(String module, JCommander parentCmd) {
                 .append("$ pulsar-client ").append(module).append(" [options]")
                 .append("\n```");
         sb.append("\n\n");
-        for (String s : cmd.getCommands().keySet()) {
-            sb.append("* `").append(s).append("`\n");
-        }
         sb.append("|Flag|Description|Default|\n");
         sb.append("|---|---|---|\n");
         List options = cmd.getParameters();
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java
index 53f7f0a16f97d..9aa7d684e9178 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -31,15 +31,14 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Base64;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
 import org.apache.pulsar.client.api.Authentication;
 import org.apache.pulsar.client.api.AuthenticationDataProvider;
 import org.apache.pulsar.client.api.ClientBuilder;
@@ -205,7 +204,7 @@ public int run() throws PulsarClientException {
         }
 
         if (messages.size() > 0){
-            messages = Collections.unmodifiableList(Arrays.asList(messages.get(0).split(separator)));
+            messages = messages.stream().map(str -> str.split(separator)).flatMap(Stream::of).toList();
         }
 
         if (messages.size() == 0 && messageFileNames.size() == 0) {
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/NoSplitter.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/NoSplitter.java
index 4c3138dfec48a..0429970366504 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/NoSplitter.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/NoSplitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
index 5849cf8415fd8..6083fbd7301b6 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -30,6 +30,7 @@
 import java.util.Arrays;
 import java.util.Properties;
 import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.PulsarVersion;
 import org.apache.pulsar.client.api.Authentication;
 import org.apache.pulsar.client.api.AuthenticationFactory;
@@ -146,6 +147,17 @@ protected void initRootParamsFromProperties(Properties properties) {
         this.rootParams.authPluginClassName = properties.getProperty("authPlugin");
         this.rootParams.authParams = properties.getProperty("authParams");
         this.rootParams.tlsTrustCertsFilePath = properties.getProperty("tlsTrustCertsFilePath");
+        this.rootParams.proxyServiceURL = StringUtils.trimToNull(properties.getProperty("proxyServiceUrl"));
+        String proxyProtocolString = StringUtils.trimToNull(properties.getProperty("proxyProtocol"));
+        if (proxyProtocolString != null) {
+            try {
+                this.rootParams.proxyProtocol = ProxyProtocol.valueOf(proxyProtocolString.toUpperCase());
+            } catch (IllegalArgumentException e) {
+                System.out.println("Incorrect proxyProtocol name '" + proxyProtocolString + "'");
+                e.printStackTrace();
+                System.exit(-1);
+            }
+        }
     }
 
     private void updateConfig() throws UnsupportedAuthenticationException {
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/package-info.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/package-info.java
index 03c08b919ae14..c3a57b75a490d 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/package-info.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/AdminShell.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/AdminShell.java
index b5a4247c69564..e139697860229 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/AdminShell.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/AdminShell.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ClientShell.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ClientShell.java
index 71cce52408faa..6ba96e046374a 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ClientShell.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ClientShell.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ConfigShell.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ConfigShell.java
index 727104980179a..038583b19679b 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ConfigShell.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ConfigShell.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -112,6 +112,7 @@ public void setupState(Properties properties) {
 
         commands.put("list", new CmdConfigList());
         commands.put("create", new CmdConfigCreate());
+        commands.put("clone", new CmdConfigClone());
         commands.put("update", new CmdConfigUpdate());
         commands.put("delete", new CmdConfigDelete());
         commands.put("use", new CmdConfigUse());
@@ -256,6 +257,9 @@ public boolean run() {
     @Parameters(commandDescription = "Create a new configuration.")
     private class CmdConfigCreate extends CmdConfigPut {
 
+        @Parameter(description = "Configuration name", required = true)
+        protected String name;
+
         @Override
         @SneakyThrows
         boolean verifyCondition() {
@@ -266,11 +270,20 @@ boolean verifyCondition() {
             }
             return true;
         }
+
+        @Override
+        String name() {
+            return name;
+        }
     }
 
     @Parameters(commandDescription = "Update an existing configuration.")
     private class CmdConfigUpdate extends CmdConfigPut {
 
+        @Parameter(description = "Configuration name", required = true)
+        @JCommanderCompleter.ParameterCompleter(type = JCommanderCompleter.ParameterCompleter.Type.CONFIGS)
+        protected String name;
+
         @Override
         @SneakyThrows
         boolean verifyCondition() {
@@ -285,14 +298,15 @@ boolean verifyCondition() {
             }
             return true;
         }
+
+        @Override
+        String name() {
+            return name;
+        }
     }
 
     private abstract class CmdConfigPut implements RunnableWithResult {
 
-        @Parameter(description = "Configuration name", required = true)
-        @JCommanderCompleter.ParameterCompleter(type = JCommanderCompleter.ParameterCompleter.Type.CONFIGS)
-        protected String name;
-
         @Parameter(names = {"--url"}, description = "URL of the config")
         protected String url;
 
@@ -309,6 +323,7 @@ public boolean run() {
             if (!verifyCondition()) {
                 return false;
             }
+            final String name = name();
             final String value;
             if (inlineValue != null) {
                 if (inlineValue.startsWith("base64:")) {
@@ -346,11 +361,41 @@ public boolean run() {
             return true;
         }
 
-
+        abstract String name();
 
         abstract boolean verifyCondition();
     }
 
+
+    private class CmdConfigClone implements RunnableWithResult {
+
+        @Parameter(description = "Configuration to clone", required = true)
+        @JCommanderCompleter.ParameterCompleter(type = JCommanderCompleter.ParameterCompleter.Type.CONFIGS)
+        protected String cloneFrom;
+
+        @Parameter(names = {"--name"}, description = "Name of the new config", required = true)
+        protected String newName;
+
+        @Override
+        @SneakyThrows
+        public boolean run() {
+            if (DEFAULT_CONFIG.equals(newName) || configStore.getConfig(newName) != null) {
+                print("'" + newName + "' already exists.");
+                return false;
+            }
+            final ConfigStore.ConfigEntry config = configStore.getConfig(cloneFrom);
+            if (config == null) {
+                print("Config '" + config + "' does not exist.");
+                return false;
+            }
+
+            final ConfigStore.ConfigEntry entry = new ConfigStore.ConfigEntry(newName, config.getValue());
+            configStore.putConfig(entry);
+            reloadIfCurrent(entry);
+            return true;
+        }
+    }
+
     private void reloadIfCurrent(ConfigStore.ConfigEntry entry) throws Exception {
         if (currentConfig.equals(entry.getName())) {
             final Properties properties = new Properties();
@@ -382,7 +427,7 @@ public boolean run() {
             }
 
             if (propertyValue == null) {
-                print("-v parameter is required. you can pass an empty value to empty the property. (-v= )");
+                print("-v parameter is required. You can pass an empty value to empty the property. (-v= )");
                 return false;
             }
 
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/JCommanderCompleter.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/JCommanderCompleter.java
index 4f75243ccd0cd..937f9cac04562 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/JCommanderCompleter.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/JCommanderCompleter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/OptionStrictArgumentCompleter.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/OptionStrictArgumentCompleter.java
index e609438622879..3a088d28757d0 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/OptionStrictArgumentCompleter.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/OptionStrictArgumentCompleter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java
index 24a222e0e7f7c..257e00fd14242 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/PulsarShell.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -122,6 +122,10 @@ static final class MainOptions {
         boolean noProgress;
     }
 
+    enum ExecState {
+        IDLE,
+        RUNNING
+    }
     private Properties properties;
     @Getter
     private final ConfigStore configStore;
@@ -132,6 +136,7 @@ static final class MainOptions {
     private Function, InteractiveLineReader> readerBuilder;
     private InteractiveLineReader reader;
     private final ConfigShell configShell;
+    private ExecState execState = ExecState.IDLE;
 
     public PulsarShell(String args[]) throws IOException {
         this(args, new Properties());
@@ -217,7 +222,18 @@ public void reload(Properties properties) throws Exception {
     }
 
     public void run() throws Exception {
-        final Terminal terminal = TerminalBuilder.builder().build();
+        final Terminal terminal = TerminalBuilder.builder()
+                .nativeSignals(true)
+                .signalHandler(signal -> {
+                    if (signal == Terminal.Signal.INT || signal == Terminal.Signal.QUIT) {
+                        if (execState == ExecState.RUNNING) {
+                            throw new InterruptShellException();
+                        } else {
+                            exit(0);
+                        }
+                    }
+                })
+                .build();
         run((providersMap) -> {
             List completers = new ArrayList<>();
             String serviceUrl = "";
@@ -404,6 +420,7 @@ public List readCommand() {
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> quit(terminal)));
         while (true) {
+            execState = ExecState.IDLE;
             final List words;
             try {
                 words = commandReader.readCommand();
@@ -411,6 +428,7 @@ public List readCommand() {
                 exit(0);
                 return;
             }
+            execState = ExecState.RUNNING;
             final String line = words.stream().collect(Collectors.joining(" "));
             if (StringUtils.isBlank(line)) {
                 continue;
@@ -434,6 +452,8 @@ public List readCommand() {
             try {
                 printExecutingCommands(terminal, commandsInfo, false);
                 commandOk = pulsarShellCommandsProvider.runCommand(argv);
+            } catch (InterruptShellException t) {
+                // no-op
             } catch (Throwable t) {
                 t.printStackTrace(terminal.writer());
             } finally {
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ShellCommandsProvider.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ShellCommandsProvider.java
index a99df1ceaa4f7..069ee01d4dcd8 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ShellCommandsProvider.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/ShellCommandsProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/ConfigStore.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/ConfigStore.java
index 4dc6bbb2c51af..76331cf567e36 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/ConfigStore.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/ConfigStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/FileConfigStore.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/FileConfigStore.java
index 0d50eb0240c40..992c12ee329b9 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/FileConfigStore.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/FileConfigStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/package-info.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/package-info.java
index 7f4c6f3bcd086..b0cd91a3eab03 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/package-info.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/config/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/package-info.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/package-info.java
index 5159d16e7c91d..6988b18ed0c65 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/package-info.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/shell/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdClusters.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdClusters.java
index 5f38a28f27337..ed141301e8128 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdClusters.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdClusters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdFunctionWorker.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdFunctionWorker.java
index d291ccc1e4fe8..355753cd08f83 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdFunctionWorker.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdFunctionWorker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdNamespaceIsolationPolicy.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdNamespaceIsolationPolicy.java
index 2eca5a5180fe2..8a32249662dd4 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdNamespaceIsolationPolicy.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdNamespaceIsolationPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
index 23daf81362ce6..6702b7d1d81d2 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
index 1cb86102802e0..84ababa725099 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
index fe9075540638c..ed90748f40f75 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdTopics.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdTopics.java
index 165efe5ef4f80..a1c3d6f902cad 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdTopics.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdTopics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
index 364293da7ebdb..3ac7abf0efc41 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdConsume.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdConsume.java
index 07e56fc16f036..bf497065cdd9a 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdConsume.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdConsume.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdProduce.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdProduce.java
index bc80d32e1cddc..a9063bfadcc9a 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdProduce.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/client/cli/TestCmdProduce.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/AdminShellTest.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/AdminShellTest.java
index 33d66bba99e63..2f53546d7bb4a 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/AdminShellTest.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/AdminShellTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/ConfigShellTest.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/ConfigShellTest.java
index db186ff4a85b5..cbca4a74da402 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/ConfigShellTest.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/ConfigShellTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -143,6 +143,16 @@ public void test() throws Exception {
                 "--file", newClientConf.toFile().getAbsolutePath()}));
         assertTrue(output.isEmpty());
         verify(pulsarShell, times(2)).reload(any());
+
+        assertTrue(runCommand(new String[]{"clone", "myclient",
+                "--name", "myclient-copied"}));
+        assertTrue(output.isEmpty());
+        verify(pulsarShell, times(2)).reload(any());
+
+        assertTrue(runCommand(new String[]{"view", "myclient-copied"}));
+        assertEquals(output.get(0), "webServiceUrl=http://localhost:8081/\nbrokerServiceUrl" +
+                "=pulsar://localhost:6651/\n");
+        output.clear();
     }
 
     @Test
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/JCommanderCompleterTest.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/JCommanderCompleterTest.java
index 455bfd6b44400..09981b100046e 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/JCommanderCompleterTest.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/JCommanderCompleterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/PulsarShellTest.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/PulsarShellTest.java
index 621e931635dbd..2afb6f35b22c4 100644
--- a/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/PulsarShellTest.java
+++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/shell/PulsarShellTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index 8cf75e89f52ea..a371b061073d5 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -288,4 +288,20 @@
       
     
   
+  
+    
+      skipTestsForUnitGroupOther
+      
+        
+          
+            org.apache.maven.plugins
+            maven-surefire-plugin
+            
+              true
+            
+          
+        
+      
+    
+  
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AbstractBatchMessageContainer.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AbstractBatchMessageContainer.java
index 784d1e05ac6e2..1827142cdfa2b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AbstractBatchMessageContainer.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AbstractBatchMessageContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -42,6 +42,7 @@ public abstract class AbstractBatchMessageContainer implements BatchMessageConta
     protected int maxBytesInBatch;
     protected int numMessagesInBatch = 0;
     protected long currentBatchSizeBytes = 0;
+    protected int batchAllocatedSizeBytes = 0;
 
     protected long currentTxnidMostBits = -1L;
     protected long currentTxnidLeastBits = -1L;
@@ -84,6 +85,11 @@ public long getCurrentBatchSize() {
         return currentBatchSizeBytes;
     }
 
+    @Override
+    public int getBatchAllocatedSizeBytes() {
+        return batchAllocatedSizeBytes;
+    }
+
     int getMaxBatchSize() {
         return maxBatchSize;
     }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AcknowledgmentsGroupingTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AcknowledgmentsGroupingTracker.java
index 8e44b7bc0cab2..d46af1a99e7f0 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AcknowledgmentsGroupingTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AcknowledgmentsGroupingTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AuthenticationUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AuthenticationUtil.java
index a3a7db02c87bf..e2d9f0692433e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AuthenticationUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AuthenticationUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -43,9 +43,14 @@ public static Map configureFromPulsar1AuthParamString(String aut
         if (isNotBlank(authParamsString)) {
             String[] params = authParamsString.split(",");
             for (String p : params) {
-                String[] kv = p.split(":");
-                if (kv.length == 2) {
-                    authParams.put(kv[0], kv[1]);
+                // The value could be a file path, which could contain a colon like "C:\\path\\to\\file" on Windows.
+                int index = p.indexOf(':');
+                if (index < 0) {
+                    continue;
+                }
+                String key = p.substring(0, index);
+                if (!key.isEmpty()) {
+                    authParams.put(key, p.substring(index + 1));
                 }
             }
         }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AutoClusterFailover.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AutoClusterFailover.java
index 7138c79bd9ecb..94e8026b7010e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AutoClusterFailover.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/AutoClusterFailover.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,7 +20,6 @@
 
 import static org.apache.pulsar.common.util.Runnables.catchingAndLoggingThrowables;
 import com.google.common.base.Strings;
-import io.netty.util.concurrent.DefaultThreadFactory;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -38,6 +37,7 @@
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.ServiceUrlProvider;
 import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
+import org.apache.pulsar.client.util.ExecutorProvider;
 
 @Slf4j
 @Data
@@ -80,7 +80,7 @@ private AutoClusterFailover(AutoClusterFailoverBuilderImpl builder) {
         this.intervalMs = builder.checkIntervalMs;
         this.resolver = new PulsarServiceNameResolver();
         this.executor = Executors.newSingleThreadScheduledExecutor(
-                new DefaultThreadFactory("pulsar-service-provider"));
+                new ExecutorProvider.ExtendedThreadFactory("pulsar-service-provider"));
     }
 
     @Override
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java
index 45c9de0fdf120..daaf349940035 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BackoffBuilder.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BackoffBuilder.java
index 4fc81055d719e..9913393fa9aa9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BackoffBuilder.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BackoffBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java
index 53da44809d6f3..1c9b66fd2bad5 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabled.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabled.java
index 538ee91ec1deb..b70c928b29650 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabled.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerBase.java
index 27d82c756b83c..8fb4e9f2ce543 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerBase.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
index 99e82a8c765d8..c601f51a72527 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -102,6 +102,7 @@ public boolean add(MessageImpl msg, SendCallback callback) {
                 this.firstCallback = callback;
                 batchedMessageMetadataAndPayload = allocator.buffer(
                         Math.min(maxBatchSize, ClientCnx.getMaxMessageSize()));
+                updateAndReserveBatchAllocatedSize(batchedMessageMetadataAndPayload.capacity());
                 if (msg.getMessageBuilder().hasTxnidMostBits() && currentTxnidMostBits == -1) {
                     currentTxnidMostBits = msg.getMessageBuilder().getTxnidMostBits();
                 }
@@ -111,7 +112,8 @@ public boolean add(MessageImpl msg, SendCallback callback) {
             } catch (Throwable e) {
                 log.error("construct first message failed, exception is ", e);
                 producer.semaphoreRelease(getNumMessagesInBatch());
-                producer.client.getMemoryLimitController().releaseMemory(msg.getUncompressedSize());
+                producer.client.getMemoryLimitController().releaseMemory(msg.getUncompressedSize()
+                        + batchAllocatedSizeBytes);
                 discard(new PulsarClientException(e));
                 return false;
             }
@@ -207,6 +209,7 @@ public void clear() {
         batchedMessageMetadataAndPayload = null;
         currentTxnidMostBits = -1L;
         currentTxnidLeastBits = -1L;
+        batchAllocatedSizeBytes = 0;
     }
 
     @Override
@@ -243,6 +246,7 @@ public OpSendMsg createOpSendMsg() throws IOException {
             messageMetadata.clear();
             messageMetadata.copyFrom(messages.get(0).getMessageBuilder());
             ByteBuf encryptedPayload = producer.encryptMessage(messageMetadata, getCompressedBatchMetadataAndPayload());
+            updateAndReserveBatchAllocatedSize(encryptedPayload.capacity());
             ByteBufPair cmd = producer.sendMessage(producer.producerId, messageMetadata.getSequenceId(),
                 1, null, messageMetadata, encryptedPayload);
             final OpSendMsg op;
@@ -252,7 +256,8 @@ public OpSendMsg createOpSendMsg() throws IOException {
             // Because when invoke `ProducerImpl.processOpSendMsg` on flush,
             // if `op.msg != null && isBatchMessagingEnabled()` checks true, it will call `batchMessageAndSend` to flush
             // messageContainers before publishing this one-batch message.
-            op = OpSendMsg.create(messages, cmd, messageMetadata.getSequenceId(), firstCallback);
+            op = OpSendMsg.create(messages, cmd, messageMetadata.getSequenceId(), firstCallback,
+                    batchAllocatedSizeBytes);
 
             // NumMessagesInBatch and BatchSizeByte will not be serialized to the binary cmd. It's just useful for the
             // ProducerStats
@@ -262,7 +267,8 @@ public OpSendMsg createOpSendMsg() throws IOException {
             // handle mgs size check as non-batched in `ProducerImpl.isMessageSizeExceeded`
             if (op.getMessageHeaderAndPayloadSize() > ClientCnx.getMaxMessageSize()) {
                 producer.semaphoreRelease(1);
-                producer.client.getMemoryLimitController().releaseMemory(messages.get(0).getUncompressedSize());
+                producer.client.getMemoryLimitController().releaseMemory(
+                        messages.get(0).getUncompressedSize() + batchAllocatedSizeBytes);
                 discard(new PulsarClientException.InvalidMessageException(
                     "Message size is bigger than " + ClientCnx.getMaxMessageSize() + " bytes"));
                 return null;
@@ -270,12 +276,13 @@ public OpSendMsg createOpSendMsg() throws IOException {
             lowestSequenceId = -1L;
             return op;
         }
-
         ByteBuf encryptedPayload = producer.encryptMessage(messageMetadata, getCompressedBatchMetadataAndPayload());
+        updateAndReserveBatchAllocatedSize(encryptedPayload.capacity());
         if (encryptedPayload.readableBytes() > ClientCnx.getMaxMessageSize()) {
             producer.semaphoreRelease(messages.size());
             messages.forEach(msg -> producer.client.getMemoryLimitController()
                     .releaseMemory(msg.getUncompressedSize()));
+            producer.client.getMemoryLimitController().releaseMemory(batchAllocatedSizeBytes);
             discard(new PulsarClientException.InvalidMessageException(
                     "Message size is bigger than " + ClientCnx.getMaxMessageSize() + " bytes"));
             return null;
@@ -293,7 +300,7 @@ public OpSendMsg createOpSendMsg() throws IOException {
                 messageMetadata.getHighestSequenceId(), numMessagesInBatch, messageMetadata, encryptedPayload);
 
         OpSendMsg op = OpSendMsg.create(messages, cmd, messageMetadata.getSequenceId(),
-                messageMetadata.getHighestSequenceId(), firstCallback);
+                messageMetadata.getHighestSequenceId(), firstCallback, batchAllocatedSizeBytes);
 
         op.setNumMessagesInBatch(numMessagesInBatch);
         op.setBatchSizeByte(currentBatchSizeBytes);
@@ -301,6 +308,14 @@ public OpSendMsg createOpSendMsg() throws IOException {
         return op;
     }
 
+    private void updateAndReserveBatchAllocatedSize(int updatedSizeBytes) {
+        int delta = updatedSizeBytes - batchAllocatedSizeBytes;
+        batchAllocatedSizeBytes = updatedSizeBytes;
+        if (delta != 0) {
+            producer.client.getMemoryLimitController().forceReserveMemory(delta);
+        }
+    }
+
     @Override
     public boolean hasSameSchema(MessageImpl msg) {
         if (numMessagesInBatch == 0) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java
index ee25d504cf9fe..fab0ceeca33ca 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageKeyBasedContainer.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageKeyBasedContainer.java
index f0d4601d568a9..45d683e72b0a3 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageKeyBasedContainer.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageKeyBasedContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -67,6 +67,7 @@ public void clear() {
         batches.clear();
         currentTxnidMostBits = -1L;
         currentTxnidLeastBits = -1L;
+        batchAllocatedSizeBytes = 0;
     }
 
     @Override
@@ -85,6 +86,11 @@ public boolean isMultiBatches() {
         return true;
     }
 
+    @Override
+    public int getBatchAllocatedSizeBytes() {
+        return batches.values().stream().mapToInt(AbstractBatchMessageContainer::getBatchAllocatedSizeBytes).sum();
+    }
+
     @Override
     public List createOpSendMsgs() throws IOException {
         try {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BinaryProtoLookupService.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BinaryProtoLookupService.java
index e0b85d7bb34a0..d5ce9213211dd 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BinaryProtoLookupService.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BinaryProtoLookupService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ChunkMessageIdImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ChunkMessageIdImpl.java
index d8a616360977a..28d5047c8ef25 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ChunkMessageIdImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ChunkMessageIdImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
index 68111407ccefc..9a65a1abd1c7c 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
index a40b80727c875..8b46aec2e0c31 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -807,7 +807,8 @@ public CompletableFuture newLookup(ByteBuf request, long reque
 
         if (pendingLookupRequestSemaphore.tryAcquire()) {
             future.whenComplete((lookupDataResult, throwable) -> {
-                if (throwable instanceof ConnectException) {
+                if (throwable instanceof ConnectException
+                        || throwable instanceof PulsarClientException.LookupException) {
                     pendingLookupRequestSemaphore.release();
                 }
             });
@@ -1112,6 +1113,7 @@ public CompletableFuture newWatchTopicListClose(
                 Commands.serializeWithSize(commandWatchTopicListClose), requestId, RequestType.Command, true);
     }
 
+    @Override
     protected void handleCommandWatchTopicListSuccess(CommandWatchTopicListSuccess commandWatchTopicListSuccess) {
         checkArgument(state == State.Ready);
 
@@ -1130,6 +1132,7 @@ protected void handleCommandWatchTopicListSuccess(CommandWatchTopicListSuccess c
         }
     }
 
+    @Override
     protected void handleCommandWatchTopicUpdate(CommandWatchTopicUpdate commandWatchTopicUpdate) {
         checkArgument(state == State.Ready);
 
@@ -1292,7 +1295,10 @@ private void checkRequestTimeout() {
                 // if there is no request that is timed out then exit the loop
                 break;
             }
-            request = requestTimeoutQueue.poll();
+            if (!requestTimeoutQueue.remove(request)) {
+                // the request has been removed by another thread
+                continue;
+            }
             TimedCompletableFuture requestFuture = pendingRequests.get(request.requestId);
             if (requestFuture != null
                     && !requestFuture.hasGotResponse()) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnxIdleState.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnxIdleState.java
index e939cfae8b122..59d3309f248ac 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnxIdleState.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnxIdleState.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
index 4d74e560b463f..046cb90643a23 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
index 36f28fb575606..da522020f5129 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
index 07206820b95ae..3a8bb1867c91b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -38,6 +38,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.pulsar.client.api.BatchReceivePolicy;
@@ -56,6 +58,7 @@
 import org.apache.pulsar.client.impl.transaction.TransactionImpl;
 import org.apache.pulsar.client.util.ConsumerName;
 import org.apache.pulsar.client.util.ExecutorProvider;
+import org.apache.pulsar.client.util.NoOpLock;
 import org.apache.pulsar.common.api.proto.CommandAck.AckType;
 import org.apache.pulsar.common.api.proto.CommandSubscribe;
 import org.apache.pulsar.common.api.proto.CommandSubscribe.SubType;
@@ -94,6 +97,9 @@ public abstract class ConsumerBase extends HandlerState implements Consumer CONSUMER_EPOCH =
             AtomicLongFieldUpdater.newUpdater(ConsumerBase.class, "consumerEpoch");
 
@@ -159,6 +165,11 @@ protected ConsumerBase(PulsarClientImpl client, String topic, ConsumerConfigurat
         } else {
             this.batchReceivePolicy = BatchReceivePolicy.DEFAULT_POLICY;
         }
+        if (getSubType() == CommandSubscribe.SubType.Failover || getSubType() == CommandSubscribe.SubType.Exclusive) {
+            incomingQueueLock = new ReentrantLock();
+        } else {
+            incomingQueueLock = new NoOpLock();
+        }
 
         initReceiverQueueSize();
     }
@@ -836,12 +847,19 @@ protected boolean canEnqueueMessage(Message message) {
 
     protected boolean enqueueMessageAndCheckBatchReceive(Message message) {
         int messageSize = message.size();
-        if (canEnqueueMessage(message) && incomingMessages.offer(message)) {
-            // After we have enqueued the messages on `incomingMessages` queue, we cannot touch the message instance
-            // anymore, since for pooled messages, this instance was possibly already been released and recycled.
-            INCOMING_MESSAGES_SIZE_UPDATER.addAndGet(this, messageSize);
-            getMemoryLimitController().ifPresent(limiter -> limiter.forceReserveMemory(messageSize));
-            updateAutoScaleReceiverQueueHint();
+        // synchronize redeliverUnacknowledgedMessages().
+        incomingQueueLock.lock();
+        try {
+            if (canEnqueueMessage(message) && incomingMessages.offer(message)) {
+                // After we have enqueued the messages on `incomingMessages` queue, we cannot touch the message
+                // instance anymore, since for pooled messages, this instance was possibly already been released
+                // and recycled.
+                INCOMING_MESSAGES_SIZE_UPDATER.addAndGet(this, messageSize);
+                getMemoryLimitController().ifPresent(limiter -> limiter.forceReserveMemory(messageSize));
+                updateAutoScaleReceiverQueueHint();
+            }
+        } finally {
+            incomingQueueLock.unlock();
         }
         return hasEnoughMessagesForBatchReceive();
     }
@@ -957,7 +975,6 @@ protected void completePendingBatchReceive(CompletableFuture> future
 
     protected abstract void messageProcessed(Message msg);
 
-
     private void pendingBatchReceiveTask(Timeout timeout) {
         internalPinnedExecutor.execute(() -> doPendingBatchReceiveTask(timeout));
     }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
index d30e72aa53c5a..b14fd78e1208a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -184,11 +184,7 @@ public CompletableFuture> subscribeAsync() {
     public ConsumerBuilder topic(String... topicNames) {
         checkArgument(topicNames != null && topicNames.length > 0,
                 "Passed in topicNames should not be null or empty.");
-        Arrays.stream(topicNames).forEach(topicName ->
-                checkArgument(StringUtils.isNotBlank(topicName), "topicNames cannot have blank topic"));
-        conf.getTopicNames().addAll(Arrays.stream(topicNames).map(StringUtils::trim)
-                .collect(Collectors.toList()));
-        return this;
+        return topics(Arrays.stream(topicNames).collect(Collectors.toList()));
     }
 
     @Override
@@ -210,9 +206,7 @@ public ConsumerBuilder topicsPattern(Pattern topicsPattern) {
 
     @Override
     public ConsumerBuilder topicsPattern(String topicsPattern) {
-        checkArgument(conf.getTopicsPattern() == null, "Pattern has already been set.");
-        conf.setTopicsPattern(Pattern.compile(topicsPattern));
-        return this;
+        return topicsPattern(Pattern.compile(topicsPattern));
     }
 
     @Override
@@ -327,6 +321,13 @@ public ConsumerBuilder acknowledgmentGroupTime(long delay, TimeUnit unit) {
         return this;
     }
 
+    @Override
+    public ConsumerBuilder maxAcknowledgmentGroupSize(int messageNum) {
+        checkArgument(messageNum > 0, "acknowledgementsGroupSize needs to be > 0");
+        conf.setMaxAcknowledgmentGroupSize(messageNum);
+        return this;
+    }
+
     @Override
     public ConsumerBuilder consumerName(String consumerName) {
         checkArgument(StringUtils.isNotBlank(consumerName), "consumerName cannot be blank");
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerId.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerId.java
index 97ede0eb0b131..9e7658804b951 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerId.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerId.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index 01c49b3396e67..f4bd3a6bb6e8e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -64,7 +64,6 @@
 import java.util.stream.Collectors;
 import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.ConsumerCryptoFailureAction;
@@ -192,7 +191,7 @@ public class ConsumerImpl extends ConsumerBase implements ConnectionHandle
             ConcurrentOpenHashMap.newBuilder().build();
     private int pendingChunkedMessageCount = 0;
     protected long expireTimeOfIncompleteChunkedMessageMillis = 0;
-    private boolean expireChunkMessageTaskScheduled = false;
+    private final AtomicBoolean expireChunkMessageTaskScheduled = new AtomicBoolean(false);
     private final int maxPendingChunkedMessage;
     // if queue size is reasonable (most of the time equal to number of producers try to publish messages concurrently
     // on the topic) then it guards against broken chunked message which was not fully published
@@ -1275,9 +1274,9 @@ void messageReceived(CommandMessage cmdMessage, ByteBuf headersAndPayload, Clien
         final int numMessages = msgMetadata.getNumMessagesInBatch();
         final int numChunks = msgMetadata.hasNumChunksFromMsg() ? msgMetadata.getNumChunksFromMsg() : 0;
         final boolean isChunkedMessage = numChunks > 1;
-
         MessageIdImpl msgId = new MessageIdImpl(messageId.getLedgerId(), messageId.getEntryId(), getPartitionIndex());
-        if (acknowledgmentsGroupingTracker.isDuplicate(msgId)) {
+        if (numMessages == 1 && !msgMetadata.hasNumMessagesInBatch()
+                && acknowledgmentsGroupingTracker.isDuplicate(msgId)) {
             if (log.isDebugEnabled()) {
                 log.debug("[{}] [{}] Ignoring message as it was already being acked earlier by same consumer {}/{}",
                         topic, subscription, consumerName, msgId);
@@ -1389,30 +1388,31 @@ private ByteBuf processMessageChunk(ByteBuf compressedPayload, MessageMetadata m
             MessageIdData messageId, ClientCnx cnx) {
 
         // Lazy task scheduling to expire incomplete chunk message
-        if (!expireChunkMessageTaskScheduled && expireTimeOfIncompleteChunkedMessageMillis > 0) {
+        if (expireTimeOfIncompleteChunkedMessageMillis > 0 && expireChunkMessageTaskScheduled.compareAndSet(false,
+                true)) {
             ((ScheduledExecutorService) client.getScheduledExecutorProvider().getExecutor()).scheduleAtFixedRate(
                     () -> internalPinnedExecutor
                             .execute(catchingAndLoggingThrowables(this::removeExpireIncompleteChunkedMessages)),
                     expireTimeOfIncompleteChunkedMessageMillis, expireTimeOfIncompleteChunkedMessageMillis,
                     TimeUnit.MILLISECONDS
             );
-            expireChunkMessageTaskScheduled = true;
         }
 
-        if (msgMetadata.getChunkId() == 0) {
-            ByteBuf chunkedMsgBuffer = PulsarByteBufAllocator.DEFAULT.buffer(msgMetadata.getTotalChunkMsgSize(),
-                    msgMetadata.getTotalChunkMsgSize());
-            int totalChunks = msgMetadata.getNumChunksFromMsg();
-            chunkedMessagesMap.computeIfAbsent(msgMetadata.getUuid(),
-                    (key) -> ChunkedMessageCtx.get(totalChunks, chunkedMsgBuffer));
+        ChunkedMessageCtx chunkedMsgCtx = chunkedMessagesMap.get(msgMetadata.getUuid());
+
+        if (msgMetadata.getChunkId() == 0 && chunkedMsgCtx == null) {
             pendingChunkedMessageCount++;
             if (maxPendingChunkedMessage > 0 && pendingChunkedMessageCount > maxPendingChunkedMessage) {
                 removeOldestPendingChunkedMessage();
             }
+            int totalChunks = msgMetadata.getNumChunksFromMsg();
+            ByteBuf chunkedMsgBuffer = PulsarByteBufAllocator.DEFAULT.buffer(msgMetadata.getTotalChunkMsgSize(),
+                    msgMetadata.getTotalChunkMsgSize());
+            chunkedMsgCtx = chunkedMessagesMap.computeIfAbsent(msgMetadata.getUuid(),
+                    (key) -> ChunkedMessageCtx.get(totalChunks, chunkedMsgBuffer));
             pendingChunkedMessageUuidQueue.add(msgMetadata.getUuid());
         }
 
-        ChunkedMessageCtx chunkedMsgCtx = chunkedMessagesMap.get(msgMetadata.getUuid());
         // discard message if chunk is out-of-order
         if (chunkedMsgCtx == null || chunkedMsgCtx.chunkedMsgBuffer == null
                 || msgMetadata.getChunkId() != (chunkedMsgCtx.lastChunkedMessageId + 1)) {
@@ -1541,7 +1541,10 @@ void receiveIndividualMessagesFromBatch(BrokerEntryMetadata brokerEntryMetadata,
                         skippedMessages++;
                         continue;
                     }
-
+                }
+                if (acknowledgmentsGroupingTracker.isDuplicate(message.getMessageId())) {
+                    skippedMessages++;
+                    continue;
                 }
                 executeNotifyCallback(message);
             }
@@ -1858,65 +1861,63 @@ public int numMessagesInQueue() {
         return incomingMessages.size();
     }
 
-    public CompletableFuture internalRedeliverUnacknowledgedMessages() {
-        return CompletableFuture.runAsync(() -> {
-            // First : synchronized in order to handle consumer reconnect produce race condition, when broker receive
-            // redeliverUnacknowledgedMessages and consumer have not be created and then receive reconnect epoch
-            // change the broker is smaller than the client epoch, this will cause client epoch smaller
-            // than broker epoch forever. client will not receive message anymore.
-            // Second : we should synchronized `ClientCnx cnx = cnx()` to  prevent use old cnx to
-            // send redeliverUnacknowledgedMessages to a old broker
-            synchronized (ConsumerImpl.this) {
-                ClientCnx cnx = cnx();
-                // V1 don't support redeliverUnacknowledgedMessages
-                if (cnx != null && cnx.getRemoteEndpointProtocolVersion() < ProtocolVersion.v2.getValue()) {
-                    if ((getState() == State.Connecting)) {
-                        log.warn("[{}] Client Connection needs to be established "
-                                + "for redelivery of unacknowledged messages", this);
-                    } else {
-                        log.warn("[{}] Reconnecting the client to redeliver the messages.", this);
-                        cnx.ctx().close();
-                    }
-
-                    return;
+    @Override
+    public void redeliverUnacknowledgedMessages() {
+        // First : synchronized in order to handle consumer reconnect produce race condition, when broker receive
+        // redeliverUnacknowledgedMessages and consumer have not be created and
+        // then receive reconnect epoch change the broker is smaller than the client epoch, this will cause client epoch
+        // smaller than broker epoch forever. client will not receive message anymore.
+        // Second : we should synchronized `ClientCnx cnx = cnx()` to
+        // prevent use old cnx to send redeliverUnacknowledgedMessages to a old broker
+        synchronized (ConsumerImpl.this) {
+            ClientCnx cnx = cnx();
+            // V1 don't support redeliverUnacknowledgedMessages
+            if (cnx != null && cnx.getRemoteEndpointProtocolVersion() < ProtocolVersion.v2.getValue()) {
+                if ((getState() == State.Connecting)) {
+                    log.warn("[{}] Client Connection needs to be established "
+                            + "for redelivery of unacknowledged messages", this);
+                } else {
+                    log.warn("[{}] Reconnecting the client to redeliver the messages.", this);
+                    cnx.ctx().close();
                 }
 
+                return;
+            }
+
+            // clear local message
+            int currentSize;
+            incomingQueueLock.lock();
+            try {
                 // we should increase epoch every time, because MultiTopicsConsumerImpl also increase it,
                 // we need to keep both epochs the same
                 if (conf.getSubscriptionType() == SubscriptionType.Failover
                         || conf.getSubscriptionType() == SubscriptionType.Exclusive) {
                     CONSUMER_EPOCH.incrementAndGet(this);
                 }
+
                 // clear local message
-                int currentSize = incomingMessages.size();
+                currentSize = incomingMessages.size();
                 clearIncomingMessages();
                 unAckedMessageTracker.clear();
-                // is channel is connected, we should send redeliver command to broker
-                if (cnx != null && isConnected(cnx)) {
-                    cnx.ctx().writeAndFlush(Commands.newRedeliverUnacknowledgedMessages(
-                            consumerId, CONSUMER_EPOCH.get(this)), cnx.ctx().voidPromise());
-                    if (currentSize > 0) {
-                        increaseAvailablePermits(cnx, currentSize);
-                    }
-                    if (log.isDebugEnabled()) {
-                        log.debug("[{}] [{}] [{}] Redeliver unacked messages and send {} permits", subscription, topic,
-                                consumerName, currentSize);
-                    }
-                } else {
-                    log.warn("[{}] Send redeliver messages command but the client is reconnect or close, "
-                            + "so don't need to send redeliver command to broker", this);
-                }
+            } finally {
+                incomingQueueLock.unlock();
             }
-        }, internalPinnedExecutor);
-    }
 
-    @SneakyThrows
-    @Override
-    public void redeliverUnacknowledgedMessages() {
-        try {
-            internalRedeliverUnacknowledgedMessages().get();
-        } catch (ExecutionException e) {
-            throw e.getCause();
+            // is channel is connected, we should send redeliver command to broker
+            if (cnx != null && isConnected(cnx)) {
+                cnx.ctx().writeAndFlush(Commands.newRedeliverUnacknowledgedMessages(
+                        consumerId, CONSUMER_EPOCH.get(this)), cnx.ctx().voidPromise());
+                if (currentSize > 0) {
+                    increaseAvailablePermits(cnx, currentSize);
+                }
+                if (log.isDebugEnabled()) {
+                    log.debug("[{}] [{}] [{}] Redeliver unacked messages and send {} permits", subscription, topic,
+                            consumerName, currentSize);
+                }
+            } else {
+                log.warn("[{}] Send redeliver messages command but the client is reconnect or close, "
+                        + "so don't need to send redeliver command to broker", this);
+            }
         }
     }
 
@@ -2277,11 +2278,8 @@ public CompletableFuture hasMessageAvailableAsync() {
 
             getLastMessageIdAsync().thenAccept(messageId -> {
                 lastMessageIdInBroker = messageId;
-                if (hasMoreMessages(lastMessageIdInBroker, startMessageId, resetIncludeHead)) {
-                    completehasMessageAvailableWithValue(booleanFuture, true);
-                } else {
-                    completehasMessageAvailableWithValue(booleanFuture, false);
-                }
+                completehasMessageAvailableWithValue(booleanFuture,
+                        hasMoreMessages(lastMessageIdInBroker, startMessageId, resetIncludeHead));
             }).exceptionally(e -> {
                 log.error("[{}][{}] Failed getLastMessageId command", topic, subscription);
                 booleanFuture.completeExceptionally(e.getCause());
@@ -2297,11 +2295,8 @@ public CompletableFuture hasMessageAvailableAsync() {
 
             getLastMessageIdAsync().thenAccept(messageId -> {
                 lastMessageIdInBroker = messageId;
-                if (hasMoreMessages(lastMessageIdInBroker, lastDequeuedMessageId, false)) {
-                    completehasMessageAvailableWithValue(booleanFuture, true);
-                } else {
-                    completehasMessageAvailableWithValue(booleanFuture, false);
-                }
+                completehasMessageAvailableWithValue(booleanFuture,
+                        hasMoreMessages(lastMessageIdInBroker, lastDequeuedMessageId, false));
             }).exceptionally(e -> {
                 log.error("[{}][{}] Failed getLastMessageId command", topic, subscription);
                 booleanFuture.completeExceptionally(e.getCause());
@@ -2324,12 +2319,8 @@ private boolean hasMoreMessages(MessageId lastMessageIdInBroker, MessageId messa
             return true;
         }
 
-        if (!inclusive && lastMessageIdInBroker.compareTo(messageId) > 0
-                && ((MessageIdImpl) lastMessageIdInBroker).getEntryId() != -1) {
-            return true;
-        }
-
-        return false;
+        return !inclusive && lastMessageIdInBroker.compareTo(messageId) > 0
+                && ((MessageIdImpl) lastMessageIdInBroker).getEntryId() != -1;
     }
 
     private static final class GetLastMessageIdResponse {
@@ -2385,7 +2376,9 @@ private void internalGetLastMessageIdAsync(final Backoff backoff,
 
             long requestId = client.newRequestId();
             ByteBuf getLastIdCmd = Commands.newGetLastMessageId(consumerId, requestId);
-            log.info("[{}][{}] Get topic last message Id", topic, subscription);
+            if (log.isDebugEnabled()) {
+                log.debug("[{}][{}] Get topic last message Id", topic, subscription);
+            }
 
             cnx.sendGetLastMessageId(getLastIdCmd, requestId).thenAccept(cmd -> {
                 MessageIdData lastMessageId = cmd.getLastMessageId();
@@ -2394,8 +2387,10 @@ private void internalGetLastMessageIdAsync(final Backoff backoff,
                     markDeletePosition = new MessageIdImpl(cmd.getConsumerMarkDeletePosition().getLedgerId(),
                             cmd.getConsumerMarkDeletePosition().getEntryId(), -1);
                 }
-                log.info("[{}][{}] Successfully getLastMessageId {}:{}",
-                    topic, subscription, lastMessageId.getLedgerId(), lastMessageId.getEntryId());
+                if (log.isDebugEnabled()) {
+                    log.debug("[{}][{}] Successfully getLastMessageId {}:{}",
+                        topic, subscription, lastMessageId.getLedgerId(), lastMessageId.getEntryId());
+                }
 
                 MessageId lastMsgId = lastMessageId.getBatchIndex() <= 0
                         ? new MessageIdImpl(lastMessageId.getLedgerId(),
@@ -2787,6 +2782,12 @@ public Map>> getPossibleSendToDeadLetterTopic
         return possibleSendToDeadLetterTopicMessages;
     }
 
+    boolean isAckReceiptEnabled() {
+        ClientCnx cnx = getClientCnx();
+        return conf.isAckReceiptEnabled() && cnx != null
+                && Commands.peerSupportsAckReceipt(cnx.getRemoteEndpointProtocolVersion());
+    }
+
     private static final Logger log = LoggerFactory.getLogger(ConsumerImpl.class);
 
 }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerInterceptors.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerInterceptors.java
index 0b8a7294781f5..832dc0bacaee9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerInterceptors.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerInterceptors.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsDisabled.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsDisabled.java
index 3fa3f686fdf1c..e8719753befd1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsDisabled.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsDisabled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorder.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorder.java
index 81b02435b44aa..1a7de725f31b6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorder.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorderImpl.java
index a41e036e516c0..3aad7d3d4a7fc 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerStatsRecorderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
index 98ab5362a5612..4ab1977d0fb26 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -25,7 +25,6 @@
 import com.google.common.base.Strings;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
-import io.netty.util.concurrent.DefaultThreadFactory;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
@@ -44,6 +43,7 @@
 import org.apache.pulsar.client.api.ControlledClusterFailoverBuilder;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.ServiceUrlProvider;
+import org.apache.pulsar.client.util.ExecutorProvider;
 import org.apache.pulsar.common.util.ObjectMapperFactory;
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
@@ -74,7 +74,7 @@ private ControlledClusterFailover(ControlledClusterFailoverBuilderImpl builder)
         this.currentPulsarServiceUrl = builder.defaultServiceUrl;
         this.interval = builder.interval;
         this.executor = Executors.newSingleThreadScheduledExecutor(
-                new DefaultThreadFactory("pulsar-service-provider"));
+                new ExecutorProvider.ExtendedThreadFactory("pulsar-service-provider"));
 
         this.httpClient = buildHttpClient();
         this.requestBuilder = httpClient.prepareGet(builder.urlProvider)
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultBatcherBuilder.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultBatcherBuilder.java
index 270706e891702..0a3d23f59911f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultBatcherBuilder.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultBatcherBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReader.java
index 25773b1f81f7f..18b9890901ba7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderBuilder.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderBuilder.java
index f530cba808f53..dc0286343106a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderBuilder.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HandlerState.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HandlerState.java
index 6489369ed3bed..25c133391cb65 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HandlerState.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HandlerState.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Hash.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Hash.java
index eb899df3848ce..fe227b0d1f692 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Hash.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Hash.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpClient.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpClient.java
index 68082f65be6d1..4283c916b5f17 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpClient.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java
index d42bde828bcd7..7969ce402363f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/JavaStringHash.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/JavaStringHash.java
index e005baeb23278..5106cabdfc96f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/JavaStringHash.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/JavaStringHash.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/KeyBasedBatcherBuilder.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/KeyBasedBatcherBuilder.java
index 78e60326911ec..f5fb544bc84d9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/KeyBasedBatcherBuilder.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/KeyBasedBatcherBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/LookupService.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/LookupService.java
index c1c93f36c6e56..48ef67eae2047 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/LookupService.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/LookupService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MemoryLimitController.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MemoryLimitController.java
index ac437be33f8a7..935e3fad2b59d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MemoryLimitController.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MemoryLimitController.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageIdImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageIdImpl.java
index 25f7f93c23984..26f236cdfb15f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageIdImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageIdImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -155,8 +155,14 @@ public static MessageId fromByteArrayWithTopic(byte[] data, TopicName topicName)
 
         MessageId messageId;
         if (idData.hasBatchIndex()) {
-            messageId = new BatchMessageIdImpl(idData.getLedgerId(), idData.getEntryId(), idData.getPartition(),
-                idData.getBatchIndex(), idData.getBatchSize(), BatchMessageAcker.newAcker(idData.getBatchSize()));
+            if (idData.hasBatchSize()) {
+                messageId = new BatchMessageIdImpl(idData.getLedgerId(), idData.getEntryId(), idData.getPartition(),
+                        idData.getBatchIndex(), idData.getBatchSize(),
+                        BatchMessageAcker.newAcker(idData.getBatchSize()));
+            } else {
+                messageId = new BatchMessageIdImpl(idData.getLedgerId(), idData.getEntryId(), idData.getPartition(),
+                        idData.getBatchIndex(), 0, BatchMessageAckerDisabled.INSTANCE);
+            }
         } else {
             messageId = new MessageIdImpl(idData.getLedgerId(), idData.getEntryId(), idData.getPartition());
         }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageImpl.java
index ac63fd056c8d7..0b6fb608ee62b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadContextImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadContextImpl.java
index c4eb2643b5265..dcae86bd01a3b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadContextImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadContextImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadFactoryImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadFactoryImpl.java
index 70a5b5616e6c6..13a8ee9f8a2cc 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadFactoryImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadFactoryImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadImpl.java
index d99cd8311f914..02e1bd62f9b77 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadUtils.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadUtils.java
index 64faffe3da826..339e5967bb72e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadUtils.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagePayloadUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRouterBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRouterBase.java
index a4823d476edae..d5935dcd6cbf7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRouterBase.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRouterBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java
index e0a54c50fed0f..d4cd36a22e15f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessagesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiMessageIdImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiMessageIdImpl.java
index dfe995e57931e..b6accaf4cf4c4 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiMessageIdImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiMessageIdImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicConsumerStatsRecorderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicConsumerStatsRecorderImpl.java
new file mode 100644
index 0000000000000..17018be02befc
--- /dev/null
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicConsumerStatsRecorderImpl.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.impl;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.ConsumerStats;
+import org.apache.pulsar.client.api.MultiTopicConsumerStats;
+import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MultiTopicConsumerStatsRecorderImpl extends ConsumerStatsRecorderImpl implements MultiTopicConsumerStats {
+
+    private static final long serialVersionUID = 1L;
+    private Map partitionStats = new ConcurrentHashMap<>();
+
+    public MultiTopicConsumerStatsRecorderImpl() {
+        super();
+    }
+
+    public MultiTopicConsumerStatsRecorderImpl(Consumer consumer) {
+        super(consumer);
+    }
+
+    public MultiTopicConsumerStatsRecorderImpl(PulsarClientImpl pulsarClient, ConsumerConfigurationData conf,
+            Consumer consumer) {
+        super(pulsarClient, conf, consumer);
+    }
+
+    public void updateCumulativeStats(String partition, ConsumerStats stats) {
+        super.updateCumulativeStats(stats);
+        partitionStats.put(partition, stats);
+    }
+
+    @Override
+    public Map getPartitionStats() {
+        return partitionStats;
+    }
+
+    private static final Logger log = LoggerFactory.getLogger(MultiTopicConsumerStatsRecorderImpl.class);
+}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
index b45d60b364ad0..2e541c347fd36 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -48,7 +48,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import lombok.SneakyThrows;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pulsar.client.api.BatchReceivePolicy;
 import org.apache.pulsar.client.api.Consumer;
@@ -95,7 +94,7 @@ public class MultiTopicsConsumerImpl extends ConsumerBase {
     private volatile Timeout partitionsAutoUpdateTimeout = null;
     TopicsPartitionChangedListener topicsPartitionChangedListener;
     CompletableFuture partitionsAutoUpdateFuture = null;
-    private final ConsumerStatsRecorder stats;
+    private final MultiTopicConsumerStatsRecorderImpl stats;
     private UnAckedMessageTracker unAckedMessageTracker;
     private final ConsumerConfigurationData internalConfig;
 
@@ -156,7 +155,7 @@ public class MultiTopicsConsumerImpl extends ConsumerBase {
 
         this.internalConfig = getInternalConsumerConfig();
         this.stats = client.getConfiguration().getStatsIntervalSeconds() > 0
-                ? new ConsumerStatsRecorderImpl(this)
+                ? new MultiTopicConsumerStatsRecorderImpl(this)
                 : null;
 
         // start track and auto subscribe partition increment
@@ -173,8 +172,7 @@ public class MultiTopicsConsumerImpl extends ConsumerBase {
             return;
         }
 
-        checkArgument(conf.getTopicNames().isEmpty()
-                || topicNamesValid(conf.getTopicNames()), "Topics is empty or invalid.");
+        checkArgument(topicNamesValid(conf.getTopicNames()), "Topics is invalid.");
 
         List> futures = conf.getTopicNames().stream()
                 .map(t -> subscribeAsync(t, createTopicIfDoesNotExist))
@@ -257,8 +255,16 @@ private void receiveMessageFromConsumer(ConsumerImpl consumer, boolean batchR
                 log.debug("[{}] [{}] Receive message from sub consumer:{}",
                     topic, subscription, consumer.getTopic());
             }
+            // Stop to process the remaining message after the consumer is closed.
+            if (getState() == State.Closed) {
+                return;
+            }
             // Process the message, add to the queue and trigger listener or async callback
-            messages.forEach(msg -> messageReceived(consumer, msg));
+            messages.forEach(msg -> {
+                if (isValidConsumerEpoch((MessageImpl) msg)) {
+                    messageReceived(consumer, msg);
+                }
+            });
 
             int size = incomingMessages.size();
             int maxReceiverQueueSize = getCurrentReceiverQueueSize();
@@ -563,14 +569,14 @@ public CompletableFuture unsubscribeAsync() {
             .map(ConsumerImpl::unsubscribeAsync).collect(Collectors.toList());
 
         FutureUtil.waitForAll(futureList)
-            .thenCompose((r) -> {
+            .thenComposeAsync((r) -> {
                 setState(State.Closed);
                 cleanupMultiConsumer();
                 log.info("[{}] [{}] [{}] Unsubscribed Topics Consumer",
                         topic, subscription, consumerName);
                 // fail all pending-receive futures to notify application
                 return failPendingReceive();
-            })
+            }, internalPinnedExecutor)
             .whenComplete((r, ex) -> {
                 if (ex == null) {
                     unsubscribeFuture.complete(null);
@@ -605,13 +611,13 @@ public CompletableFuture closeAsync() {
             .map(ConsumerImpl::closeAsync).collect(Collectors.toList());
 
         FutureUtil.waitForAll(futureList)
-            .thenCompose((r) -> {
+            .thenComposeAsync((r) -> {
                 setState(State.Closed);
                 cleanupMultiConsumer();
                 log.info("[{}] [{}] Closed Topics Consumer", topic, subscription);
                 // fail all pending-receive futures to notify application
                 return failPendingReceive();
-            })
+            }, internalPinnedExecutor)
             .whenComplete((r, ex) -> {
                 if (ex == null) {
                     closeFuture.complete(null);
@@ -656,25 +662,23 @@ private ConsumerConfigurationData getInternalConsumerConfig() {
         return internalConsumerConfig;
     }
 
-    @SneakyThrows
     @Override
     public void redeliverUnacknowledgedMessages() {
-        List> futures = new ArrayList<>(consumers.size());
         internalPinnedExecutor.execute(() -> {
-            CONSUMER_EPOCH.incrementAndGet(this);
-            consumers.values().stream().forEach(consumer -> {
-                futures.add(consumer.internalRedeliverUnacknowledgedMessages());
-                consumer.unAckedChunkedMessageIdSequenceMap.clear();
-            });
-            clearIncomingMessages();
-            unAckedMessageTracker.clear();
+            incomingQueueLock.lock();
+            try {
+                CONSUMER_EPOCH.incrementAndGet(this);
+                consumers.values().stream().forEach(consumer -> {
+                    consumer.redeliverUnacknowledgedMessages();
+                    consumer.unAckedChunkedMessageIdSequenceMap.clear();
+                });
+                clearIncomingMessages();
+                unAckedMessageTracker.clear();
+                resumeReceivingFromPausedConsumersIfNeeded();
+            } finally {
+                incomingQueueLock.unlock();
+            }
         });
-        try {
-            FutureUtil.waitForAll(futures).get();
-        } catch (ExecutionException e) {
-            throw e.getCause();
-        }
-        resumeReceivingFromPausedConsumersIfNeeded();
     }
 
     @Override
@@ -827,7 +831,7 @@ public synchronized ConsumerStats getStats() {
         }
         stats.reset();
 
-        consumers.values().stream().forEach(consumer -> stats.updateCumulativeStats(consumer.getStats()));
+        consumers.forEach((partition, consumer) -> stats.updateCumulativeStats(partition, consumer.getStats()));
         return stats;
     }
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
index cbb921ed9d6aa..06d73c5031c80 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsReaderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiplierRedeliveryBackoff.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiplierRedeliveryBackoff.java
index 2782cfc435d0d..415378c00c738 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiplierRedeliveryBackoff.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiplierRedeliveryBackoff.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -42,14 +42,6 @@ public static MultiplierRedeliveryBackoff.MultiplierRedeliveryBackoffBuilder bui
         return new MultiplierRedeliveryBackoff.MultiplierRedeliveryBackoffBuilder();
     }
 
-    public long getMinDelayMs() {
-        return this.minDelayMs;
-    }
-
-    public long getMaxDelayMs() {
-        return this.maxDelayMs;
-    }
-
     @Override
     public long next(int redeliveryCount) {
         if (redeliveryCount <= 0 || minDelayMs <= 0) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Murmur3Hash32.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Murmur3Hash32.java
index c31f3a64ddf67..ce76496b42b7f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Murmur3Hash32.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Murmur3Hash32.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java
index 86121dd2c34c7..8680f0f0e6c73 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NonPersistentAcknowledgmentGroupingTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NonPersistentAcknowledgmentGroupingTracker.java
index 56fc0b16548af..32f8fb922304b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NonPersistentAcknowledgmentGroupingTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NonPersistentAcknowledgmentGroupingTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java
index 4a84ba03ebea7..f780edc95c136 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -62,7 +62,7 @@ public class PartitionedProducerImpl extends ProducerBase {
 
     private final ConcurrentOpenHashMap> producers;
     private final MessageRouter routerPolicy;
-    private final ProducerStatsRecorderImpl stats;
+    private final PartitionedTopicProducerStatsRecorderImpl stats;
     private TopicMetadata topicMetadata;
     private final int firstPartitionIndex;
     private String overrideProducerName;
@@ -80,7 +80,9 @@ public PartitionedProducerImpl(PulsarClientImpl client, String topic, ProducerCo
                 ConcurrentOpenHashMap.>newBuilder().build();
         this.topicMetadata = new TopicMetadataImpl(numPartitions);
         this.routerPolicy = getMessageRouter();
-        stats = client.getConfiguration().getStatsIntervalSeconds() > 0 ? new ProducerStatsRecorderImpl() : null;
+        stats = client.getConfiguration().getStatsIntervalSeconds() > 0
+                ? new PartitionedTopicProducerStatsRecorderImpl()
+                : null;
 
         // MaxPendingMessagesAcrossPartitions doesn't support partial partition such as SinglePartition correctly
         int maxPendingMessages = Math.min(conf.getMaxPendingMessages(),
@@ -353,7 +355,8 @@ public synchronized ProducerStatsRecorderImpl getStats() {
             return null;
         }
         stats.reset();
-        producers.values().forEach(p -> stats.updateCumulativeStats(p.getStats()));
+        producers.forEach(
+                (partition, producer) -> stats.updateCumulativeStats(producer.getTopic(), producer.getStats()));
         return stats;
     }
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedTopicProducerStatsRecorderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedTopicProducerStatsRecorderImpl.java
new file mode 100644
index 0000000000000..2f73a6af40666
--- /dev/null
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedTopicProducerStatsRecorderImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.impl;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.DoubleAdder;
+import org.apache.pulsar.client.api.PartitionedTopicProducerStats;
+import org.apache.pulsar.client.api.ProducerStats;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PartitionedTopicProducerStatsRecorderImpl extends ProducerStatsRecorderImpl
+        implements PartitionedTopicProducerStats {
+
+    private static final long serialVersionUID = 1L;
+    private Map partitionStats = Collections.emptyMap();
+    private final DoubleAdder sendMsgsRateAggregate;
+    private final DoubleAdder sendBytesRateAggregate;
+    private int partitions = 0;
+
+    public PartitionedTopicProducerStatsRecorderImpl() {
+        super();
+        partitionStats = new ConcurrentHashMap<>();
+        sendMsgsRateAggregate = new DoubleAdder();
+        sendBytesRateAggregate = new DoubleAdder();
+    }
+
+    void reset() {
+        super.reset();
+        partitions = 0;
+    }
+
+    void updateCumulativeStats(String partition, ProducerStats stats) {
+        super.updateCumulativeStats(stats);
+        if (stats == null) {
+            return;
+        }
+        partitionStats.put(partition, stats);
+        // update rates
+        sendMsgsRateAggregate.add(stats.getSendMsgsRate());
+        sendBytesRateAggregate.add(stats.getSendBytesRate());
+        partitions++;
+    }
+
+    @Override
+    public double getSendMsgsRate() {
+        return sendMsgsRateAggregate.doubleValue() / partitions;
+    }
+
+    @Override
+    public double getSendBytesRate() {
+        return sendBytesRateAggregate.doubleValue() / partitions;
+    }
+
+    @Override
+    public Map getPartitionStats() {
+        return partitionStats;
+    }
+
+    private static final Logger log = LoggerFactory.getLogger(PartitionedTopicProducerStatsRecorderImpl.class);
+}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionsChangedListener.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionsChangedListener.java
index 48de279aaaa78..a260adda31c21 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionsChangedListener.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionsChangedListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java
index 4433bba15d548..12c7e4e4ba3c7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
index f7f43076466ff..fef0bcb8906f1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,12 +28,14 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -44,7 +46,6 @@
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
 import org.apache.pulsar.client.util.TimedCompletableFuture;
-import org.apache.pulsar.common.api.proto.CommandAck;
 import org.apache.pulsar.common.api.proto.CommandAck.AckType;
 import org.apache.pulsar.common.protocol.Commands;
 import org.apache.pulsar.common.util.FutureUtil;
@@ -60,14 +61,14 @@ public class PersistentAcknowledgmentsGroupingTracker implements Acknowledgments
     /**
      * When reaching the max group size, an ack command is sent out immediately.
      */
-    private static final int MAX_ACK_GROUP_SIZE = 1000;
+    private final int maxAckGroupSize;
 
     private final ConsumerImpl consumer;
 
     private final long acknowledgementGroupTimeMicros;
 
-    private volatile TimedCompletableFuture currentIndividualAckFuture;
-    private volatile TimedCompletableFuture currentCumulativeAckFuture;
+    private volatile CompletableFuture currentIndividualAckFuture;
+    private volatile CompletableFuture currentCumulativeAckFuture;
 
     private final LastCumulativeAck lastCumulativeAck = new LastCumulativeAck();
 
@@ -91,6 +92,7 @@ public PersistentAcknowledgmentsGroupingTracker(ConsumerImpl consumer, Consum
         this.pendingIndividualAcks = new ConcurrentSkipListSet<>();
         this.pendingIndividualBatchIndexAcks = new ConcurrentHashMap<>();
         this.acknowledgementGroupTimeMicros = conf.getAcknowledgementsGroupTimeMicros();
+        this.maxAckGroupSize = conf.getMaxAcknowledgmentGroupSize();
         this.batchIndexAckEnabled = conf.isBatchIndexAckEnabled();
         this.ackReceiptEnabled = conf.isAckReceiptEnabled();
         this.currentIndividualAckFuture = new TimedCompletableFuture<>();
@@ -111,12 +113,18 @@ public PersistentAcknowledgmentsGroupingTracker(ConsumerImpl consumer, Consum
      */
     @Override
     public boolean isDuplicate(MessageId messageId) {
-        final MessageIdImpl messageIdOfLastAck = lastCumulativeAck.getMessageId();
-        if (messageIdOfLastAck != null && messageId.compareTo(messageIdOfLastAck) <= 0) {
+        if (!(messageId instanceof MessageIdImpl)) {
+            throw new IllegalArgumentException("isDuplicated cannot accept "
+                    + messageId.getClass().getName() + ": " + messageId);
+        }
+        if (lastCumulativeAck.compareTo(messageId) >= 0) {
             // Already included in a cumulative ack
             return true;
         } else {
-            return pendingIndividualAcks.contains((MessageIdImpl) messageId);
+            final MessageIdImpl messageIdImpl = (messageId instanceof BatchMessageIdImpl)
+                    ? ((BatchMessageIdImpl) messageId).toMessageIdImpl()
+                    : (MessageIdImpl) messageId;
+            return pendingIndividualAcks.contains(messageIdImpl);
         }
     }
 
@@ -124,7 +132,7 @@ public boolean isDuplicate(MessageId messageId) {
     public CompletableFuture addListAcknowledgment(List messageIds,
                                                          AckType ackType, Map properties) {
         if (AckType.Cumulative.equals(ackType)) {
-            if (isAckReceiptEnabled(consumer.getClientCnx())) {
+            if (consumer.isAckReceiptEnabled()) {
                 Set> completableFutureSet = new HashSet<>();
                 messageIds.forEach(messageId ->
                         completableFutureSet.add(addAcknowledgment((MessageIdImpl) messageId, ackType, properties)));
@@ -134,30 +142,20 @@ public CompletableFuture addListAcknowledgment(List messageIds,
                 return CompletableFuture.completedFuture(null);
             }
         } else {
-            if (isAckReceiptEnabled(consumer.getClientCnx())) {
-                // when flush the ack, we should bind the this ack in the currentFuture, during this time we can't
-                // change currentFuture. but we can lock by the read lock, because the currentFuture is not change
-                // any ack operation is allowed.
-                this.lock.readLock().lock();
-                try {
-                    if (messageIds.size() != 0) {
-                        addListAcknowledgment(messageIds);
-                        return this.currentIndividualAckFuture;
-                    } else {
-                        return CompletableFuture.completedFuture(null);
-                    }
-                } finally {
-                    this.lock.readLock().unlock();
-                    if (acknowledgementGroupTimeMicros == 0 || pendingIndividualAcks.size() >= MAX_ACK_GROUP_SIZE) {
-                        flush();
-                    }
+            Optional readLock = acquireReadLock();
+            try {
+                if (messageIds.size() != 0) {
+                    addListAcknowledgment(messageIds);
+                    return readLock.map(__ -> currentIndividualAckFuture)
+                            .orElse(CompletableFuture.completedFuture(null));
+                } else {
+                    return CompletableFuture.completedFuture(null);
                 }
-            } else {
-                addListAcknowledgment(messageIds);
-                if (acknowledgementGroupTimeMicros == 0 || pendingIndividualAcks.size() >= MAX_ACK_GROUP_SIZE) {
+            } finally {
+                readLock.ifPresent(Lock::unlock);
+                if (acknowledgementGroupTimeMicros == 0 || pendingIndividualAcks.size() >= maxAckGroupSize) {
                     flush();
                 }
-                return CompletableFuture.completedFuture(null);
             }
         }
     }
@@ -255,26 +253,15 @@ private CompletableFuture doIndividualAck(MessageIdImpl messageId, Map= MAX_ACK_GROUP_SIZE) {
-                        flush();
-                    }
-                }
-            } else {
+            Optional readLock = acquireReadLock();
+            try {
                 doIndividualAckAsync(messageId);
-                if (pendingIndividualAcks.size() >= MAX_ACK_GROUP_SIZE) {
+                return readLock.map(__ -> currentIndividualAckFuture).orElse(CompletableFuture.completedFuture(null));
+            } finally {
+                readLock.ifPresent(Lock::unlock);
+                if (pendingIndividualAcks.size() >= maxAckGroupSize) {
                     flush();
                 }
-                return CompletableFuture.completedFuture(null);
             }
         }
     }
@@ -297,26 +284,15 @@ private CompletableFuture doIndividualBatchAck(BatchMessageIdImpl batchMes
     }
 
     private CompletableFuture doIndividualBatchAck(BatchMessageIdImpl batchMessageId) {
-        if (isAckReceiptEnabled(consumer.getClientCnx())) {
-            // when flush the ack, we should bind the this ack in the currentFuture, during this time we can't
-            // change currentFuture. but we can lock by the read lock, because the currentFuture is not change
-            // any ack operation is allowed.
-            this.lock.readLock().lock();
-            try {
-                doIndividualBatchAckAsync(batchMessageId);
-                return this.currentIndividualAckFuture;
-            } finally {
-                this.lock.readLock().unlock();
-                if (pendingIndividualBatchIndexAcks.size() >= MAX_ACK_GROUP_SIZE) {
-                    flush();
-                }
-            }
-        } else {
+        Optional readLock = acquireReadLock();
+        try {
             doIndividualBatchAckAsync(batchMessageId);
-            if (pendingIndividualBatchIndexAcks.size() >= MAX_ACK_GROUP_SIZE) {
+            return readLock.map(__ -> currentIndividualAckFuture).orElse(CompletableFuture.completedFuture(null));
+        } finally {
+            readLock.ifPresent(Lock::unlock);
+            if (pendingIndividualBatchIndexAcks.size() >= maxAckGroupSize) {
                 flush();
             }
-            return CompletableFuture.completedFuture(null);
         }
     }
 
@@ -328,20 +304,12 @@ private CompletableFuture doCumulativeAck(MessageIdImpl messageId, Map readLock = acquireReadLock();
+            try {
                 doCumulativeAckAsync(messageId, bitSet);
-                return CompletableFuture.completedFuture(null);
+                return readLock.map(__ -> currentCumulativeAckFuture).orElse(CompletableFuture.completedFuture(null));
+            } finally {
+                readLock.ifPresent(Lock::unlock);
             }
         }
     }
@@ -414,7 +382,7 @@ private CompletableFuture doImmediateBatchIndexAck(BatchMessageIdImpl msgI
         }
 
         CompletableFuture completableFuture = newMessageAckCommandAndWrite(cnx, consumer.consumerId,
-                msgId.ledgerId, msgId.entryId, bitSet, ackType, null, properties, true, null, null);
+                msgId.ledgerId, msgId.entryId, bitSet, ackType, properties, true, null, null);
         bitSet.recycle();
         return completableFuture;
     }
@@ -433,15 +401,11 @@ public void flush() {
             return;
         }
 
-        if (isAckReceiptEnabled(consumer.getClientCnx())) {
-            this.lock.writeLock().lock();
-            try {
-                flushAsync(cnx);
-            } finally {
-                this.lock.writeLock().unlock();
-            }
-        } else {
+        Optional writeLock = acquireWriteLock();
+        try {
             flushAsync(cnx);
+        } finally {
+            writeLock.ifPresent(Lock::unlock);
         }
     }
 
@@ -452,8 +416,9 @@ private void flushAsync(ClientCnx cnx) {
             shouldFlush = true;
             final MessageIdImpl messageId = lastCumulativeAckToFlush.getMessageId();
             newMessageAckCommandAndWrite(cnx, consumer.consumerId, messageId.getLedgerId(), messageId.getEntryId(),
-                    lastCumulativeAckToFlush.getBitSetRecyclable(), AckType.Cumulative, null,
-                    Collections.emptyMap(), false, this.currentCumulativeAckFuture, null);
+                    lastCumulativeAckToFlush.getBitSetRecyclable(), AckType.Cumulative,
+                    Collections.emptyMap(), false,
+                    (TimedCompletableFuture) this.currentCumulativeAckFuture, null);
             this.consumer.unAckedChunkedMessageIdSequenceMap.remove(messageId);
         }
 
@@ -492,7 +457,7 @@ private void flushAsync(ClientCnx cnx) {
                         break;
                     }
                     newMessageAckCommandAndWrite(cnx, consumer.consumerId, msgId.getLedgerId(), msgId.getEntryId(),
-                            null, AckType.Individual, null, Collections.emptyMap(), false,
+                            null, AckType.Individual, Collections.emptyMap(), false,
                             null, null);
                     shouldFlush = true;
                 }
@@ -513,8 +478,8 @@ private void flushAsync(ClientCnx cnx) {
         if (entriesToAck.size() > 0) {
 
             newMessageAckCommandAndWrite(cnx, consumer.consumerId, 0L, 0L,
-                    null, AckType.Individual, null, null, true,
-                    currentIndividualAckFuture, entriesToAck);
+                    null, AckType.Individual, null, true,
+                    (TimedCompletableFuture) currentIndividualAckFuture, entriesToAck);
             shouldFlush = true;
         }
 
@@ -559,19 +524,19 @@ private CompletableFuture newImmediateAckAndFlush(long consumerId, Message
                     }
                 }
                 completableFuture = newMessageAckCommandAndWrite(cnx, consumer.consumerId, 0L, 0L,
-                        null, ackType, null, null, true, null, entriesToAck);
+                        null, ackType, null, true, null, entriesToAck);
             } else {
                 // if don't support multi message ack, it also support ack receipt, so we should not think about the
                 // ack receipt in this logic
                 for (MessageIdImpl cMsgId : chunkMsgIds) {
                     newMessageAckCommandAndWrite(cnx, consumerId, cMsgId.getLedgerId(), cMsgId.getEntryId(),
-                            bitSet, ackType, null, map, true, null, null);
+                            bitSet, ackType, map, true, null, null);
                 }
                 completableFuture = CompletableFuture.completedFuture(null);
             }
         } else {
             completableFuture = newMessageAckCommandAndWrite(cnx, consumerId, msgId.ledgerId, msgId.getEntryId(),
-                    bitSet, ackType, null, map, true, null, null);
+                    bitSet, ackType, map, true, null, null);
         }
         return completableFuture;
     }
@@ -579,11 +544,10 @@ private CompletableFuture newImmediateAckAndFlush(long consumerId, Message
     private CompletableFuture newMessageAckCommandAndWrite(
             ClientCnx cnx, long consumerId, long ledgerId,
             long entryId, BitSetRecyclable ackSet, AckType ackType,
-            CommandAck.ValidationError validationError,
             Map properties, boolean flush,
             TimedCompletableFuture timedCompletableFuture,
             List> entriesToAck) {
-        if (isAckReceiptEnabled(consumer.getClientCnx())) {
+        if (consumer.isAckReceiptEnabled()) {
             final long requestId = consumer.getClient().newRequestId();
             final ByteBuf cmd;
             if (entriesToAck == null) {
@@ -632,9 +596,16 @@ private CompletableFuture newMessageAckCommandAndWrite(
         }
     }
 
-    private boolean isAckReceiptEnabled(ClientCnx cnx) {
-        return ackReceiptEnabled && cnx != null
-                && Commands.peerSupportsAckReceipt(cnx.getRemoteEndpointProtocolVersion());
+    public Optional acquireReadLock() {
+        Optional optionalLock = Optional.ofNullable(consumer.isAckReceiptEnabled() ? lock.readLock() : null);
+        optionalLock.ifPresent(Lock::lock);
+        return optionalLock;
+    }
+
+    public Optional acquireWriteLock() {
+        Optional optionalLock = Optional.ofNullable(consumer.isAckReceiptEnabled() ? lock.writeLock() : null);
+        optionalLock.ifPresent(Lock::lock);
+        return optionalLock;
     }
 }
 
@@ -657,7 +628,7 @@ protected LastCumulativeAck initialValue() {
     private boolean flushRequired = false;
 
     public synchronized void update(final MessageIdImpl messageId, final BitSetRecyclable bitSetRecyclable) {
-        if (messageId.compareTo(this.messageId) > 0) {
+        if (compareTo(messageId) < 0) {
             if (this.bitSetRecyclable != null && this.bitSetRecyclable != bitSetRecyclable) {
                 this.bitSetRecyclable.recycle();
             }
@@ -691,6 +662,24 @@ public synchronized void reset() {
         flushRequired = false;
     }
 
+    public synchronized int compareTo(MessageId messageId) {
+        if (this.messageId instanceof BatchMessageIdImpl && (!(messageId instanceof BatchMessageIdImpl))) {
+            final BatchMessageIdImpl lhs = (BatchMessageIdImpl) this.messageId;
+            final MessageIdImpl rhs = (MessageIdImpl) messageId;
+            return MessageIdImpl.messageIdCompare(
+                    lhs.getLedgerId(), lhs.getEntryId(), lhs.getPartitionIndex(), lhs.getBatchIndex(),
+                    rhs.getLedgerId(), rhs.getEntryId(), rhs.getPartitionIndex(), Integer.MAX_VALUE);
+        } else if (messageId instanceof BatchMessageIdImpl && (!(this.messageId instanceof BatchMessageIdImpl))){
+            final MessageIdImpl lhs = this.messageId;
+            final BatchMessageIdImpl rhs = (BatchMessageIdImpl) messageId;
+            return MessageIdImpl.messageIdCompare(
+                    lhs.getLedgerId(), lhs.getEntryId(), lhs.getPartitionIndex(), Integer.MAX_VALUE,
+                    rhs.getLedgerId(), rhs.getEntryId(), rhs.getPartitionIndex(), rhs.getBatchIndex());
+        } else {
+            return this.messageId.compareTo(messageId);
+        }
+    }
+
     private synchronized void set(final MessageIdImpl messageId, final BitSetRecyclable bitSetRecyclable) {
         this.messageId = messageId;
         this.bitSetRecyclable = bitSetRecyclable;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBase.java
index b8cf6cee9e3ce..7dc5f78398434 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBase.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java
index 986bdc73ce646..bfdbb63de1855 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
index b726a50db4b82..dceaf50214182 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -533,6 +533,8 @@ public void sendAsync(Message message, SendCallback callback) {
                     ? msg.getMessageBuilder().getSchemaVersion() : null;
             byte[] orderingKey = totalChunks > 1 && msg.getMessageBuilder().hasOrderingKey()
                     ? msg.getMessageBuilder().getOrderingKey() : null;
+            // msg.messageId will be reset if previous message chunk is sent successfully.
+            final MessageId messageId = msg.getMessageId();
             for (int chunkId = 0; chunkId < totalChunks; chunkId++) {
                 // Need to reset the schemaVersion, because the schemaVersion is based on a ByteBuf object in
                 // `MessageMetadata`, if we want to re-serialize the `SEND` command using a same `MessageMetadata`,
@@ -555,7 +557,7 @@ public void sendAsync(Message message, SendCallback callback) {
                 synchronized (this) {
                     serializeAndSendMessage(msg, payload, sequenceId, uuid, chunkId, totalChunks,
                             readStartIndex, payloadChunkSize, compressedPayload, compressed,
-                            compressedPayload.readableBytes(), callback, chunkedMessageCtx);
+                            compressedPayload.readableBytes(), callback, chunkedMessageCtx, messageId);
                     readStartIndex = ((chunkId + 1) * payloadChunkSize);
                 }
             }
@@ -617,7 +619,8 @@ private void serializeAndSendMessage(MessageImpl msg,
                                          boolean compressed,
                                          int compressedPayloadSize,
                                          SendCallback callback,
-                                         ChunkedMessageCtx chunkedMessageCtx) throws IOException {
+                                         ChunkedMessageCtx chunkedMessageCtx,
+                                         MessageId messageId) throws IOException {
         ByteBuf chunkPayload = compressedPayload;
         MessageMetadata msgMetadata = msg.getMessageBuilder();
         if (totalChunks > 1 && TopicName.get(topic).isPersistent()) {
@@ -686,14 +689,14 @@ private void serializeAndSendMessage(MessageImpl msg,
                     : 1;
             final OpSendMsg op;
             if (msg.getSchemaState() == MessageImpl.SchemaState.Ready) {
-                ByteBufPair cmd = sendMessage(producerId, sequenceId, numMessages, msg.getMessageId(), msgMetadata,
+                ByteBufPair cmd = sendMessage(producerId, sequenceId, numMessages, messageId, msgMetadata,
                         encryptedPayload);
                 op = OpSendMsg.create(msg, cmd, sequenceId, callback);
             } else {
                 op = OpSendMsg.create(msg, null, sequenceId, callback);
                 final MessageMetadata finalMsgMetadata = msgMetadata;
                 op.rePopulate = () -> {
-                    op.cmd = sendMessage(producerId, sequenceId, numMessages, msg.getMessageId(), finalMsgMetadata,
+                    op.cmd = sendMessage(producerId, sequenceId, numMessages, messageId, finalMsgMetadata,
                             encryptedPayload);
                 };
             }
@@ -1416,7 +1419,8 @@ static OpSendMsg create(MessageImpl msg, ByteBufPair cmd, long sequenceId, Se
             return op;
         }
 
-        static OpSendMsg create(List> msgs, ByteBufPair cmd, long sequenceId, SendCallback callback) {
+        static OpSendMsg create(List> msgs, ByteBufPair cmd, long sequenceId, SendCallback callback,
+                                int batchAllocatedSize) {
             OpSendMsg op = RECYCLER.get();
             op.initialize();
             op.msgs = msgs;
@@ -1428,11 +1432,12 @@ static OpSendMsg create(List> msgs, ByteBufPair cmd, long sequenc
             for (int i = 0; i < msgs.size(); i++) {
                 op.uncompressedSize += msgs.get(i).getUncompressedSize();
             }
+            op.uncompressedSize += batchAllocatedSize;
             return op;
         }
 
         static OpSendMsg create(List> msgs, ByteBufPair cmd, long lowestSequenceId,
-                                long highestSequenceId,  SendCallback callback) {
+                                long highestSequenceId,  SendCallback callback, int batchAllocatedSize) {
             OpSendMsg op = RECYCLER.get();
             op.initialize();
             op.msgs = msgs;
@@ -1445,6 +1450,7 @@ static OpSendMsg create(List> msgs, ByteBufPair cmd, long lowestS
             for (int i = 0; i < msgs.size(); i++) {
                 op.uncompressedSize += msgs.get(i).getUncompressedSize();
             }
+            op.uncompressedSize += batchAllocatedSize;
             return op;
         }
 
@@ -2053,8 +2059,9 @@ private void failPendingBatchMessages(PulsarClientException ex) {
         }
         final int numMessagesInBatch = batchMessageContainer.getNumMessagesInBatch();
         final long currentBatchSize = batchMessageContainer.getCurrentBatchSize();
+        final int batchAllocatedSizeBytes = batchMessageContainer.getBatchAllocatedSizeBytes();
         semaphoreRelease(numMessagesInBatch);
-        client.getMemoryLimitController().releaseMemory(currentBatchSize);
+        client.getMemoryLimitController().releaseMemory(currentBatchSize + batchAllocatedSizeBytes);
         batchMessageContainer.discard(ex);
     }
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerInterceptors.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerInterceptors.java
index 29091cb4f92eb..97f16c37b5d31 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerInterceptors.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerInterceptors.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerResponse.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerResponse.java
index 7d710815bf239..a3942fe00d88d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerResponse.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsDisabled.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsDisabled.java
index 0962abb1aee2c..365cdf7ede402 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsDisabled.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsDisabled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -132,4 +132,5 @@ public double getSendLatencyMillisMax() {
     public int getPendingQueueSize() {
         return 0;
     }
+
 }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorder.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorder.java
index 4c9bd9ec46087..be75e38edfd94 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorder.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImpl.java
index 0f30b3483c2ee..01ed84f55030e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarChannelInitializer.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarChannelInitializer.java
index b046d1030eda5..f51b263277fc6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarChannelInitializer.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarChannelInitializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
index 6f0b75fb54064..d964328d59cbd 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -26,7 +26,6 @@
 import io.netty.channel.EventLoopGroup;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
-import io.netty.util.concurrent.DefaultThreadFactory;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.time.Clock;
@@ -756,7 +755,7 @@ public CompletableFuture closeAsync() {
         // would happen
         CompletableFuture combinedFuture = FutureUtil.waitForAll(futures);
         ScheduledExecutorService shutdownExecutor = Executors.newSingleThreadScheduledExecutor(
-                new DefaultThreadFactory("pulsar-client-shutdown-timeout-scheduler"));
+                new ExecutorProvider.ExtendedThreadFactory("pulsar-client-shutdown-timeout-scheduler"));
         FutureUtil.addTimeoutHandling(combinedFuture, Duration.ofSeconds(CLOSE_TIMEOUT_SECONDS),
                 shutdownExecutor, () -> FutureUtil.createTimeoutException("Closing producers and consumers timed out.",
                         PulsarClientImpl.class, "closeAsync"));
@@ -1087,7 +1086,7 @@ private static EventLoopGroup getEventLoopGroup(ClientConfigurationData conf) {
     }
 
     private static ThreadFactory getThreadFactory(String poolName) {
-        return new DefaultThreadFactory(poolName, Thread.currentThread().isDaemon());
+        return new ExecutorProvider.ExtendedThreadFactory(poolName, Thread.currentThread().isDaemon());
     }
 
     void cleanupProducer(ProducerBase producer) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImplementationBindingImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImplementationBindingImpl.java
index eb555112c2848..1b069c5172dd7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImplementationBindingImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImplementationBindingImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -242,10 +242,6 @@ public Schema> newKeyValueBytesSchema() {
         return KeyValueSchemaImpl.kvBytes();
     }
 
-    public  Schema> newKeyValueSchema(Schema keySchema, Schema valueSchema) {
-        return KeyValueSchemaImpl.of(keySchema, valueSchema);
-    }
-
     public  Schema> newKeyValueSchema(Schema keySchema, Schema valueSchema,
                                                     KeyValueEncodingType keyValueEncodingType) {
         return KeyValueSchemaImpl.of(keySchema, valueSchema, keyValueEncodingType);
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java
index c7db56adc4ba7..35c04ce27b192 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarServiceNameResolver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderBuilderImpl.java
index f3e7546783599..ca2011cf18a42 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java
index 04f8706f21cad..238beffc79f88 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderInterceptorUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderInterceptorUtil.java
index 2794c7b7f7f2e..8d79c99de9e28 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderInterceptorUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ReaderInterceptorUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ResetCursorData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ResetCursorData.java
index 03b6366018efd..06f79024c4f24 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ResetCursorData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ResetCursorData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImpl.java
index 77bc9db361a4c..4946ed2ad68d9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java
index ef4b83b8750dd..369bb34a29a79 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ServiceNameResolver.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ServiceNameResolver.java
index 25e7ee6a73884..95f81d45bd755 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ServiceNameResolver.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ServiceNameResolver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImpl.java
index 9230af970e9ae..72194fa5b5195 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewBuilderImpl.java
index 691a27088fb08..b417083f0c12e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -76,4 +75,11 @@ public TableViewBuilder autoUpdatePartitionsInterval(int interval, TimeUnit u
        conf.setAutoUpdatePartitionsSeconds(unit.toSeconds(interval));
        return this;
     }
+
+    @Override
+    public TableViewBuilder subscriptionName(String subscriptionName) {
+        checkArgument(StringUtils.isNotBlank(subscriptionName), "subscription name cannot be blank");
+        conf.setSubscriptionName(StringUtils.trim(subscriptionName));
+        return this;
+    }
 }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewConfigurationData.java
index 34283c57b61ff..31df24b60f86a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 import java.io.Serializable;
@@ -29,6 +28,7 @@ public class TableViewConfigurationData implements Serializable, Cloneable {
     private static final long serialVersionUID = 1L;
 
     private String topicName = null;
+    private String subscriptionName = null;
     private long autoUpdatePartitionsSeconds = 60;
 
     @Override
@@ -37,6 +37,7 @@ public TableViewConfigurationData clone() {
             TableViewConfigurationData clone = (TableViewConfigurationData) super.clone();
             clone.setTopicName(topicName);
             clone.setAutoUpdatePartitionsSeconds(autoUpdatePartitionsSeconds);
+            clone.setSubscriptionName(subscriptionName);
             return clone;
         } catch (CloneNotSupportedException e) {
             throw new AssertionError();
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewImpl.java
index 652303ddf715e..9e7257f23fb04 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TableViewImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 import java.util.ArrayList;
@@ -37,8 +36,10 @@
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.Reader;
+import org.apache.pulsar.client.api.ReaderBuilder;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.TableView;
+import org.apache.pulsar.common.naming.TopicDomain;
 
 @Slf4j
 public class TableViewImpl implements TableView {
@@ -52,26 +53,36 @@ public class TableViewImpl implements TableView {
 
     private final List> listeners;
     private final ReentrantLock listenersMutex;
+    private final boolean isPersistentTopic;
 
     TableViewImpl(PulsarClientImpl client, Schema schema, TableViewConfigurationData conf) {
         this.conf = conf;
+        this.isPersistentTopic = conf.getTopicName().startsWith(TopicDomain.persistent.toString());
         this.data = new ConcurrentHashMap<>();
         this.immutableData = Collections.unmodifiableMap(data);
         this.listeners = new ArrayList<>();
         this.listenersMutex = new ReentrantLock();
-        this.reader = client.newReader(schema)
+        ReaderBuilder readerBuilder = client.newReader(schema)
                 .topic(conf.getTopicName())
                 .startMessageId(MessageId.earliest)
                 .autoUpdatePartitions(true)
                 .autoUpdatePartitionsInterval((int) conf.getAutoUpdatePartitionsSeconds(), TimeUnit.SECONDS)
-                .readCompacted(true)
                 .poolMessages(true)
-                .createAsync();
+                .subscriptionName(conf.getSubscriptionName());
+        if (isPersistentTopic) {
+            readerBuilder.readCompacted(true);
+        }
+        this.reader = readerBuilder.createAsync();
     }
 
     CompletableFuture> start() {
-        return reader.thenCompose(this::readAllExistingMessages)
-                .thenApply(__ -> this);
+        return reader.thenCompose((reader) -> {
+            if (!isPersistentTopic) {
+                readTailMessages(reader);
+                return CompletableFuture.completedFuture(reader);
+            }
+            return this.readAllExistingMessages(reader);
+        }).thenApply(__ -> this);
     }
 
     @Override
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImpl.java
index 33f91366584ad..52d311348874b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicListWatcher.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicListWatcher.java
index d2ca018aef9e7..88ada6a344b8d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicListWatcher.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicListWatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageIdImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageIdImpl.java
index e74802e01428e..c20960950d54e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageIdImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageIdImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageImpl.java
index 1a9b9681137c1..f6c33cc930ff6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMessageImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl;
 
 import java.util.Map;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMetadataImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMetadataImpl.java
index 71a606f2c7c3d..6506128a4e854 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMetadataImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TopicMetadataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TransactionMetaStoreHandler.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TransactionMetaStoreHandler.java
index db252e6479177..885feb09cd40e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TransactionMetaStoreHandler.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TransactionMetaStoreHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TypedMessageBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TypedMessageBuilderImpl.java
index 320914396910b..026f8a1e69e0b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TypedMessageBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/TypedMessageBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import org.apache.pulsar.client.api.Message;
@@ -32,7 +33,7 @@
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.TypedMessageBuilder;
-import org.apache.pulsar.client.impl.schema.KeyValueSchemaImpl;
+import org.apache.pulsar.client.api.schema.KeyValueSchema;
 import org.apache.pulsar.client.impl.transaction.TransactionImpl;
 import org.apache.pulsar.common.api.proto.MessageMetadata;
 import org.apache.pulsar.common.schema.KeyValueEncodingType;
@@ -105,14 +106,12 @@ public CompletableFuture sendAsync() {
 
     @Override
     public TypedMessageBuilder key(String key) {
-        if (schema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
-            KeyValueSchemaImpl kvSchema = (KeyValueSchemaImpl) schema;
-            checkArgument(kvSchema.getKeyValueEncodingType() != KeyValueEncodingType.SEPARATED,
-                    "This method is not allowed to set keys when in encoding type is SEPARATED");
-            if (key == null) {
-                msgMetadata.setNullPartitionKey(true);
-                return this;
-            }
+        getKeyValueSchema().ifPresent(keyValueSchema -> checkArgument(
+                keyValueSchema.getKeyValueEncodingType() != KeyValueEncodingType.SEPARATED,
+                "This method is not allowed to set keys when in encoding type is SEPARATED"));
+        if (key == null) {
+            msgMetadata.setNullPartitionKey(true);
+            return this;
         }
         msgMetadata.setPartitionKey(key);
         msgMetadata.setPartitionKeyB64Encoded(false);
@@ -121,14 +120,12 @@ public TypedMessageBuilder key(String key) {
 
     @Override
     public TypedMessageBuilder keyBytes(byte[] key) {
-        if (schema instanceof KeyValueSchemaImpl && schema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
-            KeyValueSchemaImpl kvSchema = (KeyValueSchemaImpl) schema;
-            checkArgument(!(kvSchema.getKeyValueEncodingType() == KeyValueEncodingType.SEPARATED),
-                    "This method is not allowed to set keys when in encoding type is SEPARATED");
-            if (key == null) {
-                msgMetadata.setNullPartitionKey(true);
-                return this;
-            }
+        getKeyValueSchema().ifPresent(keyValueSchema -> checkArgument(
+                keyValueSchema.getKeyValueEncodingType() != KeyValueEncodingType.SEPARATED,
+                "This method is not allowed to set keys when in encoding type is SEPARATED"));
+        if (key == null) {
+            msgMetadata.setNullPartitionKey(true);
+            return this;
         }
         msgMetadata.setPartitionKey(Base64.getEncoder().encodeToString(key));
         msgMetadata.setPartitionKeyB64Encoded(true);
@@ -147,31 +144,18 @@ public TypedMessageBuilder value(T value) {
             msgMetadata.setNullValue(true);
             return this;
         }
-        if (value instanceof org.apache.pulsar.common.schema.KeyValue
-                && schema.getSchemaInfo() != null && schema.getSchemaInfo().getType() == SchemaType.KEY_VALUE) {
-            KeyValueSchemaImpl kvSchema = (KeyValueSchemaImpl) schema;
-            org.apache.pulsar.common.schema.KeyValue kv = (org.apache.pulsar.common.schema.KeyValue) value;
-            if (kvSchema.getKeyValueEncodingType() == KeyValueEncodingType.SEPARATED) {
-                // set key as the message key
-                if (kv.getKey() != null) {
-                    msgMetadata.setPartitionKey(
-                            Base64.getEncoder().encodeToString(kvSchema.getKeySchema().encode(kv.getKey())));
-                    msgMetadata.setPartitionKeyB64Encoded(true);
-                } else {
-                    this.msgMetadata.setNullPartitionKey(true);
-                }
-
-                // set value as the payload
-                if (kv.getValue() != null) {
-                    this.content = ByteBuffer.wrap(kvSchema.getValueSchema().encode(kv.getValue()));
-                } else {
-                    this.msgMetadata.setNullValue(true);
-                }
+
+        return getKeyValueSchema().map(keyValueSchema -> {
+            if (keyValueSchema.getKeyValueEncodingType() == KeyValueEncodingType.SEPARATED) {
+                setSeparateKeyValue(value, keyValueSchema);
                 return this;
+            } else {
+                return null;
             }
-        }
-        this.content = ByteBuffer.wrap(schema.encode(value));
-        return this;
+        }).orElseGet(() -> {
+            content = ByteBuffer.wrap(schema.encode(value));
+            return this;
+        });
     }
 
     @Override
@@ -300,4 +284,38 @@ public String getKey() {
     public ByteBuffer getContent() {
         return content;
     }
+
+    private Optional> getKeyValueSchema() {
+        if (schema.getSchemaInfo() != null
+                && schema.getSchemaInfo().getType() == SchemaType.KEY_VALUE
+                // The schema's class could also be AutoProduceBytesSchema when its type is KEY_VALUE
+                && schema instanceof KeyValueSchema) {
+            return Optional.of((KeyValueSchema) schema);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private  void setSeparateKeyValue(T value, KeyValueSchema keyValueSchema) {
+        checkArgument(value instanceof org.apache.pulsar.common.schema.KeyValue);
+        org.apache.pulsar.common.schema.KeyValue keyValue =
+                (org.apache.pulsar.common.schema.KeyValue) value;
+
+        // set key as the message key
+        if (keyValue.getKey() != null) {
+            msgMetadata.setPartitionKey(Base64.getEncoder().encodeToString(
+                    keyValueSchema.getKeySchema().encode(keyValue.getKey())));
+            msgMetadata.setPartitionKeyB64Encoded(true);
+        } else {
+            msgMetadata.setNullPartitionKey(true);
+        }
+
+        // set value as the payload
+        if (keyValue.getValue() != null) {
+            content = ByteBuffer.wrap(keyValueSchema.getValueSchema().encode(keyValue.getValue()));
+        } else {
+            msgMetadata.setNullValue(true);
+        }
+    }
 }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageRedeliveryTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageRedeliveryTracker.java
index 1ce0fec5836d1..1405e279f8fe5 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageRedeliveryTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageRedeliveryTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -60,7 +60,6 @@ public UnAckedMessageRedeliveryTracker(PulsarClientImpl client, ConsumerBase
             @Override
             public void run(Timeout t) throws Exception {
                 writeLock.lock();
-                Set messageIds = null;
                 try {
                     HashSet headPartition = redeliveryTimePartitions.removeFirst();
                     if (!headPartition.isEmpty()) {
@@ -72,13 +71,9 @@ public void run(Timeout t) throws Exception {
                     }
                     headPartition.clear();
                     redeliveryTimePartitions.addLast(headPartition);
-                    messageIds = getRedeliveryMessages(consumerBase);
+                    triggerRedelivery(consumerBase);
                 } finally {
                     writeLock.unlock();
-                    if (messageIds != null && !messageIds.isEmpty()) {
-                        consumerBase.onAckTimeoutSend(messageIds);
-                        consumerBase.redeliverUnacknowledgedMessages(messageIds);
-                    }
                     timeout = client.timer().newTimeout(this, tickDurationInMs, TimeUnit.MILLISECONDS);
                 }
             }
@@ -98,29 +93,35 @@ private void addAckTimeoutMessages(UnackMessageIdWrapper messageIdWrapper) {
         }
     }
 
-    private Set getRedeliveryMessages(ConsumerBase consumerBase) {
+    private void triggerRedelivery(ConsumerBase consumerBase) {
         if (ackTimeoutMessages.isEmpty()) {
-            return null;
+            return;
         }
         Set messageIds = TL_MESSAGE_IDS_SET.get();
         messageIds.clear();
 
-        long now = System.currentTimeMillis();
-        ackTimeoutMessages.forEach((messageId, timestamp) -> {
-            if (timestamp <= now) {
-                addChunkedMessageIdsAndRemoveFromSequenceMap(messageId, messageIds, consumerBase);
-                messageIds.add(messageId);
+        try {
+            long now = System.currentTimeMillis();
+            ackTimeoutMessages.forEach((messageId, timestamp) -> {
+                if (timestamp <= now) {
+                    addChunkedMessageIdsAndRemoveFromSequenceMap(messageId, messageIds, consumerBase);
+                    messageIds.add(messageId);
+                }
+            });
+            if (!messageIds.isEmpty()) {
+                log.info("[{}] {} messages will be re-delivered", consumerBase, messageIds.size());
+                Iterator iterator = messageIds.iterator();
+                while (iterator.hasNext()) {
+                    MessageId messageId = iterator.next();
+                    ackTimeoutMessages.remove(messageId);
+                }
             }
-        });
-        if (!messageIds.isEmpty()) {
-            log.info("[{}] {} messages will be re-delivered", consumerBase, messageIds.size());
-            Iterator iterator = messageIds.iterator();
-            while (iterator.hasNext()) {
-                MessageId messageId = iterator.next();
-                ackTimeoutMessages.remove(messageId);
+        } finally {
+            if (messageIds.size() > 0) {
+                consumerBase.onAckTimeoutSend(messageIds);
+                consumerBase.redeliverUnacknowledgedMessages(messageIds);
             }
         }
-        return messageIds;
     }
 
     @Override
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java
index 9ad30296c21bd..534f33350267d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageRedeliveryTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageRedeliveryTracker.java
index e56b8149c5639..907e6109e196b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageRedeliveryTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageRedeliveryTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageTracker.java
index 6477e4a48afd5..e8e80c5e69025 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedTopicMessageTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnackMessageIdWrapper.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnackMessageIdWrapper.java
index 11b36b53051e4..3fca81652c747 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnackMessageIdWrapper.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnackMessageIdWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java
index b56b97a7acdfd..2c4e1e68f4220 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationBasic.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationBasic.java
index 567771dc2aaea..3bed5ac5dab1d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationBasic.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationBasic.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl.auth;
 
 import com.google.gson.Gson;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataBasic.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataBasic.java
index ba9e728a2d739..2fc89e128ec58 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataBasic.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataBasic.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl.auth;
 
 import java.util.Base64;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataKeyStoreTls.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataKeyStoreTls.java
index dd16983c6dc03..bfb107a68c070 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataKeyStoreTls.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataKeyStoreTls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataNull.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataNull.java
index ac1193c844e13..8679671098062 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataNull.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataNull.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java
index 14e67ba4ddf65..a16e70f8da7e9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataToken.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataToken.java
index b69222a57c9b0..f4ac5ed9b954e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataToken.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataToken.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl.auth;
 
 import java.util.Collections;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDisabled.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDisabled.java
index cc7c8c5940ad2..d1c59ea17a903 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDisabled.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDisabled.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationKeyStoreTls.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationKeyStoreTls.java
index 64bc927aafa6e..dd7fddd861041 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationKeyStoreTls.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationKeyStoreTls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java
index 37391d03cc2aa..acd15d6e1bbcc 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationToken.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationToken.java
index 8694352db0b9f..fcfe89a7c122f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationToken.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationToken.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl.auth;
 
 import com.google.gson.Gson;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationDataOAuth2.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationDataOAuth2.java
index 788f2d5ba251f..577bda9fa1f0c 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationDataOAuth2.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationDataOAuth2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationFactoryOAuth2.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationFactoryOAuth2.java
index cf567747567e4..c9abb3a3c0147 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationFactoryOAuth2.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationFactoryOAuth2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2.java
index 022918d807d19..11c3c88e093f5 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/ClientCredentialsFlow.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/ClientCredentialsFlow.java
index 987d7ec53f811..5736c67fb1651 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/ClientCredentialsFlow.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/ClientCredentialsFlow.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/Flow.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/Flow.java
index f8fc768c9d85c..a75e07dd3cef9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/Flow.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/Flow.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/FlowBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/FlowBase.java
index 997d32d980b96..92b5c8ec4a96d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/FlowBase.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/FlowBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/KeyFile.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/KeyFile.java
index b4a651006c768..bed1b633f9f2a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/KeyFile.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/KeyFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/package-info.java
index 3beeda04181b1..0000e3a9b01f5 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchangeRequest.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchangeRequest.java
index 2d37bb5e030bf..da026bce47eee 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchangeRequest.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchangeRequest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchanger.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchanger.java
index 7d004c7b2388a..0b95abb4c60b7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchanger.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/ClientCredentialsExchanger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/DefaultMetadataResolver.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/DefaultMetadataResolver.java
index 7d6ca1e5efabd..86a04d50974e9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/DefaultMetadataResolver.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/DefaultMetadataResolver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/Metadata.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/Metadata.java
index 93f65be0efef7..aa9b5513cfc99 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/Metadata.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/Metadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/MetadataResolver.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/MetadataResolver.java
index 85a6a0ba41d4d..28909270a69a6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/MetadataResolver.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/MetadataResolver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClient.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClient.java
index 66961ea5c9571..c01a9908079d6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClient.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenError.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenError.java
index 5f050a1264b5b..d8aa90de0ae85 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenError.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenExchangeException.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenExchangeException.java
index 286051fc7eefe..4ddb563655dbb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenExchangeException.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenExchangeException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenResult.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenResult.java
index 8b333c0114a38..6ab59a0d770b8 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenResult.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/package-info.java
index 20681114c4580..96593ce8085e3 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
index f8c8ed769597e..c8ccc0678edec 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java
index 653dded4de67b..338b9196a6651 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -219,6 +219,18 @@ public class ClientConfigurationData implements Serializable, Cloneable {
     )
     private int requestTimeoutMs = 60000;
 
+    @ApiModelProperty(
+            name = "readTimeoutMs",
+            value = "Maximum read time of a request."
+    )
+    private int readTimeoutMs = 60000;
+
+    @ApiModelProperty(
+            name = "autoCertRefreshSeconds",
+            value = "Seconds of auto refreshing certificate."
+    )
+    private int autoCertRefreshSeconds = 300;
+
     @ApiModelProperty(
             name = "initialBackoffIntervalNanos",
             value = "Initial backoff interval (in nanosecond)."
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/CmdGenerateDocumentation.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/CmdGenerateDocumentation.java
index 28ad0263cf6c4..ae6210b978edc 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/CmdGenerateDocumentation.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/CmdGenerateDocumentation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtils.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtils.java
index 02146db0b520c..c2fd4b2685dfb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtils.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java
index db806c309e87d..373d4e66c0ecf 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -137,6 +137,12 @@ public class ConsumerConfigurationData implements Serializable, Cloneable {
     )
     private long acknowledgementsGroupTimeMicros = TimeUnit.MILLISECONDS.toMicros(100);
 
+    @ApiModelProperty(
+            name = "maxAcknowledgmentGroupSize",
+            value = "Group a consumer acknowledgment for the number of messages."
+    )
+    private int maxAcknowledgmentGroupSize = 1000;
+
     @ApiModelProperty(
             name = "negativeAckRedeliveryDelayMicros",
             value = "Delay to wait before redelivering messages that failed to be processed.\n"
@@ -376,6 +382,7 @@ public int getMaxPendingChuckedMessage() {
 
     private boolean resetIncludeHead = false;
 
+    @JsonIgnore
     private transient KeySharedPolicy keySharedPolicy;
 
     private boolean batchIndexAckEnabled = false;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationData.java
index 9b5b96e80f7e9..8ff5c1175681e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ProducerConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ProducerConfigurationData.java
index ec1de3d473f48..581b3d8a1635e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ProducerConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ProducerConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -176,7 +176,6 @@ public class ProducerConfigurationData implements Serializable, Cloneable {
     @JsonIgnore
     private transient MessageCrypto messageCrypto = null;
 
-    @JsonIgnore
     private Set encryptionKeys = new TreeSet<>();
 
     @ApiModelProperty(
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java
index 689759cb995ee..42e115ea872fb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationData.java
index e6d7a9aa0d77e..535a63bb967ae 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/package-info.java
index 3546cd5f0b4e3..e615cf3c3bb3e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/PartialRoundRobinMessageRouterImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/PartialRoundRobinMessageRouterImpl.java
index 65e783849b579..41f6d4f68cba2 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/PartialRoundRobinMessageRouterImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/PartialRoundRobinMessageRouterImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/package-info.java
index 3f0063eb71f01..ac49ffdfed401 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/customroute/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/package-info.java
index d7b73faf5fde4..145db2ecd9c39 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractSchema.java
index c9fd6839a8ea6..6e6f235913153 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractStructSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractStructSchema.java
index 106d05af18545..929460d5f99bd 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractStructSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AbstractStructSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchema.java
index cbc27183c3679..33fcd18876be6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoProduceBytesSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoProduceBytesSchema.java
index f876fbd422e85..f26de02c87494 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoProduceBytesSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AutoProduceBytesSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroBaseStructSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroBaseStructSchema.java
index 5c493984e86cc..e1506bbea530b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroBaseStructSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroBaseStructSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroSchema.java
index d2ea9cd4a9f4c..d2e994efc53f4 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/AvroSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -118,6 +118,8 @@ public static void addLogicalTypeConversions(ReflectData reflectData, boolean js
         reflectData.addLogicalTypeConversion(new TimeConversions.DateConversion());
         reflectData.addLogicalTypeConversion(new TimeConversions.TimeMillisConversion());
         reflectData.addLogicalTypeConversion(new TimeConversions.TimeMicrosConversion());
+        reflectData.addLogicalTypeConversion(new TimeConversions.LocalTimestampMillisConversion());
+        reflectData.addLogicalTypeConversion(new TimeConversions.LocalTimestampMicrosConversion());
         if (jsr310ConversionEnabled) {
             // The conversion that is registered first is higher priority than the registered later.
             reflectData.addLogicalTypeConversion(new TimeConversions.TimestampMillisConversion());
@@ -128,8 +130,8 @@ public static void addLogicalTypeConversions(ReflectData reflectData, boolean js
             } catch (ClassNotFoundException e) {
                 // Skip if have not provide joda-time dependency.
             }
-            reflectData.addLogicalTypeConversion(new TimeConversions.TimestampMicrosConversion());
         }
+        reflectData.addLogicalTypeConversion(new TimeConversions.TimestampMicrosConversion());
         reflectData.addLogicalTypeConversion(new Conversions.UUIDConversion());
     }
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BooleanSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BooleanSchema.java
index 49548c1a20926..8c51eb4f69fc6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BooleanSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BooleanSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java
index 73431ae1d557f..b9f6aa90bd0d1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufferSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufferSchema.java
index 0bc4e9ce320cf..000a7f1c5540c 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufferSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufferSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteSchema.java
index 3e56381675b8c..95eb5bbae132a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BytesSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BytesSchema.java
index 5706af9505aae..f630b993c4ae1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BytesSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/BytesSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DateSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DateSchema.java
index 79976917e4613..490f46c811b66 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DateSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DateSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DoubleSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DoubleSchema.java
index b5d8076a04610..e1f9c488b7ad2 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DoubleSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/DoubleSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FieldSchemaBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FieldSchemaBuilderImpl.java
index 0d561ede6543e..6080256fe3b89 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FieldSchemaBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FieldSchemaBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FloatSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FloatSchema.java
index 0d26411cb7273..db6bf91a95050 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FloatSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/FloatSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/GenericObjectWrapper.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/GenericObjectWrapper.java
index 33fbd1dfa5a64..44f465d31e817 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/GenericObjectWrapper.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/GenericObjectWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/InstantSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/InstantSchema.java
index 569a9380eb8ec..61a3051797c7d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/InstantSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/InstantSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/IntSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/IntSchema.java
index 521256532c6f1..76d95a3f83135 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/IntSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/IntSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java
index ad421d8cde352..95b39043e850a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/JSONSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaImpl.java
index f3b2c234f4472..b00370b414bf6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateSchema.java
index 5c0420a0a4459..2156a982353ce 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchema.java
index e7c5965b55b9e..8755799161048 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalTimeSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalTimeSchema.java
index 59ba5d2b86039..3f23abee8e163 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalTimeSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LocalTimeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LongSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LongSchema.java
index e136fb39f2afd..0ce0c06240609 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LongSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/LongSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/NativeAvroBytesSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/NativeAvroBytesSchema.java
index c07321b3df5ef..c97ef0e60e834 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/NativeAvroBytesSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/NativeAvroBytesSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchema.java
index c6ebf38670537..f3748f5541cf9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtils.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtils.java
index 4e42e399ebaf3..f49f96ff1da45 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtils.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufSchema.java
index 22f54900d2f29..736dd2acaa06f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ProtobufSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/RecordSchemaBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/RecordSchemaBuilderImpl.java
index b1a5a4aa49e3f..18cba46a75a99 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/RecordSchemaBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/RecordSchemaBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionBuilderImpl.java
index 06a2f50abd69e..c50aac5c39821 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionImpl.java
index 090211a63fefe..79a9e3b62b578 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaDefinitionImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoUtil.java
index b51ba54266b78..4247ffc5e2f48 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ShortSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ShortSchema.java
index afa0f9a3f12a6..86b717334d9c1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ShortSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ShortSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StringSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StringSchema.java
index 2096f83bcb739..7fe4a08159090 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StringSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StringSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StructSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StructSchema.java
index 3b6e75ed75253..432bab5d8d9d7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StructSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/StructSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimeSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimeSchema.java
index 43fc0693f1775..88f5ea2309deb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimeSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimestampSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimestampSchema.java
index c89dfefc98bf8..336c45fb6af47 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimestampSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/TimestampSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchema.java
index 47904560fb63f..76708145ba1f6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractMultiVersionGenericReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractMultiVersionGenericReader.java
index 58396a1a02b52..68905f8048ba7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractMultiVersionGenericReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AbstractMultiVersionGenericReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AvroRecordBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AvroRecordBuilderImpl.java
index 53ec9743771e2..21e572dbd0fdb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AvroRecordBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/AvroRecordBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReader.java
index 1e131ffeb7be8..f333ecfceabb0 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecord.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecord.java
index c48c585899cb7..fe1a454968457 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecord.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchema.java
index 2791554e9c439..1e41d7dc4c68c 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroWriter.java
index f8d787fe4aaa8..85f2e7562db7f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonReader.java
index 1a95e9be152da..d846007f0e956 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecord.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecord.java
index 4b3a1580254a6..fa2e46c0ad763 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecord.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonSchema.java
index 999dda29028dd..7535ccab285d8 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java
index 2a640cab8a0d7..de9b2686cea46 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReader.java
index c1f04ae4e6daf..24e363f323edb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeRecord.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeRecord.java
index c9f35aa5fc60c..7a4eb35e78a39 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeRecord.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchema.java
index 7282fe312c2ac..4ae2a21929ad1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeWriter.java
index e81b692eaf430..a448cef84a73d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImpl.java
index 7432b1bfff729..a80675bfcc5c3 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/JsonRecordBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/JsonRecordBuilderImpl.java
index 4c2482dc7371f..a203c0eba53b7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/JsonRecordBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/JsonRecordBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericAvroReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericAvroReader.java
index 7abf660421533..6674aeaa416e1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericAvroReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericAvroReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericJsonReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericJsonReader.java
index 551345d3ab7bd..0a823bbfeb9e6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericJsonReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericJsonReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericProtobufNativeReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericProtobufNativeReader.java
index 4819f3f2b23c7..fba0cf6591273 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericProtobufNativeReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionGenericProtobufNativeReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProvider.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProvider.java
index 1796acfbae7e1..77e57a3e7cbab 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProvider.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/ProtobufNativeRecordBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/ProtobufNativeRecordBuilderImpl.java
index e9f333ffeb662..fe57985a09afe 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/ProtobufNativeRecordBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/ProtobufNativeRecordBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/VersionedGenericRecord.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/VersionedGenericRecord.java
index 73a791abffccc..53ec5dd96287d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/VersionedGenericRecord.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/VersionedGenericRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/package-info.java
index fc8d8cde5e8cf..0910d421a4b0f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/generic/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java
index 0b0f793a1083b..8ad04a6c61fa6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionAvroBaseReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionAvroBaseReader.java
index b657e4260e846..39115f993e7eb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionAvroBaseReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionAvroBaseReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionReader.java
index 04d820aa46d43..a4627bf374714 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AbstractMultiVersionReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
index 0c78221410b67..3ad43dbd9f2af 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JacksonJsonReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JacksonJsonReader.java
index c775a9f39e7bf..478d40a291d79 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JacksonJsonReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JacksonJsonReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JsonReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JsonReader.java
index 143d542428622..0b86cbcc84ba6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JsonReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/JsonReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/MultiVersionAvroReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/MultiVersionAvroReader.java
index bdaebdf238382..0ca847917eeca 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/MultiVersionAvroReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/MultiVersionAvroReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufNativeReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufNativeReader.java
index 1e75fccd71b04..1c10608d448ea 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufNativeReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufNativeReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufReader.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufReader.java
index fbb4fe25524d4..a2504a660a041 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufReader.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/ProtobufReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/package-info.java
index 3f2b36c0ee4d9..f71a8a24ffdd0 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/SchemaUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/SchemaUtil.java
index c7af8c0acaf19..9c8d7fd511c38 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/SchemaUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/SchemaUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/package-info.java
index b46b7040db00e..58051ea033fbb 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/AvroWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/AvroWriter.java
index 51bf26e45f691..329ba8d42d780 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/AvroWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/AvroWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JacksonJsonWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JacksonJsonWriter.java
index a8108eb544939..17a7732360632 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JacksonJsonWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JacksonJsonWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JsonWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JsonWriter.java
index 1a5cc2710941e..795546dc6eed0 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JsonWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/JsonWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufNativeWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufNativeWriter.java
index 44d9128a26cdd..32569f7b7c05f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufNativeWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufNativeWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufWriter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufWriter.java
index 8c9e8f8491cd6..52ccec8dfaaca 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufWriter.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/ProtobufWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/package-info.java
index fbcf9033b0f64..41fff913020c5 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/writer/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBufferHandler.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBufferHandler.java
index 531cc0b35cc0e..2f72f21cbd889 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBufferHandler.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBufferHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBuilderImpl.java
index c793372b33e4a..f5fa040cb8e75 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionCoordinatorClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionCoordinatorClientImpl.java
index 1d060030f6d78..71629d8cbbfd6 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionCoordinatorClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionCoordinatorClientImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -97,14 +97,9 @@ public CompletableFuture startAsync() {
                             handler.start();
                         }
                     } else {
-                        handlers = new TransactionMetaStoreHandler[1];
-                        CompletableFuture connectFuture = new CompletableFuture<>();
-                        connectFutureList.add(connectFuture);
-                        TransactionMetaStoreHandler handler = new TransactionMetaStoreHandler(0, pulsarClient,
-                                getTCAssignTopicName(-1), connectFuture);
-                        handlers[0] = handler;
-                        handlerMap.put(0, handler);
-                        handler.start();
+                        return FutureUtil.failedFuture(new TransactionCoordinatorClientException(
+                                "The broker doesn't enable the transaction coordinator, "
+                                        + "or the transaction coordinator has not initialized"));
                     }
 
                     STATE_UPDATER.set(TransactionCoordinatorClientImpl.this, State.READY);
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java
index c5d15e246870c..b7e085ed82a85 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -57,6 +57,8 @@ public class TransactionImpl implements Transaction , TimerTask {
     private final long txnIdLeastBits;
     private final long txnIdMostBits;
 
+    private final TxnID txnId;
+
     private final Map> registerPartitionMap;
     private final Map, CompletableFuture> registerSubscriptionMap;
     private final TransactionCoordinatorClientImpl tcClient;
@@ -89,6 +91,7 @@ public void run(Timeout timeout) throws Exception {
         this.transactionTimeoutMs = transactionTimeoutMs;
         this.txnIdLeastBits = txnIdLeastBits;
         this.txnIdMostBits = txnIdMostBits;
+        this.txnId = new TxnID(this.txnIdMostBits, this.txnIdLeastBits);
 
         this.registerPartitionMap = new ConcurrentHashMap<>();
         this.registerSubscriptionMap = new ConcurrentHashMap<>();
@@ -109,7 +112,7 @@ public CompletableFuture registerProducedTopic(String topic) {
                         return future.thenCompose(ignored -> CompletableFuture.completedFuture(null));
                     } else {
                         return tcClient.addPublishPartitionToTxnAsync(
-                                new TxnID(txnIdMostBits, txnIdLeastBits), Lists.newArrayList(topic))
+                                txnId, Lists.newArrayList(topic))
                                 .thenCompose(ignored -> CompletableFuture.completedFuture(null));
                     }
                 });
@@ -150,7 +153,7 @@ public CompletableFuture registerAckedTopic(String topic, String subscript
                         return future.thenCompose(ignored -> CompletableFuture.completedFuture(null));
                     } else {
                         return tcClient.addSubscriptionToTxnAsync(
-                                new TxnID(txnIdMostBits, txnIdLeastBits), topic, subscription)
+                                txnId, topic, subscription)
                                 .thenCompose(ignored -> CompletableFuture.completedFuture(null));
                     }
                 });
@@ -191,7 +194,7 @@ public CompletableFuture commit() {
                     abort().whenComplete((vx, ex) -> commitFuture.completeExceptionally(new PulsarClientException
                             .TransactionHasOperationFailedException()));
                 } else {
-                    tcClient.commitAsync(new TxnID(txnIdMostBits, txnIdLeastBits))
+                    tcClient.commitAsync(txnId)
                             .whenComplete((vx, ex) -> {
                                 if (ex != null) {
                                     if (ex instanceof TransactionNotFoundException
@@ -217,7 +220,7 @@ public CompletableFuture abort() {
             CompletableFuture abortFuture = new CompletableFuture<>();
             this.state = State.ABORTING;
             opFuture.whenComplete((v, e) -> {
-                tcClient.abortAsync(new TxnID(txnIdMostBits, txnIdLeastBits)).whenComplete((vx, ex) -> {
+                tcClient.abortAsync(txnId).whenComplete((vx, ex) -> {
 
                     if (ex != null) {
                         if (ex instanceof TransactionNotFoundException
@@ -239,7 +242,7 @@ public CompletableFuture abort() {
 
     @Override
     public TxnID getTxnID() {
-        return new TxnID(txnIdMostBits, txnIdLeastBits);
+        return this.txnId;
     }
 
     @Override
@@ -253,7 +256,7 @@ public  boolean checkIfOpen(CompletableFuture completableFuture) {
         } else {
             completableFuture
                     .completeExceptionally(new InvalidTxnStatusException(
-                            new TxnID(txnIdMostBits, txnIdLeastBits).toString(), state.name(), State.OPEN.name()));
+                            txnId.toString(), state.name(), State.OPEN.name()));
             return false;
         }
     }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/package-info.java
index 2eb0b11ad55fb..8afa45ffdfbd0 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ConsumerName.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ConsumerName.java
index 9379a4980abeb..56b47ad44c394 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ConsumerName.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ConsumerName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ExecutorProvider.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ExecutorProvider.java
index 67606af63a770..88654c51300ea 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ExecutorProvider.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ExecutorProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -40,17 +40,22 @@ public class ExecutorProvider {
     private final String poolName;
     private volatile boolean isShutdown;
 
-    protected static class ExtendedThreadFactory extends DefaultThreadFactory {
-
+    public static class ExtendedThreadFactory extends DefaultThreadFactory {
         @Getter
-        private Thread thread;
+        private volatile Thread thread;
+        public ExtendedThreadFactory(String poolName) {
+            super(poolName, false);
+        }
         public ExtendedThreadFactory(String poolName, boolean daemon) {
             super(poolName, daemon);
         }
 
         @Override
         public Thread newThread(Runnable r) {
-            thread = super.newThread(r);
+            Thread thread = super.newThread(r);
+            thread.setUncaughtExceptionHandler((t, e) ->
+                    log.error("Thread {} got uncaught Exception", t.getName(), e));
+            this.thread = thread;
             return thread;
         }
     }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/MathUtils.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/MathUtils.java
index 11297ec18cfb0..ee2ca9f54b577 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/MathUtils.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/MathUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/MessageIdUtils.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/MessageIdUtils.java
index 34920c3a2dacf..60cdad8e77200 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/MessageIdUtils.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/MessageIdUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/NoOpLock.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/NoOpLock.java
new file mode 100644
index 0000000000000..ef627ecb6f370
--- /dev/null
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/NoOpLock.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.util;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+
+public class NoOpLock implements Lock {
+    public static final NoOpLock INSTANCE = new NoOpLock();
+
+    public void lock() {
+    }
+
+    public void lockInterruptibly() throws InterruptedException {
+        if (Thread.interrupted()) {
+            throw new InterruptedException();
+        }
+    }
+
+    public boolean tryLock() {
+        return true;
+    }
+
+    public boolean tryLock(long l, TimeUnit tu) throws InterruptedException {
+        if (Thread.interrupted()) {
+            throw new InterruptedException();
+        } else {
+            return true;
+        }
+    }
+
+    public void unlock() {
+    }
+
+    public Condition newCondition() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ObjectCache.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ObjectCache.java
index 4bba6273a1834..dc057ffe32daf 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ObjectCache.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ObjectCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryMessageUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryMessageUtil.java
index 7435710f7b147..f73c266877988 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryMessageUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryMessageUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryUtil.java
index ae60c9ca89af1..93501d7b6c18b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/RetryUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ScheduledExecutorProvider.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ScheduledExecutorProvider.java
index 887ae3bb7fff4..3ebd41ebe566b 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/ScheduledExecutorProvider.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/ScheduledExecutorProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/Secret.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/Secret.java
index 380800adea6bc..346102b05cfc8 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/Secret.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/Secret.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/SecretsSerializer.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/SecretsSerializer.java
index d05d1b688cdd8..d2e08b755eec8 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/SecretsSerializer.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/SecretsSerializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/TimedCompletableFuture.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/TimedCompletableFuture.java
index 30c1eb3822492..c913ece43fe9a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/TimedCompletableFuture.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/TimedCompletableFuture.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/TypeCheckUtil.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/TypeCheckUtil.java
index 912ea577ea33e..c837d544becb9 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/TypeCheckUtil.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/TypeCheckUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/WithSNISslEngineFactory.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/WithSNISslEngineFactory.java
index 965a7f2aec328..d950e68271bcd 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/WithSNISslEngineFactory.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/WithSNISslEngineFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/util/package-info.java b/pulsar-client/src/main/java/org/apache/pulsar/client/util/package-info.java
index 2e53413b4799a..cd9b2d48c990d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/util/package-info.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
index d53ae10d1055f..7c6de1abbcf93 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerConfigurationTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerConfigurationTest.java
index 9dd734db21666..224196250bbf9 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerConfigurationTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
index 30e0cc19c2a64..3490991b4ada7 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/KeySharedPolicyTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/KeySharedPolicyTest.java
index 1f6af054224c9..ebee0618b12bc 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/KeySharedPolicyTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/KeySharedPolicyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageIdTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageIdTest.java
index f96d2885cac85..e5377ad9848a1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageIdTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageIdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessagePayloadTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessagePayloadTest.java
index f980e5141886b..5b5ebf421b88b 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessagePayloadTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessagePayloadTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageRouterTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageRouterTest.java
index 0c29ecb7fef8f..27bff9481184f 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageRouterTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MessageRouterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MultiplierRedeliveryBackoffTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MultiplierRedeliveryBackoffTest.java
index dc5721913b581..708e6e969639d 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/MultiplierRedeliveryBackoffTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/MultiplierRedeliveryBackoffTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/RangeTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/RangeTest.java
index da926447ef476..610c782518348 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/RangeTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/RangeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/api/SchemaDefinitionBuilderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/api/SchemaDefinitionBuilderTest.java
index 3e4b21434081f..b8292bc303b5a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/api/SchemaDefinitionBuilderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/api/SchemaDefinitionBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/examples/TransactionExample.java b/pulsar-client/src/test/java/org/apache/pulsar/client/examples/TransactionExample.java
index faf8986910115..73f52821a9b02 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/examples/TransactionExample.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/examples/TransactionExample.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
index 95b5eb81c3333..ddca6951e49e1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AuthenticationUtilTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AuthenticationUtilTest.java
new file mode 100644
index 0000000000000..135b6d377994f
--- /dev/null
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AuthenticationUtilTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.impl;
+
+import static org.testng.Assert.assertEquals;
+import java.util.Map;
+import org.testng.annotations.Test;
+
+public class AuthenticationUtilTest {
+
+    @Test
+    public void testConfigureAuthParamString() {
+        Map params = AuthenticationUtil.configureFromPulsar1AuthParamString(
+                "key:value,path:C:\\path\\to\\file,null-key:,:null-value,:,key:value-2");
+        assertEquals(params.size(), 3);
+        assertEquals(params.get("key"), "value-2");
+        assertEquals(params.get("path"), "C:\\path\\to\\file");
+        assertEquals(params.get("null-key"), "");
+    }
+}
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AutoClusterFailoverTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AutoClusterFailoverTest.java
index ad5cdec8f66a4..a2e7719330ae1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AutoClusterFailoverTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AutoClusterFailoverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BackoffTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BackoffTest.java
index e8e353932e26d..7f13acb769492 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BackoffTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BackoffTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabledTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabledTest.java
index e32a2ef45f93e..1b3795d878cd8 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabledTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerDisabledTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerTest.java
index 8c1565eb2cb2c..d31fd18cba971 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageAckerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
index 29d423388357e..4b80e19c256d7 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -25,6 +25,7 @@
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.util.ReferenceCountUtil;
 import java.lang.reflect.Field;
@@ -36,7 +37,6 @@
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
 import org.apache.pulsar.common.api.proto.MessageMetadata;
-import org.junit.Assert;
 import org.testng.annotations.Test;
 
 public class BatchMessageContainerImplTest {
@@ -112,7 +112,7 @@ public void recoveryAfterOom() {
             clientFiled.setAccessible(true);
             clientFiled.set(producer, pulsarClient);
         } catch (Exception e){
-            Assert.fail(e.getMessage());
+            fail(e.getMessage());
         }
 
         when(producer.getConfiguration()).thenReturn(producerConfigurationData);
@@ -155,7 +155,7 @@ public void testMessagesSize() throws Exception {
             clientFiled.setAccessible(true);
             clientFiled.set(producer, pulsarClient);
         } catch (Exception e){
-            Assert.fail(e.getMessage());
+            fail(e.getMessage());
         }
 
         ByteBuffer payload = ByteBuffer.wrap("payload".getBytes(StandardCharsets.UTF_8));
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplTest.java
index f8545ea2497a5..d10b3da81ff4a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageIdImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BinaryProtoLookupServiceTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BinaryProtoLookupServiceTest.java
index 6c94d56fc7ce9..0254cf8d44cea 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BinaryProtoLookupServiceTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BinaryProtoLookupServiceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BuildersTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BuildersTest.java
index 2ba6cba83db4e..607689e0e2b3b 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BuildersTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/BuildersTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ChunkMessageIdImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ChunkMessageIdImplTest.java
index 11bdd8f9f90af..b1a04d72ed899 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ChunkMessageIdImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ChunkMessageIdImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
index 2402268aec0f6..c435d6f05e425 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,10 +18,10 @@
  */
 package org.apache.pulsar.client.impl;
 
+import static org.testng.Assert.fail;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.ServiceUrlProvider;
-import org.junit.Assert;
 import org.testng.annotations.Test;
 
 public class ClientBuilderImplTest {
@@ -90,7 +90,7 @@ public void testConnectionMaxIdleSeconds() throws Exception {
         // test config not correct.
         try {
             PulsarClient.builder().connectionMaxIdleSeconds(30);
-            Assert.fail();
+            fail();
         } catch (IllegalArgumentException e){
         }
     }
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
index cf86094fb71e6..ca6114d2ed823 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java
index 63aa7b7048be0..22220805814f5 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -120,6 +120,49 @@ public void testPendingLookupRequestSemaphore() throws Exception {
         eventLoop.shutdownGracefully();
     }
 
+    @Test
+    public void testPendingLookupRequestSemaphoreServiceNotReady() throws Exception {
+        EventLoopGroup eventLoop = EventLoopUtil.newEventLoopGroup(1, false, new DefaultThreadFactory("testClientCnxTimeout"));
+        ClientConfigurationData conf = new ClientConfigurationData();
+        conf.setOperationTimeoutMs(10_000);
+        conf.setKeepAliveIntervalSeconds(0);
+        ClientCnx cnx = new ClientCnx(conf, eventLoop);
+
+        ChannelHandlerContext ctx = mock(ChannelHandlerContext.class);
+        Channel channel = mock(Channel.class);
+        when(ctx.channel()).thenReturn(channel);
+        ChannelFuture listenerFuture = mock(ChannelFuture.class);
+        when(listenerFuture.addListener(any())).thenReturn(listenerFuture);
+        when(ctx.writeAndFlush(any())).thenReturn(listenerFuture);
+        cnx.channelActive(ctx);
+        cnx.state = ClientCnx.State.Ready;
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        CompletableFuture completableFuture = new CompletableFuture<>();
+        new Thread(() -> {
+            try {
+                Thread.sleep(1_000);
+                CompletableFuture future =
+                        cnx.newLookup(null, 123);
+                countDownLatch.countDown();
+                future.get();
+            } catch (Exception e) {
+                completableFuture.complete(e);
+            }
+        }).start();
+        countDownLatch.await();
+        CommandError commandError = new CommandError();
+        commandError.setRequestId(123L);
+        commandError.setError(ServerError.ServiceNotReady);
+        commandError.setMessage("Service not ready");
+        cnx.handleError(commandError);
+        assertTrue(completableFuture.get().getCause() instanceof PulsarClientException.LookupException);
+        // wait for subsequent calls over
+        Awaitility.await().untilAsserted(() -> {
+            assertEquals(cnx.getPendingLookupRequestSemaphore().availablePermits(), conf.getConcurrentLookupRequest());
+        });
+        eventLoop.shutdownGracefully();
+    }
+
     @Test
     public void testPendingWaitingLookupRequestSemaphore() throws Exception {
         EventLoopGroup eventLoop = EventLoopUtil.newEventLoopGroup(1, false, new DefaultThreadFactory("testClientCnxTimeout"));
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientInitializationTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientInitializationTest.java
index c99bdcb1b0b15..3b92f362ca188 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientInitializationTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientInitializationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-
+import lombok.Cleanup;
 import org.apache.pulsar.client.api.Authentication;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
@@ -33,7 +33,9 @@ public class ClientInitializationTest {
     public void testInitializeAuthWithTls() throws PulsarClientException {
         Authentication auth = mock(Authentication.class);
 
-        PulsarClient.builder()
+        @Cleanup
+        PulsarClient pulsarClient =
+                PulsarClient.builder()
                 .serviceUrl("pulsar+ssl://my-host:6650")
                 .authentication(auth)
                 .build();
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
index 4f69755eaf988..4db5dbe877685 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConnectionTimeoutTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConnectionTimeoutTest.java
index af79a4f645f2d..b88a8679a69d2 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConnectionTimeoutTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConnectionTimeoutTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
index 32afe69c3d082..daa3fbf8eba2d 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,10 +22,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -34,16 +39,32 @@
 import org.apache.pulsar.client.api.BatchReceivePolicy;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.ConsumerBuilder;
+import org.apache.pulsar.client.api.ConsumerCryptoFailureAction;
+import org.apache.pulsar.client.api.ConsumerEventListener;
+import org.apache.pulsar.client.api.CryptoKeyReader;
 import org.apache.pulsar.client.api.DeadLetterPolicy;
+import org.apache.pulsar.client.api.KeySharedPolicy;
+import org.apache.pulsar.client.api.MessageCrypto;
+import org.apache.pulsar.client.api.MessageListener;
+import org.apache.pulsar.client.api.MessagePayloadProcessor;
 import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.RedeliveryBackoff;
+import org.apache.pulsar.client.api.RegexSubscriptionMode;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.SubscriptionInitialPosition;
 import org.apache.pulsar.client.api.SubscriptionMode;
+import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
 import org.apache.pulsar.client.impl.conf.TopicConsumerConfigurationData;
+import org.apache.pulsar.client.impl.crypto.MessageCryptoBc;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
 /**
  * Unit tests of {@link ConsumerBuilderImpl}.
  */
@@ -61,6 +82,17 @@ public void setup() {
         consumerBuilderImpl = new ConsumerBuilderImpl(client, consumerConfigurationData, Schema.BYTES);
     }
 
+    @Test
+    public void testMaxAcknowledgmentGroupSizeInvalid() {
+        try {
+            consumerBuilderImpl.maxAcknowledgmentGroupSize(0);
+            fail("Should throw exception");
+        } catch (IllegalArgumentException e) {
+            // expect exception
+            assertEquals(e.getMessage(), "acknowledgementsGroupSize needs to be > 0");
+        }
+    }
+
     @Test
     public void testConsumerBuilderImpl() throws PulsarClientException {
         Consumer consumer = mock(Consumer.class);
@@ -356,4 +388,218 @@ public void testTopicConsumerBuilder() {
         assertThat(topicConsumerConfigurationData.getTopicNameMatcher().matches("foo")).isTrue();
         assertThat(topicConsumerConfigurationData.getPriorityLevel()).isEqualTo(1);
     }
+
+    @Test
+    public void testLoadConf() throws Exception {
+        ConsumerBuilderImpl consumerBuilder = createConsumerBuilder();
+
+        String jsonConf = ("{\n"
+            + "    'topicNames' : [ 'new-topic' ],\n"
+            + "    'topicsPattern' : 'new-topics-pattern',\n"
+            + "    'subscriptionName' : 'new-subscription',\n"
+            + "    'subscriptionType' : 'Key_Shared',\n"
+            + "    'subscriptionProperties' : {\n"
+            + "      'new-sub-prop' : 'new-sub-prop-value'\n"
+            + "    },\n"
+            + "    'subscriptionMode' : 'NonDurable',\n"
+            + "    'receiverQueueSize' : 2,\n"
+            + "    'acknowledgementsGroupTimeMicros' : 2,\n"
+            + "    'maxAcknowledgmentGroupSize' : 2,\n"
+            + "    'negativeAckRedeliveryDelayMicros' : 2,\n"
+            + "    'maxTotalReceiverQueueSizeAcrossPartitions' : 2,\n"
+            + "    'consumerName' : 'new-consumer',\n"
+            + "    'ackTimeoutMillis' : 2,\n"
+            + "    'tickDurationMillis' : 2,\n"
+            + "    'priorityLevel' : 2,\n"
+            + "    'maxPendingChunkedMessage' : 2,\n"
+            + "    'autoAckOldestChunkedMessageOnQueueFull' : true,\n"
+            + "    'expireTimeOfIncompleteChunkedMessageMillis' : 2,\n"
+            + "    'cryptoFailureAction' : 'DISCARD',\n"
+            + "    'properties' : {\n"
+            + "      'new-prop' : 'new-prop-value'\n"
+            + "    },\n"
+            + "    'readCompacted' : true,\n"
+            + "    'subscriptionInitialPosition' : 'Earliest',\n"
+            + "    'patternAutoDiscoveryPeriod' : 2,\n"
+            + "    'regexSubscriptionMode' : 'AllTopics',\n"
+            + "    'deadLetterPolicy' : {\n"
+            + "      'retryLetterTopic' : 'new-retry',\n"
+            + "      'initialSubscriptionName' : 'new-dlq-sub',\n"
+            + "      'deadLetterTopic' : 'new-dlq',\n"
+            + "      'maxRedeliverCount' : 2\n"
+            + "    },\n"
+            + "    'retryEnable' : true,\n"
+            + "    'autoUpdatePartitions' : false,\n"
+            + "    'autoUpdatePartitionsIntervalSeconds' : 2,\n"
+            + "    'replicateSubscriptionState' : true,\n"
+            + "    'resetIncludeHead' : true,\n"
+            + "    'batchIndexAckEnabled' : true,\n"
+            + "    'ackReceiptEnabled' : true,\n"
+            + "    'poolMessages' : true,\n"
+            + "    'startPaused' : true,\n"
+            + "    'autoScaledReceiverQueueSizeEnabled' : true\n"
+            + "  }").replace("'", "\"");
+
+        Map conf = new ObjectMapper().readValue(jsonConf, new TypeReference>() {});
+
+        MessageListener messageListener = (consumer, message) -> {};
+        conf.put("messageListener", messageListener);
+        ConsumerEventListener consumerEventListener = mock(ConsumerEventListener.class);
+        conf.put("consumerEventListener", consumerEventListener);
+        RedeliveryBackoff negativeAckRedeliveryBackoff = MultiplierRedeliveryBackoff.builder().build();
+        conf.put("negativeAckRedeliveryBackoff", negativeAckRedeliveryBackoff);
+        RedeliveryBackoff ackTimeoutRedeliveryBackoff = MultiplierRedeliveryBackoff.builder().build();;
+        conf.put("ackTimeoutRedeliveryBackoff", ackTimeoutRedeliveryBackoff);
+        CryptoKeyReader cryptoKeyReader = DefaultCryptoKeyReader.builder().build();
+        conf.put("cryptoKeyReader", cryptoKeyReader);
+        MessageCrypto messageCrypto = new MessageCryptoBc("ctx2", true);
+        conf.put("messageCrypto", messageCrypto);
+        BatchReceivePolicy batchReceivePolicy = BatchReceivePolicy.builder().maxNumBytes(2).build();
+        conf.put("batchReceivePolicy", batchReceivePolicy);
+        KeySharedPolicy keySharedPolicy = KeySharedPolicy.stickyHashRange();
+        conf.put("keySharedPolicy", keySharedPolicy);
+        MessagePayloadProcessor payloadProcessor = mock(MessagePayloadProcessor.class);
+        conf.put("payloadProcessor", payloadProcessor);
+
+        consumerBuilder.loadConf(conf);
+
+        ConsumerConfigurationData configurationData = consumerBuilder.getConf();
+        assertEquals(configurationData.getTopicNames(), new HashSet<>(Collections.singletonList("new-topic")));
+        assertEquals(configurationData.getTopicsPattern().pattern(), "new-topics-pattern");
+        assertEquals(configurationData.getSubscriptionName(), "new-subscription");
+        assertEquals(configurationData.getSubscriptionType(), SubscriptionType.Key_Shared);
+        assertThat(configurationData.getSubscriptionProperties()).hasSize(1)
+            .hasFieldOrPropertyWithValue("new-sub-prop", "new-sub-prop-value");
+        assertEquals(configurationData.getSubscriptionMode(), SubscriptionMode.NonDurable);
+        assertEquals(configurationData.getReceiverQueueSize(), 2);
+        assertEquals(configurationData.getAcknowledgementsGroupTimeMicros(), 2);
+        assertEquals(configurationData.getMaxAcknowledgmentGroupSize(), 2);
+        assertEquals(configurationData.getNegativeAckRedeliveryDelayMicros(), 2);
+        assertEquals(configurationData.getMaxTotalReceiverQueueSizeAcrossPartitions(), 2);
+        assertEquals(configurationData.getConsumerName(), "new-consumer");
+        assertEquals(configurationData.getAckTimeoutMillis(), 2);
+        assertEquals(configurationData.getTickDurationMillis(), 2);
+        assertEquals(configurationData.getPriorityLevel(), 2);
+        assertEquals(configurationData.getMaxPendingChunkedMessage(), 2);
+        assertTrue(configurationData.isAutoAckOldestChunkedMessageOnQueueFull());
+        assertEquals(configurationData.getExpireTimeOfIncompleteChunkedMessageMillis(), 2);
+        assertEquals(configurationData.getCryptoFailureAction(), ConsumerCryptoFailureAction.DISCARD);
+        assertThat(configurationData.getProperties()).hasSize(1)
+            .hasFieldOrPropertyWithValue("new-prop", "new-prop-value");
+        assertTrue(configurationData.isReadCompacted());
+        assertEquals(configurationData.getSubscriptionInitialPosition(), SubscriptionInitialPosition.Earliest);
+        assertEquals(configurationData.getPatternAutoDiscoveryPeriod(), 2);
+        assertEquals(configurationData.getRegexSubscriptionMode(), RegexSubscriptionMode.AllTopics);
+        assertEquals(configurationData.getDeadLetterPolicy().getDeadLetterTopic(), "new-dlq");
+        assertEquals(configurationData.getDeadLetterPolicy().getRetryLetterTopic(), "new-retry");
+        assertEquals(configurationData.getDeadLetterPolicy().getInitialSubscriptionName(), "new-dlq-sub");
+        assertEquals(configurationData.getDeadLetterPolicy().getMaxRedeliverCount(), 2);
+        assertTrue(configurationData.isRetryEnable());
+        assertFalse(configurationData.isAutoUpdatePartitions());
+        assertEquals(configurationData.getAutoUpdatePartitionsIntervalSeconds(), 2);
+        assertTrue(configurationData.isReplicateSubscriptionState());
+        assertTrue(configurationData.isResetIncludeHead());
+        assertTrue(configurationData.isBatchIndexAckEnabled());
+        assertTrue(configurationData.isAckReceiptEnabled());
+        assertTrue(configurationData.isPoolMessages());
+        assertTrue(configurationData.isStartPaused());
+        assertTrue(configurationData.isAutoScaledReceiverQueueSizeEnabled());
+
+        assertNull(configurationData.getMessageListener());
+        assertNull(configurationData.getConsumerEventListener());
+        assertNull(configurationData.getNegativeAckRedeliveryBackoff());
+        assertNull(configurationData.getAckTimeoutRedeliveryBackoff());
+        assertNull(configurationData.getMessageListener());
+        assertNull(configurationData.getMessageCrypto());
+        assertNull(configurationData.getCryptoKeyReader());
+        assertNull(configurationData.getBatchReceivePolicy());
+        assertNull(configurationData.getKeySharedPolicy());
+        assertNull(configurationData.getPayloadProcessor());
+    }
+
+    @Test
+    public void testLoadConfNotModified() {
+        ConsumerBuilderImpl consumerBuilder = createConsumerBuilder();
+
+        consumerBuilder.loadConf(new HashMap<>());
+
+        ConsumerConfigurationData configurationData = consumerBuilder.getConf();
+        assertEquals(configurationData.getTopicNames(), new HashSet<>(Collections.singletonList("topic")));
+        assertEquals(configurationData.getTopicsPattern().pattern(), "topics-pattern");
+        assertEquals(configurationData.getSubscriptionName(), "subscription");
+        assertEquals(configurationData.getSubscriptionType(), SubscriptionType.Exclusive);
+        assertThat(configurationData.getSubscriptionProperties()).hasSize(1)
+            .hasFieldOrPropertyWithValue("sub-prop", "sub-prop-value");
+        assertEquals(configurationData.getSubscriptionMode(), SubscriptionMode.Durable);
+        assertEquals(configurationData.getReceiverQueueSize(), 1000);
+        assertEquals(configurationData.getAcknowledgementsGroupTimeMicros(), TimeUnit.MILLISECONDS.toMicros(100));
+        assertEquals(configurationData.getMaxAcknowledgmentGroupSize(), 1000);
+        assertEquals(configurationData.getNegativeAckRedeliveryDelayMicros(), TimeUnit.MINUTES.toMicros(1));
+        assertEquals(configurationData.getMaxTotalReceiverQueueSizeAcrossPartitions(), 50000);
+        assertEquals(configurationData.getConsumerName(), "consumer");
+        assertEquals(configurationData.getAckTimeoutMillis(), 30000);
+        assertEquals(configurationData.getTickDurationMillis(), 1000);
+        assertEquals(configurationData.getPriorityLevel(), 0);
+        assertEquals(configurationData.getMaxPendingChunkedMessage(), 10);
+        assertFalse(configurationData.isAutoAckOldestChunkedMessageOnQueueFull());
+        assertEquals(configurationData.getExpireTimeOfIncompleteChunkedMessageMillis(), TimeUnit.MINUTES.toMillis(1));
+        assertEquals(configurationData.getCryptoFailureAction(), ConsumerCryptoFailureAction.FAIL);
+        assertThat(configurationData.getProperties()).hasSize(1)
+            .hasFieldOrPropertyWithValue("prop", "prop-value");
+        assertFalse(configurationData.isReadCompacted());
+        assertEquals(configurationData.getSubscriptionInitialPosition(), SubscriptionInitialPosition.Latest);
+        assertEquals(configurationData.getPatternAutoDiscoveryPeriod(), 60);
+        assertEquals(configurationData.getRegexSubscriptionMode(), RegexSubscriptionMode.PersistentOnly);
+        assertEquals(configurationData.getDeadLetterPolicy().getDeadLetterTopic(), "dlq");
+        assertEquals(configurationData.getDeadLetterPolicy().getRetryLetterTopic(), "retry");
+        assertEquals(configurationData.getDeadLetterPolicy().getInitialSubscriptionName(), "dlq-sub");
+        assertEquals(configurationData.getDeadLetterPolicy().getMaxRedeliverCount(), 1);
+        assertFalse(configurationData.isRetryEnable());
+        assertTrue(configurationData.isAutoUpdatePartitions());
+        assertEquals(configurationData.getAutoUpdatePartitionsIntervalSeconds(), 60);
+        assertFalse(configurationData.isReplicateSubscriptionState());
+        assertFalse(configurationData.isResetIncludeHead());
+        assertFalse(configurationData.isBatchIndexAckEnabled());
+        assertFalse(configurationData.isAckReceiptEnabled());
+        assertFalse(configurationData.isPoolMessages());
+        assertFalse(configurationData.isStartPaused());
+        assertFalse(configurationData.isAutoScaledReceiverQueueSizeEnabled());
+
+        assertNull(configurationData.getMessageListener());
+        assertNull(configurationData.getConsumerEventListener());
+        assertNull(configurationData.getNegativeAckRedeliveryBackoff());
+        assertNull(configurationData.getAckTimeoutRedeliveryBackoff());
+        assertNull(configurationData.getMessageListener());
+        assertNull(configurationData.getMessageCrypto());
+        assertNull(configurationData.getCryptoKeyReader());
+        assertNull(configurationData.getBatchReceivePolicy());
+        assertNull(configurationData.getKeySharedPolicy());
+        assertNull(configurationData.getPayloadProcessor());
+    }
+
+    private ConsumerBuilderImpl createConsumerBuilder() {
+        ConsumerBuilderImpl consumerBuilder = new ConsumerBuilderImpl<>(null, Schema.BYTES);
+        Map properties = new HashMap<>();
+        properties.put("prop", "prop-value");
+        Map subscriptionProperties = new HashMap<>();
+        subscriptionProperties.put("sub-prop", "sub-prop-value");
+        consumerBuilder
+            .topic("topic")
+            .topicsPattern("topics-pattern")
+            .subscriptionName("subscription")
+            .subscriptionProperties(subscriptionProperties)
+            .messageListener((consumer, message) -> {})
+            .consumerEventListener(mock(ConsumerEventListener.class))
+            .negativeAckRedeliveryBackoff(MultiplierRedeliveryBackoff.builder().build())
+            .ackTimeoutRedeliveryBackoff(MultiplierRedeliveryBackoff.builder().build())
+            .consumerName("consumer")
+            .cryptoKeyReader(DefaultCryptoKeyReader.builder().build())
+            .messageCrypto(new MessageCryptoBc("ctx1", true))
+            .properties(properties)
+            .deadLetterPolicy(DeadLetterPolicy.builder().deadLetterTopic("dlq").retryLetterTopic("retry").initialSubscriptionName("dlq-sub").maxRedeliverCount(1).build())
+            .batchReceivePolicy(BatchReceivePolicy.builder().maxNumBytes(1).build())
+            .keySharedPolicy(KeySharedPolicy.autoSplitHashRange())
+            .messagePayloadProcessor(mock(MessagePayloadProcessor.class));
+        return consumerBuilder;
+    }
 }
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerImplTest.java
index 756c18441b38b..29d180f5f9a16 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -33,6 +33,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import lombok.Cleanup;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.Messages;
@@ -228,6 +229,7 @@ public void testConsumerCreatedWhilePaused() throws InterruptedException {
 
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testCreateConsumerWhenSchemaIsNull() throws PulsarClientException {
+        @Cleanup
         PulsarClient client = PulsarClient.builder()
             .serviceUrl("pulsar://127.0.0.1:6650")
             .build();
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ControlledClusterFailoverTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ControlledClusterFailoverTest.java
index d7a631c571c08..d2d31ab85c59c 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ControlledClusterFailoverTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ControlledClusterFailoverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderTest.java
index 2df1a9adc5771..1b11ca3da70fe 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/DefaultCryptoKeyReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/HashTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/HashTest.java
index 1f68db3bc2f41..501bf1e3d0d12 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/HashTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/HashTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/LastCumulativeAckTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/LastCumulativeAckTest.java
index 102ccfc0e07a5..27ee9d1dc3648 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/LastCumulativeAckTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/LastCumulativeAckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -83,4 +83,24 @@ public void testFlush() {
         assertEquals(lastCumulativeAckToFlush.getBitSetRecyclable(), bitSetRecyclable);
     }
 
+    @Test
+    public void testCompareTo() {
+        LastCumulativeAck lastCumulativeAck = new LastCumulativeAck();
+        lastCumulativeAck.update(new MessageIdImpl(0L, 1L, -1), null);
+
+        assertTrue(lastCumulativeAck.compareTo(new MessageIdImpl(0L, 0L, -1)) > 0);
+        assertEquals(lastCumulativeAck.compareTo(new MessageIdImpl(0L, 1L, -1)), 0);
+        assertTrue(lastCumulativeAck.compareTo(new MessageIdImpl(0L, 2L, -1)) < 0);
+        assertTrue(lastCumulativeAck.compareTo(new BatchMessageIdImpl(0L, 1L, -1, 0)) > 0);
+
+        lastCumulativeAck = new LastCumulativeAck();
+        lastCumulativeAck.update(new BatchMessageIdImpl(0L, 1L, -1, 1), null);
+
+        assertTrue(lastCumulativeAck.compareTo(new MessageIdImpl(0L, 0L, -1)) > 0);
+        assertTrue(lastCumulativeAck.compareTo(new MessageIdImpl(0L, 1L, -1)) < 0);
+        assertTrue(lastCumulativeAck.compareTo(new MessageIdImpl(0L, 2L, -1)) < 0);
+        assertTrue(lastCumulativeAck.compareTo(new BatchMessageIdImpl(0L, 1L, -1, 0)) > 0);
+        assertTrue(lastCumulativeAck.compareTo(new BatchMessageIdImpl(0L, 1L, -1, 2)) < 0);
+        assertEquals(lastCumulativeAck.compareTo(new BatchMessageIdImpl(0L, 1L, -1, 1)), 0);
+    }
 }
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MemoryLimitControllerTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MemoryLimitControllerTest.java
index c94a8365eef5d..78ffa247f7b6e 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MemoryLimitControllerTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MemoryLimitControllerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdCompareToTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdCompareToTest.java
index 5afb8b5ea3091..4f0eca6ea4af8 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdCompareToTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdCompareToTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageIdSerializationTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdSerializationTest.java
similarity index 75%
rename from pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageIdSerializationTest.java
rename to pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdSerializationTest.java
index 295c7803372f9..7f029635241de 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageIdSerializationTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageIdSerializationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,15 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pulsar.broker.service;
+package org.apache.pulsar.client.impl;
 
 import static org.testng.Assert.assertEquals;
 import java.io.IOException;
 import org.apache.pulsar.client.api.MessageId;
-import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.testng.annotations.Test;
 
-@Test(groups = "broker")
 public class MessageIdSerializationTest {
 
     @Test
@@ -32,6 +30,7 @@ public void testProtobufSerialization1() throws Exception {
         MessageId id = new MessageIdImpl(1, 2, 3);
         byte[] serializedId = id.toByteArray();
         assertEquals(MessageId.fromByteArray(serializedId), id);
+        assertEquals(MessageId.fromByteArrayWithTopic(serializedId, "my-topic"), id);
     }
 
     @Test
@@ -39,6 +38,16 @@ public void testProtobufSerialization2() throws Exception {
         MessageId id = new MessageIdImpl(1, 2, -1);
         byte[] serializedId = id.toByteArray();
         assertEquals(MessageId.fromByteArray(serializedId), id);
+        assertEquals(MessageId.fromByteArrayWithTopic(serializedId, "my-topic"), id);
+    }
+
+    @Test
+    public void testBatchSizeNotSet() throws Exception {
+        MessageId id = new BatchMessageIdImpl(1L, 2L, 3, 4, -1,
+                BatchMessageAckerDisabled.INSTANCE);
+        byte[] serialized = id.toByteArray();
+        assertEquals(MessageId.fromByteArray(serialized), id);
+        assertEquals(MessageId.fromByteArrayWithTopic(serialized, "my-topic"), id);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageImplTest.java
index 3d299865ac462..d0a445740c6cd 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageTest.java
index 13cf4f6b78865..ad56df918c051 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
index 15288cecb1ca2..febec2bff3285 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -185,6 +185,14 @@ public void testBatchReceiveAsyncCanBeCancelled() {
         assertFalse(consumer.hasPendingBatchReceive());
     }
 
+    @Test(expectedExceptions = {IllegalArgumentException.class})
+    public void testValidTopicNames() {
+        ConsumerConfigurationData consumerConfData = new ConsumerConfigurationData<>();
+        consumerConfData.setSubscriptionName("subscriptionName");
+        consumerConfData.setTopicNames(Sets.newHashSet("persistent://public/invalid-topic"));
+        createMultiTopicsConsumer(consumerConfData);
+    }
+
     @Test
     public void testConsumerCleanupOnSubscribeFailure() {
         ConsumerConfigurationData consumerConfData = new ConsumerConfigurationData<>();
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/OpSendMsgQueueTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/OpSendMsgQueueTest.java
index bf45e87cbff03..2db23782640eb 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/OpSendMsgQueueTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/OpSendMsgQueueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
index aceea081070c9..223881d85a87b 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImplTest.java
index f40c451488a43..5baca24cf8aa1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java
index 3a3ce07ebe3ad..66c552ef7934a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerImplTest.java
index 8ca7a59969515..6fcedc3f94de7 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
index f6e7f284ce639..32d0eff6e792e 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerStatsRecorderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,18 +18,18 @@
  */
 package org.apache.pulsar.client.impl;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
+import java.util.concurrent.TimeUnit;
 import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
 import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
 import org.testng.annotations.Test;
 
-import java.util.concurrent.TimeUnit;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-
 /**
  * Unit tests of {@link ProducerStatsRecorderImpl}.
  */
@@ -74,4 +74,15 @@ public void testGetStatsAndCancelStatsTimeoutWithoutArriveUpdateInterval() {
         recorder.cancelStatsTimeout();
         assertEquals(1000.0, recorder.getSendLatencyMillisMax(), 0.5);
     }
+
+    @Test
+    public void testPartitionTopicAggegationStats() {
+        ProducerStatsRecorderImpl recorder1 = spy(new ProducerStatsRecorderImpl());
+        PartitionedTopicProducerStatsRecorderImpl recorder2 = new PartitionedTopicProducerStatsRecorderImpl();
+        when(recorder1.getSendMsgsRate()).thenReturn(1000.0);
+        when(recorder1.getSendBytesRate()).thenReturn(1000.0);
+        recorder2.updateCumulativeStats("test", recorder1);
+        assertTrue(recorder2.getSendBytesRate() > 0);
+        assertTrue(recorder2.getSendMsgsRate() > 0);
+    }
 }
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarClientImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarClientImplTest.java
index 5c7228919ab35..2df435fb5eb20 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarClientImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarClientImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
index 2a0e39dcf71f5..cb9629ac50668 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ReaderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ReaderImplTest.java
index 0b7b388f23217..1bbdf274293a2 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ReaderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ReaderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImplTest.java
index dee9144acafb1..e50d292226fdc 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImplTest.java
index f4a7b652d18bd..6cfff778cea1c 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/SinglePartitionMessageRouterImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TableViewConfigurationDataTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TableViewConfigurationDataTest.java
new file mode 100644
index 0000000000000..03d62a83d41bb
--- /dev/null
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TableViewConfigurationDataTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.impl;
+
+import static org.testng.Assert.assertEquals;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pulsar.client.impl.conf.ConfigurationDataUtils;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test of {@link TableViewConfigurationData}.
+ */
+public class TableViewConfigurationDataTest {
+    @Test
+    public void testLoadConfigFromMap() {
+        Map configMap = new HashMap<>();
+        configMap.put("topicName", "persistent://public/default/test");
+        configMap.put("subscriptionName", "test-sub");
+        configMap.put("autoUpdatePartitionsSeconds", "60");
+        TableViewConfigurationData config = new TableViewConfigurationData();
+        config = ConfigurationDataUtils.loadData(
+                configMap, config, TableViewConfigurationData.class);
+
+        assertEquals(configMap.get("topicName"), config.getTopicName());
+        assertEquals(configMap.get("subscriptionName"), config.getSubscriptionName());
+        assertEquals(configMap.get("autoUpdatePartitionsSeconds"), String.valueOf(config.getAutoUpdatePartitionsSeconds()));
+    }
+}
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImplTest.java
index cfc2380cebe34..a924312802688 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicConsumerBuilderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicListWatcherTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicListWatcherTest.java
index 1d245350c82cb..0d24d76023c87 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicListWatcherTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicListWatcherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMessageIdImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMessageIdImplTest.java
index 598fe215f2c6e..d2e2ce9c15c54 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMessageIdImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMessageIdImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMetadataImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMetadataImplTest.java
index c772ad50b9b93..5c7ce60dd19d6 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMetadataImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TopicMetadataImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TypedMessageBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TypedMessageBuilderImplTest.java
index 21ba44d31d3e6..94c683e527177 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TypedMessageBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/TypedMessageBuilderImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
index 323333afc74fb..4ccc514e8e7f1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTlsTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTlsTest.java
index 5f2d04b2ba661..540c2c8e1d9a7 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTlsTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTokenTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTokenTest.java
index d5174a0880bf7..34a60b906a993 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTokenTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/AuthenticationTokenTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockAuthentication.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockAuthentication.java
index d1233d4dfb826..1b32d97a5eb32 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockAuthentication.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockAuthentication.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockEncodedAuthenticationParameterSupport.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockEncodedAuthenticationParameterSupport.java
index 16a3d4cb41012..e3d76f75506aa 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockEncodedAuthenticationParameterSupport.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/MockEncodedAuthenticationParameterSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2Test.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2Test.java
index 3ae578c34845c..ba42357328b08 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2Test.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2Test.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/MockClock.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/MockClock.java
index 1e23311d5c171..c67d88facf615 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/MockClock.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/MockClock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClientTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClientTest.java
index a020c11a606df..2e71e327ccdde 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClientTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClientTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java
index c817ec996d480..e0d2ca05d06dc 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.impl.conf;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtilsTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtilsTest.java
index cb685b2bc1b54..e3d129665edba 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtilsTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConfigurationDataUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationDataTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationDataTest.java
index 0ec031d250561..f47f83bcbce32 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationDataTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
index 9d007fa98116d..ab4d54d08f6fb 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationDataTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationDataTest.java
index a2bea68d1ac23..d6c0332930323 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationDataTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/TopicConsumerConfigurationDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchemaTest.java
index 646f657674385..dcbd08e591e25 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AutoConsumeSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
index 7f3d5bfd5d54a..2b183edae8e25 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -32,6 +32,7 @@
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
@@ -543,4 +544,24 @@ public void testTimestampWithJsonDefAndJSR310ConversionEnabled(){
         Assert.assertNotEquals(Instant.class, decodeWithJsonNoClassLoader.getValue().getClass());
     }
 
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    private static class LocalDateTimePojo {
+        LocalDateTime value;
+    }
+
+    @Test
+    public void testLocalDateTime() {
+        SchemaDefinition schemaDefinition =
+                SchemaDefinition.builder().withPojo(LocalDateTimePojo.class)
+                        .withJSR310ConversionEnabled(true).build();
+
+        AvroSchema avroSchema = AvroSchema.of(schemaDefinition);
+        LocalDateTime now = LocalDateTime.now();
+        byte[] bytes = avroSchema.encode(new LocalDateTimePojo(now));
+
+        LocalDateTimePojo pojo = avroSchema.decode(bytes);
+        assertEquals(pojo.getValue().truncatedTo(ChronoUnit.MILLIS), now.truncatedTo(ChronoUnit.MILLIS));
+    }
 }
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BooleanSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BooleanSchemaTest.java
index fdcf471168607..750e308151d33 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BooleanSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BooleanSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BytesSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BytesSchemaTest.java
index 48bd5bc77c82d..43cc51fd8125b 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BytesSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/BytesSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DateSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DateSchemaTest.java
index 69499d8e3a980..6ef34a4bd50e6 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DateSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DateSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DefaultSchemasTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DefaultSchemasTest.java
index 459376a4f33b0..66cc1e4ead4d7 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DefaultSchemasTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DefaultSchemasTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
index 489b3abf226b5..130f64910bbfc 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
index 75aa40b688d31..90a43a659fae4 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/InstantSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/InstantSchemaTest.java
index ca7856a6bae54..2dc253a7187ea 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/InstantSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/InstantSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/IntSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/IntSchemaTest.java
index 98f00ec5f4720..e65a5e1f1449a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/IntSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/IntSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java
index 0dd11ad951350..b81acade7b6a2 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/JSONSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfoTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfoTest.java
index 169156917f49d..5cf977b84b97c 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfoTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfoTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaTest.java
index 6dfbd8bfb9cf6..b40fa86e8bf95 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateSchemaTest.java
index 31b48b2fc2e34..0857dd34bec8a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchemaTest.java
index 1214560b05a40..5ab0cc4836daa 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalDateTimeSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalTimeSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalTimeSchemaTest.java
index ed729dec7ab1e..e0280b4fde8a6 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalTimeSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LocalTimeSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LongSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LongSchemaTest.java
index 397f5ac2cc669..e60689bac4ac3 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LongSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/LongSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/PrimitiveSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/PrimitiveSchemaTest.java
index 027966aca166f..853f12910445a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/PrimitiveSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/PrimitiveSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaTest.java
index fb45142197377..05f516952269a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
index 512fa6ea1bf83..e82f93718e1d9 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
index 7f3eed12f3124..3fcd6f12b982d 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java
index a1530864c9269..4d42bc3835502 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaInfoTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaInfoTest.java
index ba8286c61fd9c..acda79486caa0 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaInfoTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaInfoTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java
index f78b858055404..a4b5bc51340d8 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ShortSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ShortSchemaTest.java
index 54fd35b1981f8..c501df162bc01 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ShortSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ShortSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/StringSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/StringSchemaTest.java
index 4b22085761491..8ae2dabb02468 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/StringSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/StringSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningAvroSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningAvroSchemaTest.java
index 8161621e695a4..358532a1f8be1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningAvroSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningAvroSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningKeyValueSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningKeyValueSchemaTest.java
index 726eb558e43ab..ca1df065cce73 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningKeyValueSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningKeyValueSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimeSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimeSchemaTest.java
index fab20e7863cfe..d7f79231c4497 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimeSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimeSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimestampSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimestampSchemaTest.java
index 022ba38b8c29e..fb511e79ca8a7 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimestampSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/TimestampSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchemaTest.java
index 9032b232e6f48..a16382f3c6428 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/AbstractGenericSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReaderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReaderTest.java
index 15717947a22d9..36fddd66750f1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReaderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecordTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecordTest.java
index 338e30fb6eaf7..06949eb2f222d 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecordTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroRecordTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchemaTest.java
index 0752291144ea1..8d55bb69a6ff4 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericAvroSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java
index c227ad032c3fe..d14c173b8372a 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericJsonRecordTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReaderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReaderTest.java
index a61f4a33f6fcf..4cbb325c82f0c 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReaderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeReaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchemaTest.java
index 94259463ace14..51f276d077ae3 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericProtobufNativeSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImplTest.java
index bcb5f927314db..71fd481bc8033 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaTest.java
index 181c42d233a22..0cd06ee3a4716 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/GenericSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProviderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProviderTest.java
index c81ff14600484..8959e67023463 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProviderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/generic/MultiVersionSchemaInfoProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
index 6fb655e601b47..c68e8fc78d5c9 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
index 00e26ee618547..210bb49d4c8ee 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/JsonPojo.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/JsonPojo.java
index 6d77875c077cf..de2d2b1dafb54 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/JsonPojo.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/JsonPojo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
index 2f324d81c0a28..14132fd3e8ae8 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducerWithSchema.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducerWithSchema.java
index 4bcbb50d40253..b0ce5df54471c 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducerWithSchema.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducerWithSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumer.java
index 305f42259f9cf..c065e29b682aa 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
index efec6d8b0acef..82f4c6c58479b 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerWithSchema.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerWithSchema.java
index 1708b84c02717..8a3a2885afc97 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerWithSchema.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerWithSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoConsumer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoConsumer.java
index dbd9c2d51a34e..0460bd777e0e5 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoConsumer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
index 0d682fd9f6b85..8bc3526cbc921 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
index 8c2720e2794d2..c5842575f1cac 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/util/MathUtilsTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/util/MathUtilsTest.java
index f9eb6bebc62c2..0a5279c2a1bde 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/util/MathUtilsTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/util/MathUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.client.util;
 
 
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/util/ObjectCacheTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/util/ObjectCacheTest.java
index f0c2cbcae452f..238bffd202487 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/util/ObjectCacheTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/util/ObjectCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/common/schema/KeyValueTest.java b/pulsar-client/src/test/java/org/apache/pulsar/common/schema/KeyValueTest.java
index 1011e0ec50d85..34d6838bb3b45 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/common/schema/KeyValueTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/common/schema/KeyValueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 30a250423605d..951fb9dd92cd3 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -131,6 +131,23 @@
       netty-tcnative-boringssl-static
     
 
+    
+      io.netty.incubator
+      netty-incubator-transport-classes-io_uring
+    
+
+    
+      io.netty.incubator
+      netty-incubator-transport-native-io_uring
+      linux-x86_64
+    
+
+    
+      io.netty.incubator
+      netty-incubator-transport-native-io_uring
+      linux-aarch_64
+    
+
     
       io.netty
       netty-codec-haproxy
@@ -172,7 +189,7 @@
     
       org.bouncycastle
       bc-fips
-      ${bouncycastlefips.version}
+      ${bouncycastle.bc-fips.version}
       test
     
 
diff --git a/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java b/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
index e1e57e1909d7e..119e46b9536f3 100644
--- a/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
+++ b/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawCompressor.java b/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawCompressor.java
index e7c4568345b09..472a43a0c6ace 100644
--- a/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawCompressor.java
+++ b/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawCompressor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawDecompressor.java b/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawDecompressor.java
index dc13711e49cf0..2e49698aca305 100644
--- a/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawDecompressor.java
+++ b/pulsar-common/src/main/java/io/airlift/compress/zstd/ZStdRawDecompressor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/io/airlift/compress/zstd/package-info.java b/pulsar-common/src/main/java/io/airlift/compress/zstd/package-info.java
index 1e7c0bfc0f6cc..b3759ad34cdce 100644
--- a/pulsar-common/src/main/java/io/airlift/compress/zstd/package-info.java
+++ b/pulsar-common/src/main/java/io/airlift/compress/zstd/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Helper class to access AirCompressor package private classes.
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/AuthPoliciesImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/AuthPoliciesImpl.java
index 166fe2d59d023..985c86295f6ca 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/AuthPoliciesImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/AuthPoliciesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/package-info.java
index b93a6309ae8fc..451287be41e0b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/admin/internal/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/DataURLStreamHandler.java b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/DataURLStreamHandler.java
index 7b27d1fc6452d..9436bbb69de1f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/DataURLStreamHandler.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/DataURLStreamHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/PulsarURLStreamHandlerFactory.java b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/PulsarURLStreamHandlerFactory.java
index 8e4b0d32c17fd..c932a56d64a2a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/PulsarURLStreamHandlerFactory.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/PulsarURLStreamHandlerFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/URL.java b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/URL.java
index 3286900ecb792..42c91ddcef2c3 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/URL.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/URL.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/package-info.java
index 322f4cb8844bb..6b26398c599fd 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/api/url/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfo.java b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfo.java
index 3cdbb65a5ef0d..c99c407b9d7e5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfo.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/KeyValueSchemaInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoImpl.java
index b06ee517ac7a7..bac41e0bf6287 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaInfoImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaUtils.java
index b9a1940402b85..29a6c517339e8 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/SchemaUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java
index e394e28f461d2..6f4af7e816455 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/client/impl/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocator.java b/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocator.java
index f9ba797b7e569..ac12bb2df124d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocator.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/package-info.java
index e4ca03654adf9..fa00eb699b11c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/allocator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/MessageParser.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/MessageParser.java
index da9e55520cd1d..af516fa75342c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/MessageParser.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/MessageParser.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java
index 483b5a30a0abd..8e2f51c4edbf0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageId.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageId.java
index e096dcd4c989f..a757f531425cc 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageId.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageId.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageIdImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageIdImpl.java
index f48cd4c023e9b..0564d5ae342aa 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageIdImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageIdImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
index 1424af0c359e4..daf7fd6a7644c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/ReferenceCountedMessageMetadata.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/ReferenceCountedMessageMetadata.java
index af872cd9dd2e8..3d7c0f4c54f82 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/ReferenceCountedMessageMetadata.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/ReferenceCountedMessageMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/package-info.java
index 17dc4d25c0a9e..74d1b8598c6c7 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/AirliftUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/AirliftUtils.java
index e1480d2c0f546..b8e9cca575266 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/AirliftUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/AirliftUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodec.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodec.java
index d96dc7f9a06fa..80102d5fc6064 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodec.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodec.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecLZ4.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecLZ4.java
index efc497f02014c..4423ea4159356 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecLZ4.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecLZ4.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecNone.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecNone.java
index e90d4c8c4b7f9..cfaa4d45b5d26 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecNone.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecNone.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecProvider.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecProvider.java
index c71c265c00ed4..d9df0e40b20f9 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecProvider.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecSnappy.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecSnappy.java
index 4bd95e361b064..e9e151744e195 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecSnappy.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecSnappy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZLib.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZLib.java
index 21fb06437bb59..e7c22ac8d7d0e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZLib.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZLib.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZstd.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZstd.java
index 78a110a628a68..d3a2b8df4728e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZstd.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/CompressionCodecZstd.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/package-info.java
index 57fb0392d0a21..4047b8973cff3 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/compression/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/compression/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/events/ActionType.java b/pulsar-common/src/main/java/org/apache/pulsar/common/events/ActionType.java
index 0b626dcbd7232..32b051884d504 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/events/ActionType.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/events/ActionType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/events/EventType.java b/pulsar-common/src/main/java/org/apache/pulsar/common/events/EventType.java
index b60350e8e39a5..d0c204790bf72 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/events/EventType.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/events/EventType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -31,5 +31,15 @@ public enum EventType {
     /**
      * Transaction buffer snapshot events.
      */
-    TRANSACTION_BUFFER_SNAPSHOT
+    TRANSACTION_BUFFER_SNAPSHOT,
+
+    /**
+     * Transaction buffer snapshot segment events.
+     */
+    TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS,
+
+    /**
+     * Transaction buffer snapshot indexes events.
+     */
+    TRANSACTION_BUFFER_SNAPSHOT_INDEXES
 }
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/events/PulsarEvent.java b/pulsar-common/src/main/java/org/apache/pulsar/common/events/PulsarEvent.java
index f07b06b4299c9..c9245e8bd88df 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/events/PulsarEvent.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/events/PulsarEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/events/TopicPoliciesEvent.java b/pulsar-common/src/main/java/org/apache/pulsar/common/events/TopicPoliciesEvent.java
index 995bd77b9f139..fcae10eff2855 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/events/TopicPoliciesEvent.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/events/TopicPoliciesEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/events/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/events/package-info.java
index 240ba51c07bb1..28ab28909a3ee 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/events/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/events/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/JsonIgnorePropertiesMixIn.java b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/JsonIgnorePropertiesMixIn.java
index ae6fd10ef7ff4..a758a6a66b940 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/JsonIgnorePropertiesMixIn.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/JsonIgnorePropertiesMixIn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/UpdateOptionsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/UpdateOptionsImpl.java
index bc58321ee3165..c7c02453fff47 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/UpdateOptionsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/UpdateOptionsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/Utils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/Utils.java
index e4c9b9daeb56e..3a121c500225b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/Utils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/Utils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/package-info.java
index ef7100a55ace6..f3e2eaeddb04e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendBrokerTimestampMetadataInterceptor.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendBrokerTimestampMetadataInterceptor.java
index 6a4be8e4f1fc1..90445c0c7a5ef 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendBrokerTimestampMetadataInterceptor.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendBrokerTimestampMetadataInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendIndexMetadataInterceptor.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendIndexMetadataInterceptor.java
index 6dfed6a744853..de35cc4498d78 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendIndexMetadataInterceptor.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/AppendIndexMetadataInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataInterceptor.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataInterceptor.java
index a9b6c8f901398..add0b328a0217 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataInterceptor.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataUtils.java
index 3c873df4fbb16..4f6c8ba3f6116 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/BrokerEntryMetadataUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/InterceptException.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/InterceptException.java
index df0f1be0c171e..5c720920916e9 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/InterceptException.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/InterceptException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.intercept;
 
 import lombok.Getter;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/ManagedLedgerPayloadProcessor.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/ManagedLedgerPayloadProcessor.java
index 733f5c8cf3a80..9ba16b7dfb984 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/ManagedLedgerPayloadProcessor.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/ManagedLedgerPayloadProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/package-info.java
index c5dd6d7da9703..c7a10ec056f1e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/intercept/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Classes needed for broker interceptor.
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/io/ConfigFieldDefinition.java b/pulsar-common/src/main/java/org/apache/pulsar/common/io/ConfigFieldDefinition.java
index 2bfe09d1e2742..5256c6a797bbd 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/io/ConfigFieldDefinition.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/io/ConfigFieldDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/io/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/io/package-info.java
index 4f642d62a2a5e..7b1bec81ae6b2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/io/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/io/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/GetTopicsResult.java b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/GetTopicsResult.java
index 74e51b3ea4694..55fe6253ff971 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/GetTopicsResult.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/GetTopicsResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/LookupData.java b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/LookupData.java
index 04e524b59c1b6..e743208f4d8fa 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/LookupData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/LookupData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/package-info.java
index 3b4e1e96f48e1..e08216ac83a8f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/package-info.java
index 988e5be90fa8d..96a068db6e54c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/lookup/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Constants.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Constants.java
index 5cb7f33f6bfe9..ab71f2a43e5d4 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Constants.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Constants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Metadata.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Metadata.java
index 5244c373ba642..eba492cf6bf5d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Metadata.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/Metadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamedEntity.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamedEntity.java
index b2ec76a248800..bc160350d850b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamedEntity.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamedEntity.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java
index 762faa595a2a7..0e8fd9b8f0723 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/NamespaceName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/ServiceUnitId.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/ServiceUnitId.java
index 381aa4d1eb2d8..d1c88b170dadd 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/ServiceUnitId.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/ServiceUnitId.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java
index eaab826146000..8fc7d014b5784 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -37,6 +37,15 @@ public class SystemTopicNames {
      */
     public static final String TRANSACTION_BUFFER_SNAPSHOT = "__transaction_buffer_snapshot";
 
+    /**
+     * Local topic name for the transaction buffer snapshot segments.
+     */
+    public static final String TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS = "__transaction_buffer_snapshot_segments";
+
+    /**
+     * Local topic name for the transaction buffer snapshot indexes.
+     */
+    public static final String TRANSACTION_BUFFER_SNAPSHOT_INDEXES = "__transaction_buffer_snapshot_indexes";
 
     public static final String PENDING_ACK_STORE_SUFFIX = "__transaction_pending_ack";
 
@@ -46,7 +55,8 @@ public class SystemTopicNames {
      * The set of all local topic names declared above.
      */
     public static final Set EVENTS_TOPIC_NAMES =
-            Collections.unmodifiableSet(Sets.newHashSet(NAMESPACE_EVENTS_LOCAL_NAME, TRANSACTION_BUFFER_SNAPSHOT));
+            Collections.unmodifiableSet(Sets.newHashSet(NAMESPACE_EVENTS_LOCAL_NAME, TRANSACTION_BUFFER_SNAPSHOT,
+                    TRANSACTION_BUFFER_SNAPSHOT_INDEXES, TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS));
 
 
     public static final TopicName TRANSACTION_COORDINATOR_ASSIGN = TopicName.get(TopicDomain.persistent.value(),
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
index 5f03c60ece906..7987a54630442 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -290,6 +290,14 @@ public static int getPartitionIndex(String topic) {
         return partitionIndex;
     }
 
+    /**
+     * A helper method to get a partition name of a topic in String.
+     * @return topic + "-partition-" + partition.
+     */
+    public static String getTopicPartitionNameString(String topic, int partitionIndex) {
+        return topic + PARTITIONED_TOPIC_SUFFIX + partitionIndex;
+    }
+
     /**
      * Returns the http rest path for use in the admin web service.
      * Eg:
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/package-info.java
index 8816d8d3d65de..fb8c7821a825a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/naming/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/naming/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/FileUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/FileUtils.java
index 0bfdb806165e9..7f31367634567 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/FileUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/FileUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 /**
  * This class was adapted from NiFi NAR Utils
  * https://github.com/apache/nifi/tree/master/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoader.java b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoader.java
index c4864883788d9..620e1156d3555 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoader.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * This class was adapted from NiFi NAR Utils
  * https://github.com/apache/nifi/tree/master/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoaderBuilder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoaderBuilder.java
index a9ffd754e456e..952c65bb2e099 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoaderBuilder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarClassLoaderBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * This class was adapted from NiFi NAR Utils
  * https://github.com/apache/nifi/tree/master/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarUnpacker.java b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarUnpacker.java
index b2c0a37a65036..a71589e6d6427 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarUnpacker.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/NarUnpacker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * This class was adapted from NiFi NAR Utils
  * https://github.com/apache/nifi/tree/master/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/package-info.java
index 1a7857b6bafda..33f4a8e11e92a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/nar/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/nar/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/net/ServiceURI.java b/pulsar-common/src/main/java/org/apache/pulsar/common/net/ServiceURI.java
index 27ce94f9b4964..643579d16ffa6 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/net/ServiceURI.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/net/ServiceURI.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/net/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/net/package-info.java
index bd828d1900bef..eddc277b4fe1c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/net/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/net/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/NamespaceIsolationPolicy.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/NamespaceIsolationPolicy.java
index fa13132b2f839..bd28d30d4cee9 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/NamespaceIsolationPolicy.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/NamespaceIsolationPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataImpl.java
index e0cbde9614518..0a6db27341b4d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationDataImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationDataImpl.java
index b0fc2277b5a78..52574dd6dbeff 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationDataImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/BrokerNamespaceIsolationDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterDataImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterDataImpl.java
index 006cce1a9c181..73c5b074f8434 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterDataImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -132,10 +132,39 @@ public final class ClusterDataImpl implements  ClusterData, Cloneable {
     )
     private String brokerClientTlsTrustStorePassword;
     @ApiModelProperty(
-        name = "brokerClientTrustCertsFilePath",
-        value = "Path for the trusted TLS certificate file for outgoing connection to a server (broker)"
+            name = "brokerClientTlsKeyStoreType",
+            value = "TLS KeyStore type configuration for internal client: JKS, PKCS12,"
+                    + " used by the internal client to authenticate with Pulsar brokers"
+    )
+    private String brokerClientTlsKeyStoreType;
+    @ApiModelProperty(
+            name = "brokerClientTlsKeyStore",
+            value = "TLS KeyStore path for internal client, "
+                    + " used by the internal client to authenticate with Pulsar brokers"
+    )
+    private String brokerClientTlsKeyStore;
+    @ApiModelProperty(
+            name = "brokerClientTlsKeyStorePassword",
+            value = "TLS KeyStore password for internal client, "
+                    + " used by the internal client to authenticate with Pulsar brokers"
+    )
+    private String brokerClientTlsKeyStorePassword;
+    @ApiModelProperty(
+            name = "brokerClientTrustCertsFilePath",
+            value = "Path for the trusted TLS certificate file for outgoing connection to a server (broker)"
     )
     private String brokerClientTrustCertsFilePath;
+    @ApiModelProperty(
+            name = "brokerClientKeyFilePath",
+            value = "TLS private key file for internal client, "
+                    + "used by the internal client to authenticate with Pulsar brokers")
+    private String brokerClientKeyFilePath;
+    @ApiModelProperty(
+            name = "brokerClientCertificateFilePath",
+            value = "TLS certificate file for internal client, "
+                    + "used by the internal client to authenticate with Pulsar brokers"
+    )
+    private String brokerClientCertificateFilePath;
     @ApiModelProperty(
             name = "listenerName",
             value = "listenerName when client would like to connect to cluster",
@@ -176,7 +205,12 @@ public ClusterDataImplBuilder clone() {
                 .brokerClientTlsTrustStoreType(brokerClientTlsTrustStoreType)
                 .brokerClientTlsTrustStore(brokerClientTlsTrustStore)
                 .brokerClientTlsTrustStorePassword(brokerClientTlsTrustStorePassword)
+                .brokerClientTlsKeyStoreType(brokerClientTlsTrustStoreType)
+                .brokerClientTlsKeyStore(brokerClientTlsTrustStore)
+                .brokerClientTlsKeyStorePassword(brokerClientTlsTrustStorePassword)
                 .brokerClientTrustCertsFilePath(brokerClientTrustCertsFilePath)
+                .brokerClientCertificateFilePath(brokerClientCertificateFilePath)
+                .brokerClientKeyFilePath(brokerClientKeyFilePath)
                 .listenerName(listenerName);
     }
 
@@ -197,6 +231,11 @@ public static class ClusterDataImplBuilder implements ClusterData.Builder {
         private String brokerClientTlsTrustStoreType = "JKS";
         private String brokerClientTlsTrustStore;
         private String brokerClientTlsTrustStorePassword;
+        private String brokerClientTlsKeyStoreType = "JKS";
+        private String brokerClientTlsKeyStore;
+        private String brokerClientTlsKeyStorePassword;
+        private String brokerClientCertificateFilePath;
+        private String brokerClientKeyFilePath;
         private String brokerClientTrustCertsFilePath;
         private String listenerName;
         private boolean migrated;
@@ -280,11 +319,42 @@ public ClusterDataImplBuilder brokerClientTlsTrustStorePassword(String brokerCli
             return this;
         }
 
+        @Override
+        public ClusterDataImplBuilder brokerClientTlsKeyStoreType(String keyStoreType) {
+            this.brokerClientTlsKeyStoreType = keyStoreType;
+            return this;
+        }
+
+        @Override
+        public ClusterDataImplBuilder brokerClientTlsKeyStorePassword(String keyStorePassword) {
+            this.brokerClientTlsKeyStorePassword = keyStorePassword;
+            return this;
+        }
+
+        @Override
+        public ClusterDataImplBuilder brokerClientTlsKeyStore(String keyStore) {
+            this.brokerClientTlsKeyStore = keyStore;
+            return this;
+        }
+
         public ClusterDataImplBuilder brokerClientTrustCertsFilePath(String brokerClientTrustCertsFilePath) {
             this.brokerClientTrustCertsFilePath = brokerClientTrustCertsFilePath;
             return this;
         }
 
+        @Override
+        public ClusterDataImplBuilder brokerClientCertificateFilePath(String certificateFilePath) {
+            this.brokerClientCertificateFilePath = certificateFilePath;
+            return this;
+        }
+
+        @Override
+        public ClusterDataImplBuilder brokerClientKeyFilePath(String keyFilePath) {
+            this.brokerClientKeyFilePath = keyFilePath;
+            return this;
+        }
+
+
         public ClusterDataImplBuilder listenerName(String listenerName) {
             this.listenerName = listenerName;
             return this;
@@ -317,7 +387,12 @@ public ClusterDataImpl build() {
                     brokerClientTlsTrustStoreType,
                     brokerClientTlsTrustStore,
                     brokerClientTlsTrustStorePassword,
+                    brokerClientTlsKeyStoreType,
+                    brokerClientTlsKeyStore,
+                    brokerClientTlsKeyStorePassword,
                     brokerClientTrustCertsFilePath,
+                    brokerClientKeyFilePath,
+                    brokerClientCertificateFilePath,
                     listenerName,
                     migrated,
                     migratedClusterUrl);
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfig.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfig.java
index b96777a2ab8ae..bce1ba1b2e466 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfig.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FailureDomainImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FailureDomainImpl.java
index 91e202f8074e4..c69043242e97b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FailureDomainImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FailureDomainImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBaseImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBaseImpl.java
index e8d297a5eaee4..66200e257e4f5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBaseImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataBaseImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataImpl.java
index eaab7b04552e8..90b436828890c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsImpl.java
index f23700149baaf..41785fd4138c4 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionInstanceStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatsImpl.java
index fead168592107..c66dbe116cb84 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatusUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatusUtil.java
index c2d0886935407..e7ab15a529dba 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatusUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/FunctionStatusUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/HierarchyTopicPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/HierarchyTopicPolicies.java
index a6891d274019a..0249272b72d84 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/HierarchyTopicPolicies.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/HierarchyTopicPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 import com.google.common.collect.ImmutableMap;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/LocalPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/LocalPolicies.java
index 5ed236e15703a..e8a158ace70c5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/LocalPolicies.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/LocalPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataImpl.java
index 65927935870ff..bdb51f63f89ed 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOperation.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOperation.java
index ceef164774df2..dfcecfab9d613 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOperation.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/NamespaceOperation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPoliciesImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPoliciesImpl.java
index 42f3ccc42e8ac..fb33e3198aa60 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPoliciesImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPoliciesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -69,11 +69,13 @@ public class OffloadPoliciesImpl implements Serializable, OffloadPolicies {
             .of("S3", "aws-s3", "google-cloud-storage", "filesystem", "azureblob", "aliyun-oss");
     public static final String DEFAULT_OFFLOADER_DIRECTORY = "./offloaders";
     public static final Long DEFAULT_OFFLOAD_THRESHOLD_IN_BYTES = null;
+    public static final Long DEFAULT_OFFLOAD_THRESHOLD_IN_SECONDS = null;
     public static final Long DEFAULT_OFFLOAD_DELETION_LAG_IN_MILLIS = null;
 
     public static final String OFFLOAD_THRESHOLD_NAME_IN_CONF_FILE =
             "managedLedgerOffloadAutoTriggerSizeThresholdBytes";
     public static final String DELETION_LAG_NAME_IN_CONF_FILE = "managedLedgerOffloadDeletionLagMs";
+    public static final String DATA_READ_PRIORITY_NAME_IN_CONF_FILE = "managedLedgerDataReadPriority";
     public static final OffloadedReadPriority DEFAULT_OFFLOADED_READ_PRIORITY =
             OffloadedReadPriority.TIERED_STORAGE_FIRST;
 
@@ -92,6 +94,9 @@ public class OffloadPoliciesImpl implements Serializable, OffloadPolicies {
     private Integer managedLedgerOffloadPrefetchRounds = DEFAULT_OFFLOAD_MAX_PREFETCH_ROUNDS;
     @Configuration
     @JsonProperty(access = JsonProperty.Access.READ_WRITE)
+    private Long managedLedgerOffloadThresholdInSeconds = DEFAULT_OFFLOAD_THRESHOLD_IN_SECONDS;
+    @Configuration
+    @JsonProperty(access = JsonProperty.Access.READ_WRITE)
     private Long managedLedgerOffloadThresholdInBytes = DEFAULT_OFFLOAD_THRESHOLD_IN_BYTES;
     @Configuration
     @JsonProperty(access = JsonProperty.Access.READ_WRITE)
@@ -178,11 +183,14 @@ public static OffloadPoliciesImpl create(String driver, String region, String bu
                                              String role, String roleSessionName,
                                              String credentialId, String credentialSecret,
                                              Integer maxBlockSizeInBytes, Integer readBufferSizeInBytes,
-                                             Long offloadThresholdInBytes, Long offloadDeletionLagInMillis,
+                                             Long offloadThresholdInBytes,
+                                             Long offloadThresholdInSeconds,
+                                             Long offloadDeletionLagInMillis,
                                              OffloadedReadPriority readPriority) {
         OffloadPoliciesImplBuilder builder = builder()
                 .managedLedgerOffloadDriver(driver)
                 .managedLedgerOffloadThresholdInBytes(offloadThresholdInBytes)
+                .managedLedgerOffloadThresholdInSeconds(offloadThresholdInSeconds)
                 .managedLedgerOffloadDeletionLagInMillis(offloadDeletionLagInMillis)
                 .managedLedgerOffloadBucket(bucket)
                 .managedLedgerOffloadRegion(region)
@@ -256,9 +264,10 @@ public void compatibleWithBrokerConfigFile(Properties properties) {
                     Long.parseLong(properties.getProperty(DELETION_LAG_NAME_IN_CONF_FILE)));
         }
 
-        if (properties.containsKey("managedLedgerDataReadPriority")) {
+        if (!properties.containsKey("managedLedgerOffloadedReadPriority")
+                && properties.containsKey(DATA_READ_PRIORITY_NAME_IN_CONF_FILE)) {
             setManagedLedgerOffloadedReadPriority(
-                    OffloadedReadPriority.fromString(properties.getProperty("managedLedgerDataReadPriority")));
+                    OffloadedReadPriority.fromString(properties.getProperty(DATA_READ_PRIORITY_NAME_IN_CONF_FILE)));
         }
     }
 
@@ -320,6 +329,8 @@ public Properties toProperties() {
                 this.getManagedLedgerOffloadPrefetchRounds());
         setProperty(properties, "managedLedgerOffloadThresholdInBytes",
                 this.getManagedLedgerOffloadThresholdInBytes());
+        setProperty(properties, "managedLedgerOffloadThresholdInSeconds",
+                this.getManagedLedgerOffloadThresholdInSeconds());
         setProperty(properties, "managedLedgerOffloadDeletionLagInMillis",
                 this.getManagedLedgerOffloadDeletionLagInMillis());
 
@@ -393,7 +404,8 @@ private static void setProperty(Properties properties, String key, Object value)
      * @return offload policies
      */
     public static OffloadPoliciesImpl oldPoliciesCompatible(OffloadPoliciesImpl nsLevelPolicies, Policies policies) {
-        if (policies == null || (policies.offload_threshold == -1 && policies.offload_deletion_lag_ms == null)) {
+        if (policies == null || (policies.offload_threshold == -1 && policies.offload_threshold_in_seconds == -1
+                && policies.offload_deletion_lag_ms == null)) {
             return nsLevelPolicies;
         }
         if (nsLevelPolicies == null) {
@@ -403,6 +415,10 @@ public static OffloadPoliciesImpl oldPoliciesCompatible(OffloadPoliciesImpl nsLe
                 && policies.offload_threshold != -1) {
             nsLevelPolicies.setManagedLedgerOffloadThresholdInBytes(policies.offload_threshold);
         }
+        if (nsLevelPolicies.getManagedLedgerOffloadThresholdInSeconds() == null
+                && policies.offload_threshold_in_seconds != -1) {
+            nsLevelPolicies.setManagedLedgerOffloadThresholdInSeconds(policies.offload_threshold_in_seconds);
+        }
         if (nsLevelPolicies.getManagedLedgerOffloadDeletionLagInMillis() == null
                 && policies.offload_deletion_lag_ms != null) {
             nsLevelPolicies.setManagedLedgerOffloadDeletionLagInMillis(policies.offload_deletion_lag_ms);
@@ -472,6 +488,9 @@ private static Object getCompatibleValue(Properties properties, Field field) {
         } else if (field.getName().equals("managedLedgerOffloadDeletionLagInMillis")) {
             object = properties.getProperty("managedLedgerOffloadDeletionLagInMillis",
                     properties.getProperty(DELETION_LAG_NAME_IN_CONF_FILE));
+        } else if (field.getName().equals("managedLedgerOffloadedReadPriority")) {
+            object = properties.getProperty("managedLedgerOffloadedReadPriority",
+                    properties.getProperty(DATA_READ_PRIORITY_NAME_IN_CONF_FILE));
         } else {
             object = properties.get(field.getName());
         }
@@ -508,6 +527,13 @@ public OffloadPoliciesImplBuilder managedLedgerOffloadThresholdInBytes(
             return this;
         }
 
+        @Override
+        public OffloadPoliciesImplBuilder managedLedgerOffloadThresholdInSeconds(
+                Long managedLedgerOffloadThresholdInSeconds) {
+            impl.managedLedgerOffloadThresholdInSeconds = managedLedgerOffloadThresholdInSeconds;
+            return this;
+        }
+
         public OffloadPoliciesImplBuilder managedLedgerOffloadDeletionLagInMillis(
                 Long managedLedgerOffloadDeletionLagInMillis) {
             impl.managedLedgerOffloadDeletionLagInMillis = managedLedgerOffloadDeletionLagInMillis;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStats.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStats.java
index 26fd805168c6b..f1cb0dfd08880 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStats.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicStats.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicStats.java
index b8aa83d988a97..6f9d37bcbe0c0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicStats.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PersistentTopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PoliciesUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PoliciesUtil.java
index 46a8b19d5d057..08cc69f28c1b0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PoliciesUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PoliciesUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValue.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValue.java
index 99d7a469d9074..a23ef9c87803d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValue.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyName.java
index 147b556e5368d..456d4b9270cd6 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyOperation.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyOperation.java
index ce70341a71604..8a9bc976d98f2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyOperation.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/PolicyOperation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuotaMixIn.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuotaMixIn.java
index ed91a7b5a309e..cb89417b97394 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuotaMixIn.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ResourceQuotaMixIn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SinkStatusUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SinkStatusUtil.java
index d2701afaa1fa1..78dd04340008a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SinkStatusUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SinkStatusUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SourceStatusUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SourceStatusUtil.java
index 20739877e1a50..755045dbf3063 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SourceStatusUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SourceStatusUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionPolicies.java
index 055ed28af9791..8149eb2485fad 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionPolicies.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 import lombok.AllArgsConstructor;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantInfoImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantInfoImpl.java
index 3a5167ad393d3..2e45b9c199f12 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantInfoImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantInfoImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantOperation.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantOperation.java
index b444433f6fa90..1c52f69006403 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantOperation.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TenantOperation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicOperation.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicOperation.java
index 0184e0efb82d7..ad16b58e0136f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicOperation.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicOperation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 /**
@@ -51,6 +50,7 @@ public enum TopicOperation {
     GET_STATS,
     GET_METADATA,
     DELETE_METADATA,
+    UPDATE_METADATA,
     GET_BACKLOG_SIZE,
 
     SET_REPLICATED_SUBSCRIPTION_STATUS,
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
index cd9e28f9bc8eb..caa9cd3fd1daa 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,6 +29,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.pulsar.common.api.proto.CommandSubscribe.SubType;
+import org.apache.pulsar.common.policies.data.impl.AutoSubscriptionCreationOverrideImpl;
 import org.apache.pulsar.common.policies.data.impl.BacklogQuotaImpl;
 import org.apache.pulsar.common.policies.data.impl.DispatchRateImpl;
 
@@ -73,6 +74,8 @@ public class TopicPolicies {
     private DispatchRateImpl replicatorDispatchRate;
     private SchemaCompatibilityStrategy schemaCompatibilityStrategy;
     private EntryFilters entryFilters;
+    // If set, it will override the namespace settings for allowing auto subscription creation
+    private AutoSubscriptionCreationOverrideImpl autoSubscriptionCreationOverride;
 
     /**
      * Subscription level policies for specific subscription.
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/package-info.java
index 3fa83b472f0eb..82c190ab71026 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/CompactionStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/CompactionStatsImpl.java
index e187f6aaee909..42f86fef7f354 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/CompactionStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/CompactionStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ConsumerStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ConsumerStatsImpl.java
index f84e10eaac26f..b75afaa24cfbb 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ConsumerStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ConsumerStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPartitionedTopicStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPartitionedTopicStatsImpl.java
index 2a9fe4232844a..5a4ee14edbeb5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPartitionedTopicStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPartitionedTopicStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPublisherStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPublisherStatsImpl.java
index c51252cc94428..adf3f92ae71fc 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPublisherStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentPublisherStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentReplicatorStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentReplicatorStatsImpl.java
index 3c6c4809d5326..98f838a94493c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentReplicatorStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentReplicatorStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentSubscriptionStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentSubscriptionStatsImpl.java
index e096f10efdd61..3a21ee931a011 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentSubscriptionStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentSubscriptionStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java
index 23e603ea0287a..06e955ef3d6a7 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PartitionedTopicStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PartitionedTopicStatsImpl.java
index 0b07dac85c3aa..c31f98a7515bf 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PartitionedTopicStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PartitionedTopicStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PublisherStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PublisherStatsImpl.java
index 93d42e6f07842..41407a37e7ca0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PublisherStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/PublisherStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ReplicatorStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ReplicatorStatsImpl.java
index 90fb0b4eec8c4..71196e4978682 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ReplicatorStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/ReplicatorStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
index 02e1e8e184bbf..8eb77e981a883 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/TopicStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/TopicStatsImpl.java
index 09ff655ccf626..88f487f347a9a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/TopicStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/TopicStatsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/package-info.java
index 546d4383b6ffb..2dae9702a1bed 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicies.java
index 1af7fdc0c3cce..d5025ab0f6bbd 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicies.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.java
index 6396c728787d3..af3663869fa02 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java
index 47e3597d14cdf..30cf028e09d29 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/package-info.java
index 6a24f3401c2df..f6e50a15d62f2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/PolicyPath.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/PolicyPath.java
index b6e0973e1f28c..968c43d88b6e7 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/PolicyPath.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/PolicyPath.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/package-info.java
index 8db40590b4d54..8951969a7f1a0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/path/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/ByteBufPair.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/ByteBufPair.java
index 2730e2aa33e15..cfd89d3bb28ab 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/ByteBufPair.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/ByteBufPair.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/CommandUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/CommandUtils.java
index f3ae550fd28e3..7edfbf889531b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/CommandUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/CommandUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java
index cd88bb794e62f..fdb94c177959c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Markers.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Markers.java
index dd1f22bc94f4d..50b036f99ee4b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Markers.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Markers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/OptionalProxyProtocolDecoder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/OptionalProxyProtocolDecoder.java
index 96ed750617eb5..2f0a7884dde35 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/OptionalProxyProtocolDecoder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/OptionalProxyProtocolDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarDecoder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarDecoder.java
index 2bd615d2ce4b2..15952ea8598d7 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarDecoder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarHandler.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarHandler.java
index 03fa4c17b088d..e116a5844e077 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarHandler.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/PulsarHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/package-info.java
index cf8d966426a37..631ca74df8aca 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/BytesSchemaVersion.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/BytesSchemaVersion.java
index b27482e55cfb7..832350911bd4f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/BytesSchemaVersion.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/BytesSchemaVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/DeleteSchemaResponse.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/DeleteSchemaResponse.java
index c74504d089275..720d40492c4c2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/DeleteSchemaResponse.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/DeleteSchemaResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/EmptyVersion.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/EmptyVersion.java
index e8713ee23db04..3f2d273595d9c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/EmptyVersion.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/EmptyVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetAllVersionsSchemaResponse.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetAllVersionsSchemaResponse.java
index 462ae54194394..0f075446c0a87 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetAllVersionsSchemaResponse.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetAllVersionsSchemaResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetSchemaResponse.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetSchemaResponse.java
index ea14f7933e1ca..6089ea7cefe04 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetSchemaResponse.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/GetSchemaResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LatestVersion.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LatestVersion.java
index c07b1875c1443..dffd01361dd69 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LatestVersion.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LatestVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LongSchemaVersionResponse.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LongSchemaVersionResponse.java
index 95b5bdd1d537e..9b4fe79b872a4 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LongSchemaVersionResponse.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/LongSchemaVersionResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaResponse.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaResponse.java
index d206fdf0795b1..127a07de71455 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaResponse.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/PostSchemaResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/ProtobufNativeSchemaData.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/ProtobufNativeSchemaData.java
index 069b95c0ed0cf..bacbc927a717d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/ProtobufNativeSchemaData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/ProtobufNativeSchemaData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaData.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaData.java
index 5c00f06d9698c..9b14eeec1a561 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaHash.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaHash.java
index 46f92b1ec9a99..a60d51f7e865a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaHash.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaHash.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaStorage.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaStorage.java
index c34154bc82733..ecfe4b2e769d6 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaStorage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaStorage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaVersion.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaVersion.java
index 653b4da3bcbfa..47377462ae8bc 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaVersion.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/SchemaVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/StoredSchema.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/StoredSchema.java
index 7952b4e3e854f..299b75508983d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/StoredSchema.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/StoredSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java
index a38c45fd17efc..cec8aa4292155 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/JAASCredentialsContainer.java b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/JAASCredentialsContainer.java
index 2c2aa59057379..025ab415a808c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/JAASCredentialsContainer.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/JAASCredentialsContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.sasl;
 
 import java.io.Closeable;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java
index fef8e74578d14..9b9b0a2aa5ec2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.sasl;
 
 import java.io.IOException;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/SaslConstants.java b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/SaslConstants.java
index 2ed857c5954ea..95723cb6f8baa 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/SaslConstants.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/SaslConstants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.sasl;
 
 import javax.security.auth.login.AppConfigurationEntry;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/TGTRefreshThread.java b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/TGTRefreshThread.java
index 18a6238cc8044..aa4c8de4a9c14 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/TGTRefreshThread.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/TGTRefreshThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.sasl;
 
 import java.util.Date;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/package-info.java
index bd9f0aef07673..b78ebe4d796f3 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/schema/LongSchemaVersion.java b/pulsar-common/src/main/java/org/apache/pulsar/common/schema/LongSchemaVersion.java
index 7e9551070c555..74c1ab9c8ba87 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/schema/LongSchemaVersion.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/schema/LongSchemaVersion.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/schema/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/schema/package-info.java
index 88f4f1cc28827..9df04b6c6c386 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/schema/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLogger.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLogger.java
index ad6f51e450838..db840c487f3b0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLogger.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLogger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmG1GCMetricsLogger.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmG1GCMetricsLogger.java
index fb58905f76374..203fe59eaf2c1 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmG1GCMetricsLogger.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmG1GCMetricsLogger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmGCMetricsLogger.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmGCMetricsLogger.java
index 16985f15c268b..e5555d96ec193 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmGCMetricsLogger.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmGCMetricsLogger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmMetrics.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmMetrics.java
index 737c6dd197e34..1f15beb8a0b92 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmMetrics.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/JvmMetrics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/MetricsMixIn.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/MetricsMixIn.java
index 9dda963625139..11b74d34b3925 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/MetricsMixIn.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/MetricsMixIn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/Rate.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/Rate.java
index 15b2f9a6097c5..886e31ab71216 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/Rate.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/Rate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/package-info.java
index f7d5818110bfc..884b3bf7c7760 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/stats/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/DomainType.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/DomainType.java
index e4527b56eb944..28b1a623341eb 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/DomainType.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/DomainType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.tls;
 
 /**
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/InetAddressUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/InetAddressUtils.java
index 2f8fd81f68900..a8bf837ef5666 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/InetAddressUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/InetAddressUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * From Apache HTTP client
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/NoopHostnameVerifier.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/NoopHostnameVerifier.java
index edc734ce3d66e..bbe725d899425 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/NoopHostnameVerifier.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/NoopHostnameVerifier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * From Apache HTTP client
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixList.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixList.java
index a797938059ba2..a2234192f8f79 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixList.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * From Apache HTTP client
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixMatcher.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixMatcher.java
index 49ff010719475..4ebc5aa48a9cb 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixMatcher.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/PublicSuffixMatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * From Apache HTTP client
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/SubjectName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/SubjectName.java
index e1561cf2f96eb..67890bca3e4bf 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/SubjectName.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/SubjectName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * From Apache HTTP client
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java
index a2a1f4bee490e..93fba9a557d0f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * From Apache HTTP client
  */
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/package-info.java
index 6bf8e2341b971..fb9e60b150148 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/topics/TopicList.java b/pulsar-common/src/main/java/org/apache/pulsar/common/topics/TopicList.java
index b2836ab39fe95..7a01e09ed6461 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/topics/TopicList.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/topics/TopicList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/topics/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/topics/package-info.java
index 0d16376a432b6..2bb89b9e5cbb9 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/topics/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/topics/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/BCLoader.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/BCLoader.java
index 63f075d6f3aa7..268cd430e6899 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/BCLoader.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/BCLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/BaseGenerateDocumentation.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/BaseGenerateDocumentation.java
index c253474755a69..b88ed197e8f2e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/BaseGenerateDocumentation.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/BaseGenerateDocumentation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -151,7 +151,6 @@ protected void writeDocListByFieldContext(List>
             final Field field = fieldPair.getKey();
             field.setAccessible(true);
 
-
             sb.append("### ").append(field.getName()).append("\n");
             sb.append(fieldContext.doc().replace(">", "\\>")).append("\n\n");
             sb.append("**Type**: `").append(field.getType().getCanonicalName()).append("`\n\n");
@@ -187,12 +186,6 @@ public int compare(Pair o1, Pair This page is automatically generated from code files.\n"
-            + "If you find something inaccurate, feel free to update `";
-    protected String suffix = "\n`.\n";
-
-
     protected String generateDocByFieldContext(String className, String type, StringBuilder sb) throws Exception {
         Class clazz = Class.forName(className);
         Object obj = clazz.getDeclaredConstructor().newInstance();
@@ -214,10 +207,7 @@ protected String generateDocByFieldContext(String className, String type, String
         List> deprecatedFields =
                 fieldList.stream().filter(p -> p.getValue().deprecated()).collect(Collectors.toList());
 
-
-        sb.append("# ").append(type).append("\n");
-
-        sb.append(prefix).append(className).append(suffix);
+        sb.append("# ").append(type).append("\n\n");
         sb.append("## Required\n");
         writeDocListByFieldContext(requiredFields, sb, obj);
         sb.append("## Optional\n");
@@ -239,8 +229,7 @@ protected String generateDocByApiModelProperty(String className, String type, St
         List requiredFields = fieldList.stream().filter(isRequiredApiModel).collect(Collectors.toList());
         List optionalFields = fieldList.stream().filter(isOptionalApiModel).collect(Collectors.toList());
 
-        sb.append("# ").append(type).append("\n");
-        sb.append(prefix).append(className).append(suffix);
+        sb.append("# ").append(type).append("\n\n");
         sb.append("## Required\n");
         writeDocListByApiModel(requiredFields, sb, obj);
         sb.append("## Optional\n");
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ClassLoaderUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ClassLoaderUtils.java
index 69e4c6319c0a6..debe2bb5045dc 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ClassLoaderUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ClassLoaderUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/CmdGenerateDocs.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/CmdGenerateDocs.java
index b97efcdfa6b2a..a4deb4444601e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/CmdGenerateDocs.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/CmdGenerateDocs.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -116,12 +116,6 @@ private String generateDocument(String module, JCommander commander) {
                 && cmd.getObjects().get(0).getClass().getName().equals("com.beust.jcommander.JCommander")) {
             JCommander cmdObj = (JCommander) cmd.getObjects().get(0);
             sb.append(" subcommand").append("\n```").append("\n\n");
-            for (String s : cmdObj.getCommands().keySet()) {
-                if (s.equals(name)) {
-                    continue;
-                }
-                sb.append("* `").append(s).append("`\n");
-            }
             cmdObj.getCommands().forEach((subK, subV) -> {
                 if (!subK.equals(name)) {
                     sb.append("\n\n## ").append(subK).append("\n\n");
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Codec.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Codec.java
index 1fe97973fe6fa..401bee6f45ef5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Codec.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Codec.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandler.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandler.java
index 8c603d75edaff..9aef88118c771 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandler.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/DateFormatter.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/DateFormatter.java
index 4d0dd943d07f6..2b487441699c4 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/DateFormatter.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/DateFormatter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/DefaultSslContextBuilder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/DefaultSslContextBuilder.java
index 2e67b02f90b1e..ab5f41c6bbf8d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/DefaultSslContextBuilder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/DefaultSslContextBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/DirectMemoryUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/DirectMemoryUtils.java
index 7fb54ac3661df..0e5a450aa6bf3 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/DirectMemoryUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/DirectMemoryUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
index 40450584764a4..626a14b92eedd 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FileModifiedTimeUpdater.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FileModifiedTimeUpdater.java
index 2561c04570b8b..fb9e72435e35b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FileModifiedTimeUpdater.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FileModifiedTimeUpdater.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java
index afad61eb66918..19e3a62cc92af 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesShutdown.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesShutdown.java
index 9784c0f6a4312..5bbe816c4c7d5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesShutdown.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesShutdown.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesTerminationHandler.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesTerminationHandler.java
index 148b826e44604..ca247fbd85a6b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesTerminationHandler.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/GracefulExecutorServicesTerminationHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Hash.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Hash.java
index 58fb27c3befce..91beede6fb004 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Hash.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Hash.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyManagerProxy.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyManagerProxy.java
index 83a4e5afffbeb..171f5acd2bf75 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyManagerProxy.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyManagerProxy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyStoreHolder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyStoreHolder.java
index 6284ec423aa1d..d7fd6fbee5b1a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyStoreHolder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/KeyStoreHolder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Murmur3_32Hash.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Murmur3_32Hash.java
index e9510b370643b..15d49c1b9bbcf 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Murmur3_32Hash.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Murmur3_32Hash.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NamespaceBundleStatsComparator.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NamespaceBundleStatsComparator.java
index 275ea659eb885..afdd7e0406e6e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NamespaceBundleStatsComparator.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NamespaceBundleStatsComparator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyClientSslContextRefresher.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyClientSslContextRefresher.java
index 9e050b7058d8b..6f1690310c104 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyClientSslContextRefresher.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyClientSslContextRefresher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyServerSslContextBuilder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyServerSslContextBuilder.java
index 0e3539b2b3f50..eda61be3f87c2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyServerSslContextBuilder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NettyServerSslContextBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NumberFormat.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NumberFormat.java
index 502af8251e512..93b9f49fa502a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/NumberFormat.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/NumberFormat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ObjectMapperFactory.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ObjectMapperFactory.java
index 99add4942310f..cee81bb6db458 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ObjectMapperFactory.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ObjectMapperFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/PortManager.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/PortManager.java
index b9df071fdbc7e..612deb9e01727 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/PortManager.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/PortManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimitFunction.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimitFunction.java
index 7644389a70a82..0a4b62e9500f9 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimitFunction.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimitFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
index 33003af20a0de..4ecb29b2462cc 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RecoverTimeRecord.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RecoverTimeRecord.java
index 160e3fdf37b08..cdf838d1ba987 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RecoverTimeRecord.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RecoverTimeRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Reflections.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Reflections.java
index 5ae16982191ef..6b6f821f4adaf 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Reflections.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Reflections.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RelativeTimeUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RelativeTimeUtil.java
index dd98bb8e8fc0e..12dd6efd6c0b2 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RelativeTimeUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RelativeTimeUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RestException.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RestException.java
index 3d947b73072ac..079374f405b8b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RestException.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RestException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Runnables.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Runnables.java
index 6e78f80e7bcb1..dde952a45bd05 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/Runnables.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/Runnables.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SafeCollectionUtils.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SafeCollectionUtils.java
index 21488fb3e5ac8..10301539b1b31 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SafeCollectionUtils.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SafeCollectionUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java
index c288c054bb9f2..12ab9ae0b0bc9 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -124,7 +124,12 @@ private static Provider loadConscryptProvider() {
             conscryptClazz = Class.forName("org.conscrypt.Conscrypt");
             conscryptClazz.getMethod("checkAvailability").invoke(null);
         } catch (Throwable e) {
-            log.warn("Conscrypt isn't available. Using JDK default security provider.", e);
+            if (e.getCause() instanceof UnsatisfiedLinkError) {
+                log.warn("Conscrypt isn't available for {} {}. Using JDK default security provider.",
+                        System.getProperty("os.name"), System.getProperty("os.arch"));
+            } else {
+                log.warn("Conscrypt isn't available. Using JDK default security provider.", e);
+            }
             return null;
         }
 
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java
index 33f36314a5857..b461cfab0d1bc 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ShutdownUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SimpleTextOutputStream.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SimpleTextOutputStream.java
index dd78b4cfe58b9..c8c639606aa3e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SimpleTextOutputStream.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SimpleTextOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,6 +19,7 @@
 package org.apache.pulsar.common.util;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
 
 /**
  * Format strings and numbers into a ByteBuf without any memory allocation.
@@ -43,7 +44,7 @@ public SimpleTextOutputStream write(byte[] a, int offset, int len) {
     }
 
     public SimpleTextOutputStream write(char c) {
-        buffer.writeByte((byte) c);
+        write(String.valueOf(c));
         return this;
     }
 
@@ -51,11 +52,8 @@ public SimpleTextOutputStream write(String s) {
         if (s == null) {
             return this;
         }
-        int len = s.length();
-        for (int i = 0; i < len; i++) {
-            buffer.writeByte((byte) s.charAt(i));
-        }
 
+        buffer.writeCharSequence(s, CharsetUtil.UTF_8);
         return this;
     }
 
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SslContextAutoRefreshBuilder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SslContextAutoRefreshBuilder.java
index a29f051e805ce..8c8f580046448 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/SslContextAutoRefreshBuilder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/SslContextAutoRefreshBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ThreadDumpUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ThreadDumpUtil.java
index 683aaeffcb3fe..2916269209d86 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/ThreadDumpUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/ThreadDumpUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/TrustManagerProxy.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/TrustManagerProxy.java
index 120e9d17a67cb..8ec3dce6fcef5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/TrustManagerProxy.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/TrustManagerProxy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/BitSetRecyclable.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/BitSetRecyclable.java
index 26dbabeffcc3a..12ce7eb74c72b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/BitSetRecyclable.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/BitSetRecyclable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSet.java
index 68a73567b0961..23842fe5b556c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclable.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclable.java
index d096567877cb7..0ba409b2d7d17 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclable.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMap.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMap.java
index 62303015c3903..31b4cb7cbf152 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMap.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMap.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMap.java
index cce8be0b7fdef..c0ccad9b73d5b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMap.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSet.java
index 1a892dbd96613..2a1090503857c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMap.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMap.java
index 924d4893578fb..ea2e01768ac7e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMap.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSet.java
index a5333adae2f61..cc8bc07b43095 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java
index a71c5ceb8de79..6faa61d3b374d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSet.java
index 2c671cb3d5cc1..0718a4f81a61f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java
index d4afe6ecf63d9..7825f9a0562be 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueue.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueue.java
index 413711f850ca0..06ae7f3d00825 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueue.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairRangeSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairRangeSet.java
index d804900ed420b..70a589cf55166 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairRangeSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairRangeSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairSet.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairSet.java
index f27b994f777d2..3750d8c22020f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairSet.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/LongPairSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/SegmentedLongArray.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/SegmentedLongArray.java
index dc4d1c4908c48..0b3520983b2ba 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/SegmentedLongArray.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/SegmentedLongArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueue.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueue.java
index 50288247c643c..e75ae21ab8518 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueue.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/package-info.java
index b3442308d89c5..40dedcdb6f87a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java
index bed51e81680da..4ed1826cfe9b1 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NetSslContextBuilder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NetSslContextBuilder.java
index ebe7ec19be52e..3d4d4e72546ea 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NetSslContextBuilder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NetSslContextBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NettySSLContextAutoRefreshBuilder.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NettySSLContextAutoRefreshBuilder.java
index 68271963af51c..7b47eb9b8bb64 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NettySSLContextAutoRefreshBuilder.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/NettySSLContextAutoRefreshBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/SSLContextValidatorEngine.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/SSLContextValidatorEngine.java
index d42ba2193f686..a01412599bf12 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/SSLContextValidatorEngine.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/SSLContextValidatorEngine.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/package-info.java
index 11a8db4e0cee8..ff88da46f318f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/ChannelFutures.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/ChannelFutures.java
index 4fc4731e08641..294c0db99ea5c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/ChannelFutures.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/ChannelFutures.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/DnsResolverUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/DnsResolverUtil.java
index 8b06dbf36eca3..f49a6453c72b3 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/DnsResolverUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/DnsResolverUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -50,12 +50,8 @@ public class DnsResolverUtil {
                  | IllegalAccessException e) {
             log.warn("Cannot get DNS TTL settings from sun.net.InetAddressCachePolicy class", e);
         }
-        TTL = useDefaultTTLWhenSetToForever(ttl, DEFAULT_TTL);
-        NEGATIVE_TTL = useDefaultTTLWhenSetToForever(negativeTtl, DEFAULT_NEGATIVE_TTL);
-    }
-
-    private static int useDefaultTTLWhenSetToForever(int ttl, int defaultTtl) {
-        return ttl < 0 ? defaultTtl : ttl;
+        TTL = ttl <= 0 ? DEFAULT_TTL : ttl;
+        NEGATIVE_TTL = negativeTtl < 0 ? DEFAULT_NEGATIVE_TTL : negativeTtl;
     }
 
     private DnsResolverUtil() {
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java
index 713bc6139a628..cfc766890f02d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -35,43 +35,61 @@
 import io.netty.channel.socket.nio.NioDatagramChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.incubator.channel.uring.IOUring;
+import io.netty.incubator.channel.uring.IOUringDatagramChannel;
+import io.netty.incubator.channel.uring.IOUringEventLoopGroup;
+import io.netty.incubator.channel.uring.IOUringServerSocketChannel;
+import io.netty.incubator.channel.uring.IOUringSocketChannel;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bookkeeper.common.util.affinity.CpuAffinity;
+import org.apache.commons.lang3.StringUtils;
 
 @SuppressWarnings("checkstyle:JavadocType")
 @Slf4j
 public class EventLoopUtil {
 
+    private static final String ENABLE_IO_URING = "pulsar.enableUring";
+
     /**
      * @return an EventLoopGroup suitable for the current platform
      */
     public static EventLoopGroup newEventLoopGroup(int nThreads, boolean enableBusyWait, ThreadFactory threadFactory) {
         if (Epoll.isAvailable()) {
-            if (!enableBusyWait) {
-                // Regular Epoll based event loop
-                return new EpollEventLoopGroup(nThreads, threadFactory);
-            }
+            String enableIoUring = System.getProperty(ENABLE_IO_URING);
 
-            // With low latency setting, put the Netty event loop on busy-wait loop to reduce cost of
-            // context switches
-            EpollEventLoopGroup eventLoopGroup = new EpollEventLoopGroup(nThreads, threadFactory,
-                    () -> (selectSupplier, hasTasks) -> SelectStrategy.BUSY_WAIT);
+            // By default, io_uring will not be enabled, even if available. The environment variable will be used:
+            // enable.io_uring=1
+            if (StringUtils.equalsAnyIgnoreCase(enableIoUring, "1", "true")) {
+                // Throw exception if IOUring cannot be used
+                IOUring.ensureAvailability();
+                return new IOUringEventLoopGroup(nThreads, threadFactory);
+            } else {
+                if (!enableBusyWait) {
+                    // Regular Epoll based event loop
+                    return new EpollEventLoopGroup(nThreads, threadFactory);
+                }
 
-            // Enable CPU affinity on IO threads
-            for (int i = 0; i < nThreads; i++) {
-                eventLoopGroup.next().submit(() -> {
-                    try {
-                        CpuAffinity.acquireCore();
-                    } catch (Throwable t) {
-                        log.warn("Failed to acquire CPU core for thread {} {}", Thread.currentThread().getName(),
-                                t.getMessage(), t);
-                    }
-                });
-            }
+                // With low latency setting, put the Netty event loop on busy-wait loop to reduce cost of
+                // context switches
+                EpollEventLoopGroup eventLoopGroup = new EpollEventLoopGroup(nThreads, threadFactory,
+                        () -> (selectSupplier, hasTasks) -> SelectStrategy.BUSY_WAIT);
 
-            return eventLoopGroup;
+                // Enable CPU affinity on IO threads
+                for (int i = 0; i < nThreads; i++) {
+                    eventLoopGroup.next().submit(() -> {
+                        try {
+                            CpuAffinity.acquireCore();
+                        } catch (Throwable t) {
+                            log.warn("Failed to acquire CPU core for thread {} {}", Thread.currentThread().getName(),
+                                    t.getMessage(), t);
+                        }
+                    });
+                }
+
+                return eventLoopGroup;
+            }
         } else {
             // Fallback to NIO
             return new NioEventLoopGroup(nThreads, threadFactory);
@@ -85,7 +103,9 @@ public static EventLoopGroup newEventLoopGroup(int nThreads, boolean enableBusyW
      * @return
      */
     public static Class getClientSocketChannelClass(EventLoopGroup eventLoopGroup) {
-        if (eventLoopGroup instanceof EpollEventLoopGroup) {
+        if (eventLoopGroup instanceof IOUringEventLoopGroup) {
+            return IOUringSocketChannel.class;
+        } else if (eventLoopGroup instanceof EpollEventLoopGroup) {
             return EpollSocketChannel.class;
         } else {
             return NioSocketChannel.class;
@@ -93,7 +113,9 @@ public static Class getClientSocketChannelClass(EventLo
     }
 
     public static Class getServerSocketChannelClass(EventLoopGroup eventLoopGroup) {
-        if (eventLoopGroup instanceof EpollEventLoopGroup) {
+        if (eventLoopGroup instanceof IOUringEventLoopGroup) {
+            return IOUringServerSocketChannel.class;
+        } else if (eventLoopGroup instanceof EpollEventLoopGroup) {
             return EpollServerSocketChannel.class;
         } else {
             return NioServerSocketChannel.class;
@@ -101,7 +123,9 @@ public static Class getServerSocketChannelClass(E
     }
 
     public static Class getDatagramChannelClass(EventLoopGroup eventLoopGroup) {
-        if (eventLoopGroup instanceof EpollEventLoopGroup) {
+        if (eventLoopGroup instanceof IOUringEventLoopGroup) {
+            return IOUringDatagramChannel.class;
+        } else if (eventLoopGroup instanceof EpollEventLoopGroup) {
             return EpollDatagramChannel.class;
         } else {
             return NioDatagramChannel.class;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/NettyFutureUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/NettyFutureUtil.java
index c93fcca6b3b45..8686a38167920 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/NettyFutureUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/NettyFutureUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/package-info.java
index bbb2f42aea45b..e7217305261fa 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/package-info.java
index 079a8e098ef69..b394f26a7f816 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/AdvertisedListener.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/AdvertisedListener.java
index 6caaafb946231..9670b9afab0d1 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/AdvertisedListener.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/AdvertisedListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerData.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerData.java
index 91a9ec1bd412e..5f97e7074864f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerUsage.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerUsage.java
index 6fd7d60fbd9c3..803817ddf87c1 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerUsage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BrokerUsage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BundleData.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BundleData.java
index 3537acaee6d7c..e5e32046e4970 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BundleData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/BundleData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/JvmUsage.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/JvmUsage.java
index 4861c94d2ac7a..50230ee15a9b5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/JvmUsage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/JvmUsage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReport.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReport.java
index 123b2e04888ce..75fddc21bf91b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReport.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReportDeserializer.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReportDeserializer.java
index da920022f32b6..b7181c1ce1e6d 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReportDeserializer.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LoadReportDeserializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java
index 3c97439f8143c..904b2d1436854 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.policies.data.loadbalancer;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.Collections;
 import java.util.HashMap;
@@ -33,6 +34,7 @@
 /**
  * Contains all the data that is maintained locally on each broker.
  */
+@JsonIgnoreProperties(value = {"bundleStats"})
 @JsonDeserialize(as = LocalBrokerData.class)
 public class LocalBrokerData implements LoadManagerReport {
 
@@ -256,16 +258,6 @@ public double getMaxResourceUsageWithWeight(final double cpuWeight, final double
                 bandwidthOut.percentUsage() * bandwidthOutWeight) / 100;
     }
 
-    public double getMaxResourceUsageWithWeightWithinLimit(final double cpuWeight, final double memoryWeight,
-                                                           final double directMemoryWeight,
-                                                           final double bandwidthInWeight,
-                                                           final double bandwidthOutWeight) {
-        return maxWithinLimit(100.0d,
-                cpu.percentUsage() * cpuWeight, memory.percentUsage() * memoryWeight,
-                directMemory.percentUsage() * directMemoryWeight, bandwidthIn.percentUsage() * bandwidthInWeight,
-                bandwidthOut.percentUsage() * bandwidthOutWeight) / 100;
-    }
-
     private static double max(double... args) {
         double max = Double.NEGATIVE_INFINITY;
 
@@ -290,16 +282,6 @@ private static float max(float...args) {
         return max;
     }
 
-    private static double maxWithinLimit(double limit, double...args) {
-        double max = 0.0;
-        for (double d : args) {
-            if (d > max && d <= limit) {
-                max = d;
-            }
-        }
-        return max;
-    }
-
     public String getLoadReportType() {
         return loadReportType;
     }
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceUsage.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceUsage.java
index cdbd32cb29379..678a7c2886211 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceUsage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/NamespaceUsage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUnitRanking.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUnitRanking.java
index fc9129b74dd2c..3a9d7de09e1d5 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUnitRanking.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/ResourceUnitRanking.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/SystemResourceUsage.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/SystemResourceUsage.java
index 6b7ef1f7680e8..c2ac7863e9902 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/SystemResourceUsage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/SystemResourceUsage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageBrokerData.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageBrokerData.java
index 4d1e2057380db..f22222c3063c1 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageBrokerData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageBrokerData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageMessageData.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageMessageData.java
index 1512f896b2ea6..777a6684ce81e 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageMessageData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/TimeAverageMessageData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java
index 158c6c9a70d23..aa6b9c0d5477c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/AddMissingPatchVersionTest.java b/pulsar-common/src/test/java/org/apache/pulsar/AddMissingPatchVersionTest.java
index 0406f84cefd7a..2c7cd65064364 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/AddMissingPatchVersionTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/AddMissingPatchVersionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorDefaultTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorDefaultTest.java
index 9c548ff25e450..eb31d835ec162 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorDefaultTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorDefaultTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorOomThrowExceptionTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorOomThrowExceptionTest.java
index e1a3176e5bd1a..3f1dbc29bd945 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorOomThrowExceptionTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/allocator/PulsarByteBufAllocatorOomThrowExceptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
index e7270e4546faa..b0b9d42866cba 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CommandsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CommandsTest.java
index 207c6202426c8..42f1a58100283 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CommandsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CommandsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecLZ4JNI.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecLZ4JNI.java
index 3665fab2a4650..42b67219e7de5 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecLZ4JNI.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecLZ4JNI.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecSnappyJNI.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecSnappyJNI.java
index 564768aacbfc0..ab6d3c08fcb71 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecSnappyJNI.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecSnappyJNI.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecZstdJNI.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecZstdJNI.java
index a5be713432ea3..630762dde2178 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecZstdJNI.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressionCodecZstdJNI.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecBackwardCompatTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecBackwardCompatTest.java
index dab08f8a35375..ceacd4cea22cf 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecBackwardCompatTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecBackwardCompatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecTest.java
index f095eca29677d..402696ea2afd6 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/CompressorCodecTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/Crc32cChecksumTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/Crc32cChecksumTest.java
index 02601332428a7..a2014baa3c393 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/compression/Crc32cChecksumTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/compression/Crc32cChecksumTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/io/BatchSourceConfigParseTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/io/BatchSourceConfigParseTest.java
index c761404ffb05a..e5f737d80dc74 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/io/BatchSourceConfigParseTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/io/BatchSourceConfigParseTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/lookup/data/LookupDataTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/lookup/data/LookupDataTest.java
index 9023ba585bc09..a2be39fb891ec 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/lookup/data/LookupDataTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/lookup/data/LookupDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/naming/MetadataTests.java b/pulsar-common/src/test/java/org/apache/pulsar/common/naming/MetadataTests.java
index 2a9457f072996..cc46ef9271bca 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/naming/MetadataTests.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/naming/MetadataTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/naming/NamespaceNameTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/naming/NamespaceNameTest.java
index 1bc0ddef40fd7..f4c04f404f287 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/naming/NamespaceNameTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/naming/NamespaceNameTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/naming/TopicNameTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/naming/TopicNameTest.java
index 6107f5d404245..0e4533e7a08d0 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/naming/TopicNameTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/naming/TopicNameTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/nar/NarUnpackerTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/nar/NarUnpackerTest.java
index 1f97b1b1b69d0..c6c5ee180f69a 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/nar/NarUnpackerTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/nar/NarUnpackerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/net/ServiceURITest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/net/ServiceURITest.java
index 87279a92df0f9..84cbf9ceef5e8 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/net/ServiceURITest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/net/ServiceURITest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataTest.java
index b6b615f6a5461..05f0bb6daffe3 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyTypeTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyTypeTest.java
index cc59ac18b47c2..610823fac9e01 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyTypeTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoFailoverPolicyTypeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverrideTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverrideTest.java
index 66769f0bfbc18..ade958533ca60 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverrideTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/AutoTopicCreationOverrideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
index 2a22dc24e5783..bf95092effa7f 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ClusterDataTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ClusterDataTest.java
index 9689d3f06dce6..9463129cfc4af 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ClusterDataTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ClusterDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ConsumerStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ConsumerStatsTest.java
index b4b27d8a6f89d..7c66f24900b7e 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ConsumerStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ConsumerStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfigTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfigTest.java
index db81a1f3f9984..c2554c6fb0390 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfigTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/EnsemblePlacementPolicyConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/LocalPolicesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/LocalPolicesTest.java
index ebdbd0b2d9559..d471141e3bfe0 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/LocalPolicesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/LocalPolicesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataTest.java
index bc35c58c2a207..471807181ed6c 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceIsolationDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatusTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatusTest.java
index b71864e0e8722..ee1fc230290b0 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatusTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NamespaceOwnershipStatusTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStatsTest.java
index 001eaec901f86..814df9e712a11 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/NonPersistentPartitionedTopicStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
index f9c856e69d56b..88036b1688437 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -34,6 +34,7 @@ public class OffloadPoliciesTest {
     private final Integer managedLedgerOffloadMaxThreads = 10;
     private final Integer managedLedgerOffloadPrefetchRounds = 5;
     private final Long offloadThresholdInBytes = 0L;
+    private final Long offloadThresholdInSeconds = 100L;
     private final Long offloadDeletionLagInMillis = 5 * MIN;
 
     @Test
@@ -49,6 +50,7 @@ public void testS3Configuration() {
         final Integer maxBlockSizeInBytes = 5 * M;
         final Integer readBufferSizeInBytes = 2 * M;
         final Long offloadThresholdInBytes = 10L * M;
+        final Long offloadThresholdInSeconds = 1000L;
         final Long offloadDeletionLagInMillis = 5L * MIN;
 
         OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl.create(
@@ -63,6 +65,7 @@ public void testS3Configuration() {
                 maxBlockSizeInBytes,
                 readBufferSizeInBytes,
                 offloadThresholdInBytes,
+                offloadThresholdInSeconds,
                 offloadDeletionLagInMillis,
                 OffloadedReadPriority.TIERED_STORAGE_FIRST
         );
@@ -77,6 +80,7 @@ public void testS3Configuration() {
                 offloadThresholdInBytes);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(),
                 Long.valueOf(offloadDeletionLagInMillis));
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInSeconds(), offloadThresholdInSeconds);
     }
 
     @Test
@@ -92,6 +96,7 @@ public void testGcsConfiguration() {
         final Integer maxBlockSizeInBytes = 5 * M;
         final Integer readBufferSizeInBytes = 2 * M;
         final Long offloadThresholdInBytes = 0L;
+        final Long offloadThresholdInSeconds = 1000L;
         final Long offloadDeletionLagInMillis = 5 * MIN;
         final OffloadedReadPriority readPriority = OffloadedReadPriority.TIERED_STORAGE_FIRST;
 
@@ -107,6 +112,7 @@ public void testGcsConfiguration() {
                 maxBlockSizeInBytes,
                 readBufferSizeInBytes,
                 offloadThresholdInBytes,
+                offloadThresholdInSeconds,
                 offloadDeletionLagInMillis,
                 readPriority
         );
@@ -119,6 +125,7 @@ public void testGcsConfiguration() {
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), offloadThresholdInBytes);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), offloadDeletionLagInMillis);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadedReadPriority(), readPriority);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInSeconds(), offloadThresholdInSeconds);
     }
 
     @Test
@@ -150,6 +157,7 @@ public void testCreateByProperties() {
         properties.setProperty("managedLedgerOffloadMaxThreads", "" + managedLedgerOffloadMaxThreads);
         properties.setProperty("managedLedgerOffloadPrefetchRounds", "" + managedLedgerOffloadPrefetchRounds);
         properties.setProperty("managedLedgerOffloadAutoTriggerSizeThresholdBytes", "" + offloadThresholdInBytes);
+        properties.setProperty("managedLedgerOffloadThresholdInSeconds", "" + offloadThresholdInSeconds);
         properties.setProperty("managedLedgerOffloadDeletionLagMs", "" + offloadDeletionLagInMillis);
 
         properties.setProperty("s3ManagedLedgerOffloadRegion", s3ManagedLedgerOffloadRegion);
@@ -184,6 +192,7 @@ public void testCreateByProperties() {
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadMaxThreads(), managedLedgerOffloadMaxThreads);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadPrefetchRounds(), managedLedgerOffloadPrefetchRounds);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), offloadThresholdInBytes);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInSeconds(), offloadThresholdInSeconds);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), offloadDeletionLagInMillis);
 
         Assert.assertEquals(offloadPolicies.getS3ManagedLedgerOffloadRegion(), s3ManagedLedgerOffloadRegion);
@@ -252,22 +261,27 @@ public void compatibleWithConfigFileTest() {
     public void oldPoliciesCompatibleTest() {
         Policies policies = new Policies();
         Assert.assertEquals(policies.offload_threshold, -1);
+        Assert.assertEquals(policies.offload_threshold_in_seconds, -1);
 
         OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl.oldPoliciesCompatible(null, policies);
         Assert.assertNull(offloadPolicies);
 
         policies.offload_deletion_lag_ms = 1000L;
         policies.offload_threshold = 0;
+        policies.offload_threshold_in_seconds = 0;
         offloadPolicies = OffloadPoliciesImpl.oldPoliciesCompatible(offloadPolicies, policies);
         Assert.assertNotNull(offloadPolicies);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), Long.valueOf(1000));
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), Long.valueOf(0));
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInSeconds(), Long.valueOf(0));
 
         policies.offload_deletion_lag_ms = 2000L;
         policies.offload_threshold = 100;
+        policies.offload_threshold_in_seconds = 100;
         offloadPolicies = OffloadPoliciesImpl.oldPoliciesCompatible(offloadPolicies, policies);
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), Long.valueOf(1000));
         Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), Long.valueOf(0));
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInSeconds(), Long.valueOf(0));
     }
 
     @Test
@@ -305,4 +319,50 @@ public void mergeTest() {
         Assert.assertNull(offloadPolicies.getS3ManagedLedgerOffloadRegion());
     }
 
+
+    @Test
+    public void brokerPropertyCompatibleTest() {
+        final Long brokerOffloadThreshold = 0L;
+        final Long brokerDeletionLag = 2000L;
+        final String brokerReadPriority = "bookkeeper-first";
+
+        // 1. mergeConfiguration test
+        Properties brokerProperties = new Properties();
+        brokerProperties.setProperty("managedLedgerOffloadAutoTriggerSizeThresholdBytes", "" + brokerOffloadThreshold);
+        brokerProperties.setProperty("managedLedgerOffloadDeletionLagMs", "" + brokerDeletionLag);
+        brokerProperties.setProperty("managedLedgerDataReadPriority", "" + brokerReadPriority);
+        OffloadPoliciesImpl offloadPolicies =
+          OffloadPoliciesImpl.mergeConfiguration(null, null, brokerProperties);
+        Assert.assertNotNull(offloadPolicies);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), brokerOffloadThreshold);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), brokerDeletionLag);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadedReadPriority().toString(), brokerReadPriority);
+
+        // 2. compatibleWithBrokerConfigFile test
+        brokerProperties = new Properties();
+        brokerProperties.setProperty("managedLedgerOffloadAutoTriggerSizeThresholdBytes", "" + brokerOffloadThreshold);
+        brokerProperties.setProperty("managedLedgerOffloadDeletionLagMs", "" + brokerDeletionLag);
+        brokerProperties.setProperty("managedLedgerDataReadPriority", "" + brokerReadPriority);
+        offloadPolicies = OffloadPoliciesImpl.create(brokerProperties);
+        Assert.assertNotNull(offloadPolicies);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), brokerOffloadThreshold);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), brokerDeletionLag);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadedReadPriority().toString(), brokerReadPriority);
+
+
+        brokerProperties = new Properties();
+        // 2.1 offload properties name in OffloadPoliciesImpl
+        brokerProperties.setProperty("managedLedgerOffloadThresholdInBytes", "" + (brokerOffloadThreshold));
+        brokerProperties.setProperty("managedLedgerOffloadDeletionLagInMillis", "" + (brokerDeletionLag));
+        brokerProperties.setProperty("managedLedgerOffloadedReadPriority", "" + (brokerReadPriority));
+        // 2.2 offload properties name in conf file
+        brokerProperties.setProperty("managedLedgerOffloadAutoTriggerSizeThresholdBytes", "" + brokerOffloadThreshold + 30);
+        brokerProperties.setProperty("managedLedgerOffloadDeletionLagMs", "" + brokerDeletionLag + 30);
+        brokerProperties.setProperty("managedLedgerDataReadPriority", "" + "tiered-storage-first");
+        offloadPolicies = OffloadPoliciesImpl.create(brokerProperties);
+        Assert.assertNotNull(offloadPolicies);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadThresholdInBytes(), brokerOffloadThreshold);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadDeletionLagInMillis(), brokerDeletionLag);
+        Assert.assertEquals(offloadPolicies.getManagedLedgerOffloadedReadPriority().toString(), brokerReadPriority);
+    }
 }
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OldPolicies.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OldPolicies.java
index 90bd84c399a51..bed7ff8eaac66 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OldPolicies.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OldPolicies.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PartitionedTopicStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PartitionedTopicStatsTest.java
index aa2b90ba8a96d..9b7393d226a96 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PartitionedTopicStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PartitionedTopicStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistencePoliciesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistencePoliciesTest.java
index 8755303da71c7..b560c2a29dec7 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistencePoliciesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistencePoliciesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStatsTest.java
index 485d338a71669..dc27c6681898a 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentOfflineTopicStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentTopicStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentTopicStatsTest.java
index 0da2b9f8abbd3..03bde68022f86 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentTopicStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PersistentTopicStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
index 3b186e3f31ac6..e74cef2c6263a 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValueTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValueTest.java
index 0b00747e25cc6..2d6e803050c2e 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValueTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PolicyHierarchyValueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.policies.data;
 
 import org.testng.Assert;
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PublisherStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PublisherStatsTest.java
index 2aa1974bd659a..8be02c58eb0bd 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PublisherStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PublisherStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
index 9e17e03de271f..accd19fa1c035 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
index 11488b96b1510..358ef91e87952 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/RetentionPolicesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/RetentionPolicesTest.java
index 8ad34352f60f0..30275a875999b 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/RetentionPolicesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/RetentionPolicesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactoryTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactoryTest.java
index 75e8889e435ff..90528c543ba21 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactoryTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/AutoFailoverPolicyFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicyTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicyTest.java
index de7370bb8c690..3ebd622b7c051 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicyTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPoliciesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPoliciesTest.java
index fb58f2e6efacf..7ef8d0cb3b8a3 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPoliciesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPoliciesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImplTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImplTest.java
index c7f67d31fdc7d..c9f087e57080b 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImplTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/ByteBufPairTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/ByteBufPairTest.java
index b17f50acc6056..4af7560e6f6b9 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/ByteBufPairTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/ByteBufPairTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/CommandUtilsTests.java b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/CommandUtilsTests.java
index f3393e621917d..4523a5cc97b37 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/CommandUtilsTests.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/CommandUtilsTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/MarkersTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/MarkersTest.java
index 3eb0cfb726d6a..fe8a393b1149e 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/MarkersTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/MarkersTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/PulsarDecoderTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/PulsarDecoderTest.java
index 96c14515f23e0..6fd77c1662474 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/PulsarDecoderTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/protocol/PulsarDecoderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLoggerTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLoggerTest.java
index a51329da4352a..9b88adc1a64df 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLoggerTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/stats/JvmDefaultGCMetricsLoggerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/topics/TopicListTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/topics/TopicListTest.java
index 9c3b54a0f0d80..9069dd6dcc7b9 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/topics/TopicListTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/topics/TopicListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/CmdGenerateDocsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/CmdGenerateDocsTest.java
index 62e225aff9a94..68d8a02f48673 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/CmdGenerateDocsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/CmdGenerateDocsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandlerTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandlerTest.java
index 337e607498d55..4620eea904e82 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandlerTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/CompletableFutureCancellationHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
index b86372afafea1..e90b6cbc4a13a 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FileModifiedTimeUpdaterTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FileModifiedTimeUpdaterTest.java
index 0b093e7740014..9c75a5cdb0a82 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FileModifiedTimeUpdaterTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FileModifiedTimeUpdaterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.util;
 
 import static org.testng.Assert.assertTrue;
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FutureUtilTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FutureUtilTest.java
index 7929672fa3351..856ec49da6e9d 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FutureUtilTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FutureUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.util;
 
 import java.io.PrintWriter;
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/ObjectMapperFactoryTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/ObjectMapperFactoryTest.java
index 466585d03d515..8c92f7bb6823d 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/ObjectMapperFactoryTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/ObjectMapperFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/PortManagerTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/PortManagerTest.java
index 88057ba943ab2..b1c3493250587 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/PortManagerTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/PortManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
index 57090fcc7b7e0..5cbd024556593 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/ReflectionsTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/ReflectionsTest.java
index e59f21a3a5225..68e99f2b25ba8 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/ReflectionsTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/ReflectionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RelativeTimeUtilTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RelativeTimeUtilTest.java
index bc44ac4e8819f..49cad792e116e 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RelativeTimeUtilTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RelativeTimeUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RunnablesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RunnablesTest.java
index 6dfbe1beececf..2a458632053fc 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RunnablesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RunnablesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.util;
 
 import org.testng.annotations.Test;
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
index 33163f6e6a568..8114f9b9356f3 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/TrustManagerProxyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,8 +18,8 @@
  */
 package org.apache.pulsar.common.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import com.google.common.io.Resources;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/BitSetRecyclableRecyclableTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/BitSetRecyclableRecyclableTest.java
index 0f42f35608a76..8374f2db8961a 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/BitSetRecyclableRecyclableTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/BitSetRecyclableRecyclableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclableTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclableTest.java
index 9a216b0885795..b2cbfdcc0cd18 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclableTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentBitSetRecyclableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMapTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMapTest.java
index f60fea7ab7faf..a317fa63c0986 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMapTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongHashMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMapTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMapTest.java
index eca63734915b6..8e74d285ffb9b 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMapTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongLongPairHashMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSetTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSetTest.java
index a7bbe9b0dc356..7e947ae6e6aa3 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSetTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentLongPairSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
index 411dfc735fdd4..198a3f4c5c38b 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java
index d6403af52cf37..27c18abb8b347 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java
index 5d9af2e02271e..3037a9deba356 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSetTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSetTest.java
index 62dfa21dc81c9..eff49883215d7 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSetTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentSortedLongPairSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/DefaultRangeSetTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/DefaultRangeSetTest.java
index e2fc5c1d32d72..57303013a112c 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/DefaultRangeSetTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/DefaultRangeSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
index 59cfb2f5f0d1a..792cd5b4023d5 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
index 5fe61c3d629c6..ebe4cde4f1248 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueueTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueueTest.java
index 456932250318b..086f96ee04c64 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueueTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowablePriorityLongPairQueueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/SegmentedLongArrayTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/SegmentedLongArrayTest.java
index efb86fd4f9d48..f6c216c439c21 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/SegmentedLongArrayTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/SegmentedLongArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
index de3b1adb7929d..01748e2b4ed97 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
index 556f20ceaacfc..dc9c6de1b9fbb 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/DnsResolverTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/DnsResolverTest.java
new file mode 100644
index 0000000000000..0ccb960e79887
--- /dev/null
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/DnsResolverTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.util.netty;
+
+import io.netty.channel.EventLoop;
+import io.netty.resolver.dns.DnsNameResolverBuilder;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class DnsResolverTest {
+
+    @Test
+    public void testMaxTtl() {
+        EventLoop eventLoop = Mockito.mock(EventLoop.class);
+        DnsNameResolverBuilder dnsNameResolverBuilder = new DnsNameResolverBuilder(eventLoop);
+        DnsResolverUtil.applyJdkDnsCacheSettings(dnsNameResolverBuilder);
+        // If the maxTtl is <=0, it will throw IllegalArgumentException.
+        try {
+            dnsNameResolverBuilder.build();
+        } catch (Exception ex) {
+            Assert.assertFalse(ex instanceof IllegalArgumentException);
+        }
+    }
+}
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/SslContextTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/SslContextTest.java
index e66bbbc17a287..303df5a003278 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/SslContextTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/SslContextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.common.util.netty;
 
 import static org.testng.Assert.assertThrows;
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerDataTest.java b/pulsar-common/src/test/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerDataTest.java
index 69d4a7f4cd198..a95f019234caa 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerDataTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,11 +18,14 @@
  */
 package org.apache.pulsar.policies.data.loadbalancer;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 
 public class LocalBrokerDataTest {
 
@@ -53,10 +56,15 @@ public void testMaxResourceUsage() {
         assertEquals(
                 data.getMaxResourceUsageWithWeight(
                         weight, weight, weight, weight, weight), 2.0, epsilon);
+    }
 
-        assertEquals(
-                data.getMaxResourceUsageWithWeightWithinLimit(
-                        weight, weight, weight, weight, weight), 0.02, epsilon);
-
+    /*
+    Ensure that there is no bundleStats field in the json string serialized from LocalBrokerData.
+     */
+    @Test
+    public void testSerializeLocalBrokerData() throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        LocalBrokerData localBrokerData = new LocalBrokerData();
+        assertFalse(objectMapper.writeValueAsString(localBrokerData).contains("bundleStats"));
     }
 }
diff --git a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidation.java b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidation.java
index e53bb118795af..bcb3546ed6332 100644
--- a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidation.java
+++ b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationAnnotations.java b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationAnnotations.java
index aa7c3c232ee5f..a4df2e1fa479e 100644
--- a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationAnnotations.java
+++ b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationAnnotations.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationUtils.java b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationUtils.java
index ac17c65e3bd6b..64d5af415588c 100644
--- a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationUtils.java
+++ b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ConfigValidationUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/Validator.java b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/Validator.java
index 77032e370ee1c..ea3332d886c9e 100644
--- a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/Validator.java
+++ b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/Validator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ValidatorImpls.java b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ValidatorImpls.java
index d8f256c50804f..634cc68f520c0 100644
--- a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ValidatorImpls.java
+++ b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/ValidatorImpls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/package-info.java b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/package-info.java
index adbc737509e2e..ae7d4436d547e 100644
--- a/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/package-info.java
+++ b/pulsar-config-validation/src/main/java/org/apache/pulsar/config/validation/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ConfigValidationTest.java b/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ConfigValidationTest.java
index 085ddb64a852d..f17c8b4f4b809 100644
--- a/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ConfigValidationTest.java
+++ b/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ConfigValidationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ValidatorImplsTest.java b/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ValidatorImplsTest.java
index 4f030ab9438b8..0aba36e402d53 100644
--- a/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ValidatorImplsTest.java
+++ b/pulsar-config-validation/src/test/java/org/apache/pulsar/config/validation/ValidatorImplsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/BaseContext.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/BaseContext.java
index 2b9a4e360cf18..25874c595d9d4 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/BaseContext.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/BaseContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java
index 2a89fecbc6501..8854be3d816f6 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Function.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Function.java
index c1569063f975c..d5c8ed595641f 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Function.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Function.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/KVRecord.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/KVRecord.java
index 6f5db3e2c2197..43115a25fa9fe 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/KVRecord.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/KVRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java
index 1d7f23ac682bc..ea6987e5f0391 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/SerDe.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/SerDe.java
index b0e391750bc67..5e62afa9f0447 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/SerDe.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/SerDe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStore.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStore.java
index 2df388443993f..95cec6718f588 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStore.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStoreContext.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStoreContext.java
index 6a0379f65d990..9d95089cf3ca7 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStoreContext.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/StateStoreContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowContext.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowContext.java
index e88721a2bf6b6..a733ddef6559a 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowContext.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowFunction.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowFunction.java
index 7aa3e4545408a..c5168db6a7227 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowFunction.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/WindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/package-info.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/package-info.java
index 311f80b4d8769..b88b41c700e1c 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/package-info.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Provides a simple model for enabling lightweight computation on Apache Pulsar.
  */
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/ByteBufferStateStore.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/ByteBufferStateStore.java
index 22c4a86ffeabb..8dbd7b322a5ee 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/ByteBufferStateStore.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/ByteBufferStateStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/CounterStateStore.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/CounterStateStore.java
index c90b0930fb725..5df2e37efb080 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/CounterStateStore.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/CounterStateStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/package-info.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/package-info.java
index ddcab42f46d7e..1dfb98b363058 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/package-info.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/state/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/FunctionRecord.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/FunctionRecord.java
index c7cb1a6480ad5..eac062ff015a4 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/FunctionRecord.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/FunctionRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/IdentityFunction.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/IdentityFunction.java
index a74b0e927853a..b010976dfcb0f 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/IdentityFunction.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/IdentityFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/JavaSerDe.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/JavaSerDe.java
index fec81fb68a574..c145179abb42b 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/JavaSerDe.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/JavaSerDe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/package-info.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/package-info.java
index 7374796b97de5..7835456877b29 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/package-info.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/utils/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java b/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java
index 29aacfe1f8ac9..164709869b7ba 100644
--- a/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java
+++ b/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AbstractSinkRecord.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AbstractSinkRecord.java
index 6758558d33111..d0e70d675140b 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AbstractSinkRecord.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AbstractSinkRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java
index a3461cc3e8b52..04226cf3a8f34 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
index 914275eb16379..d64c5f9b52db6 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/FunctionResultRouter.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/FunctionResultRouter.java
index 40a2b1cf24ab6..f6b4cd829b974 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/FunctionResultRouter.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/FunctionResultRouter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceCache.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceCache.java
index 93dd30325b00e..c9aea1148b17f 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceCache.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,11 +18,11 @@
  */
 package org.apache.pulsar.functions.instance;
 
-import io.netty.util.concurrent.DefaultThreadFactory;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import lombok.Getter;
+import org.apache.pulsar.client.util.ExecutorProvider;
 
 public class InstanceCache {
 
@@ -33,7 +33,7 @@ public class InstanceCache {
 
     private InstanceCache() {
         ThreadFactory namedThreadFactory =
-                new DefaultThreadFactory("function-timer-thread");
+                new ExecutorProvider.ExtendedThreadFactory("function-timer-thread");
         scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(namedThreadFactory);
     }
 
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java
index 3aefa6b2dca50..1a89505d9bb11 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
index 7eb21093d90fe..bec738af6c99d 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java
index ad1b8ac7254b6..7af238154d634 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
index 2c304e60e5853..292f52b5091b9 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
index 82745915aabec..fc377f0c5e2bb 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/LogAppender.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/LogAppender.java
index 2b1fc8038c72b..925f523385e5f 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/LogAppender.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/LogAppender.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/OutputRecordSinkRecord.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/OutputRecordSinkRecord.java
index dc109d47d56cb..905498c584502 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/OutputRecordSinkRecord.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/OutputRecordSinkRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkRecord.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkRecord.java
index ff07118eade57..0a8b60305aac9 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkRecord.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkSchemaInfoProvider.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkSchemaInfoProvider.java
index 1bd41f226d1a8..db955b9dd3d1c 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkSchemaInfoProvider.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/SinkSchemaInfoProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java
index 85e73d32a6c4a..abf17bdb1656d 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/package-info.java
index de45e9f4ab3df..c9e1a2afc0370 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/package-info.java
index c5ea737909dd9..c01fc4fc1d8ac 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreImpl.java
index c73e5941be234..df1eae9b6a7ab 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreProviderImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreProviderImpl.java
index e589ff7acd065..dbd0c8d2a0254 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreProviderImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/BKStateStoreProviderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/DefaultStateStore.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/DefaultStateStore.java
index 0f0d8adf6c948..e3f2a243d78cd 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/DefaultStateStore.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/DefaultStateStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/InstanceStateManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/InstanceStateManager.java
index 3bf92842f3b0d..af907bb63b5c2 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/InstanceStateManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/InstanceStateManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImpl.java
index d95023d68d257..50541c40ae973 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreProviderImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreProviderImpl.java
index 0fcc4c56b400a..0674398d1acda 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreProviderImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreProviderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateManager.java
index fddf92bf89e84..979c3a6991caf 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreContextImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreContextImpl.java
index b374a3f1825a3..fa624093417b9 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreContextImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreContextImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreProvider.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreProvider.java
index 4cfeed5645049..1602d8f5ba367 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreProvider.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/StateStoreProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/package-info.java
index 8a5e40bcd7a31..fd291403c74ec 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/state/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/ComponentStatsManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/ComponentStatsManager.java
index 35adcda950776..85d68531b5b9e 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/ComponentStatsManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/ComponentStatsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistry.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistry.java
index e3113519296cd..a29c88eb056c7 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistry.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistryImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistryImpl.java
index 4f9c3e5327b76..dae3e04ea63a1 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistryImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionCollectorRegistryImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionStatsManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionStatsManager.java
index c15262fb0f683..1bb46da947224 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionStatsManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/FunctionStatsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/PrometheusTextFormat.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/PrometheusTextFormat.java
index 47d24bea42514..efe818d1bc676 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/PrometheusTextFormat.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/PrometheusTextFormat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
index 10460dcc8b046..779a56cdf61be 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
index ad470aaa2ed9b..4470310c6c3f7 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/package-info.java
index ebe7e629232dd..829a9181286bc 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/package-info.java
index 3d0954f2b835f..7caae20a8f9cf 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
index cdd662bc75f97..41ec4d99e71b6 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
index 40a53c3f3708d..46dcaae1277d2 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkDisable.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkDisable.java
index 5d5c7ebf7bbeb..1ac6e827fb0c9 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkDisable.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkDisable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/package-info.java
index e159e801664c7..244be8f0cea63 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSource.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSource.java
index fd097413438ee..61f5bfacb35a7 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSource.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
index 8ae5799151bd2..60589b9ebb27b 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarFunctionRecord.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarFunctionRecord.java
index 7a27c0a5f384c..63228f353eb91 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarFunctionRecord.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarFunctionRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java
index cd8405e407d8d..ea54064aa4904 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
index 1fb76459e6024..eb67e635fcbd6 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConfig.java
index 212993ab758e4..5315702d7c0e4 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConsumerConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConsumerConfig.java
index a7b44984c5539..0d5465c225164 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConsumerConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSourceConsumerConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PushPulsarSource.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PushPulsarSource.java
index 2cc9d438ba8f3..3d4dc9e0ab4c3 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PushPulsarSource.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PushPulsarSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/RecordWithEncryptionContext.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/RecordWithEncryptionContext.java
index 58557c9150e09..4680e4d08ce35 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/RecordWithEncryptionContext.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/RecordWithEncryptionContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SerDeSchema.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SerDeSchema.java
index 88bb15ebda6b1..1e24ba19bdf93 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SerDeSchema.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SerDeSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSource.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSource.java
index 885277351b18d..3e60111ddbe4b 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSource.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
index 2eb6b89b62f94..420f6a26f8dce 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/TopicSchema.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/TopicSchema.java
index f3a1aaef94969..57f49fed0cac9 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/TopicSchema.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/TopicSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutor.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutor.java
index 3e09bb64237ad..52127ee3c521e 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutor.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/package-info.java
index 347d09eef2de2..c092dd86a4697 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/batch/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/package-info.java
index 2ee09d8b9e290..e83d57b177a08 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
index 4ab24208fa3c8..439722da63f78 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/DefaultEvictionContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java
index c9a12a14cc47f..46e08c8b05d2c 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Event.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
index 3bff60a22a89e..a1b96ceeae219 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EventImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
index 4f1ef79c07a28..00b337e1950c3 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
index 60d44fe4b083a..ef7de02d4d488 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/EvictionPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
index 66f83bca66abe..301da33355139 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TimestampExtractor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
index 558f5ee57f3cc..99ed5dad20e18 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
index 88a592cec2f13..2bc1652eebb5b 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/TriggerPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
index 20a976d9602b6..533ecdfc15f41 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
index 6e6ba539110ef..2f996b046b7d4 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WaterMarkEventGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java
index 5125c9e3d933d..9584a78d30449 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/Window.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
index 3a5f5dac8a180..a53b05252fd33 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowContextImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
index 9610912db3f1e..c6ca4e65d33c0 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
index de9f09cebe83d..de77898b1ce17 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
index 964bb3ae9f727..399ee7c4e867d 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowLifecycleListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
index 0dbc0d317a674..eb310bd1040e8 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
index b8ed23b8de941..d7ded514a3281 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
index 30fe17ade9a3b..7c5e03b175a6f 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/CountEvictionPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
index 853a679c0837e..0bae64e131f9b 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/TimeEvictionPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
index db41bde1e940d..174954d8116e0 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkCountEvictionPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
index 47e6d66a41fcd..8f71286dd87d6 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/WatermarkTimeEvictionPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/package-info.java
index f263b5fe03af7..9a89cb8eb5e27 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/evictors/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/package-info.java
index 0d49606d5385c..311f03e76c0b4 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
index 22d3702921405..76930eacfae75 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/CountTriggerPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
index 2dc6a5906bf8b..d46bac9dadced 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/TimeTriggerPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
index 586a0d231366e..d43108982c307 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkCountTriggerPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
index a2bfca689b0fd..42dfe0ad52026 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/WatermarkTimeTriggerPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/package-info.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/package-info.java
index 2adf7b8982c30..e8e3fd80712e6 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/package-info.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/triggers/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/main/python/python_instance.py b/pulsar-functions/instance/src/main/python/python_instance.py
index 46c01c2ddd4b2..f4ad66527e696 100755
--- a/pulsar-functions/instance/src/main/python/python_instance.py
+++ b/pulsar-functions/instance/src/main/python/python_instance.py
@@ -136,6 +136,10 @@ def run(self):
     if self.instance_config.function_details.source.subscriptionType == Function_pb2.SubscriptionType.Value("FAILOVER"):
       mode = pulsar._pulsar.ConsumerType.Failover
 
+    position = pulsar._pulsar.InitialPosition.Latest
+    if self.instance_config.function_details.source.subscriptionPosition == Function_pb2.SubscriptionPosition.Value("EARLIEST"):
+      position = pulsar._pulsar.InitialPosition.Earliest
+
     subscription_name = self.instance_config.function_details.source.subscriptionName    
 
     if not (subscription_name and subscription_name.strip()):
@@ -162,6 +166,7 @@ def run(self):
         consumer_type=mode,
         message_listener=partial(self.message_listener, self.input_serdes[topic]),
         unacked_messages_timeout_ms=int(self.timeout_ms) if self.timeout_ms else None,
+        initial_position=position,
         properties=properties
       )
 
@@ -177,6 +182,7 @@ def run(self):
         "consumer_type": mode,
         "message_listener": partial(self.message_listener, self.input_serdes[topic]),
         "unacked_messages_timeout_ms": int(self.timeout_ms) if self.timeout_ms else None,
+        "initial_position": position,
         "properties": properties
       }
       if consumer_conf.HasField("receiverQueueSize"):
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java
index 8f28ce40105ec..e0ebb52da7490 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/FunctionResultRouterTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/FunctionResultRouterTest.java
index 393931df0f0ce..df36ed6303b67 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/FunctionResultRouterTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/FunctionResultRouterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/InstanceUtilsTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/InstanceUtilsTest.java
index f5223a5f4b01a..46c7624c47168 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/InstanceUtilsTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/InstanceUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java
index 0f8385fc6fa76..a36a3ca62d178 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceTest.java
index 1d412644d056c..efe80922dfa8c 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/SinkRecordTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/SinkRecordTest.java
index 19c2b2e612252..7ee55020a4d7a 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/SinkRecordTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/SinkRecordTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/BKStateStoreImplTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/BKStateStoreImplTest.java
index 08b9b0268ba4a..1d35f3dfe5be1 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/BKStateStoreImplTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/BKStateStoreImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/InstanceStateManagerTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/InstanceStateManagerTest.java
index 4f7899504d7be..c56c2e32fd330 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/InstanceStateManagerTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/InstanceStateManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImplTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImplTest.java
index 8984808bd2cd3..3b8cb02c3bb26 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImplTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
index 93104c5eee265..fdac39512cc24 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/sink/PulsarSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarFunctionRecordTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarFunctionRecordTest.java
index f4f857354e85f..47690da091275 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarFunctionRecordTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarFunctionRecordTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarSourceTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarSourceTest.java
index d7c0a8d818a11..91e4c06fe5b49 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarSourceTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/PulsarSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/TopicSchemaTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/TopicSchemaTest.java
index 26ae6c8489354..506ef67ab0740 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/TopicSchemaTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/TopicSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutorTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutorTest.java
index 4432a0f2e7e25..cca1de5d158d4 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutorTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/source/batch/BatchSourceExecutorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
index 3cb33fc02a6b4..ce3109b852ec2 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WaterMarkEventGeneratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
index bf74824efed81..4d5afda6d2a90 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
index 1c31287f1e284..ee3ce96ff4071 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/windowing/WindowManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AddWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AddWindowFunction.java
index 72b29e2caa104..e152adb0f9f48 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AddWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AddWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AsyncContextFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AsyncContextFunction.java
index bee259258bbb6..fb7305b70c13b 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AsyncContextFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AsyncContextFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AutoSchemaFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AutoSchemaFunction.java
index 03abc93e3772d..1ee72b7b0746d 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AutoSchemaFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AutoSchemaFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AvroSchemaTestFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AvroSchemaTestFunction.java
index e81dc5f15a66c..63399b8bada4e 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AvroSchemaTestFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/AvroSchemaTestFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ByteBufferSerDe.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ByteBufferSerDe.java
index 7ba30aa08ed5c..e263089f7127f 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ByteBufferSerDe.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ByteBufferSerDe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CommaWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CommaWindowFunction.java
index c966fae510d30..13c2a9af20e61 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CommaWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CommaWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConfigBasedAppendFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConfigBasedAppendFunction.java
index b815b624f898d..f64c4fd975e59 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConfigBasedAppendFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConfigBasedAppendFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConsistentlyFailingFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConsistentlyFailingFunction.java
index 792a5741ca950..9df193abe9dfa 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConsistentlyFailingFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ConsistentlyFailingFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ContextFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ContextFunction.java
index dac6442812e18..26bc56053e512 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ContextFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ContextFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CursorManagementFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CursorManagementFunction.java
index 07443e217193b..27d1189f91644 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CursorManagementFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CursorManagementFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseObject.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseObject.java
index 61028879fe735..2540cf9f83730 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseObject.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseObject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseSerde.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseSerde.java
index 026f03f3dd065..4c0ccc28bff54 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseSerde.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseSerde.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToBaseFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToBaseFunction.java
index f482fd63d89d1..78cc5947c27a5 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToBaseFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToBaseFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToDerivedFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToDerivedFunction.java
index 86c813ba80363..b118ff9d1f6e7 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToDerivedFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomBaseToDerivedFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedObject.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedObject.java
index d70023133ffcc..f6014820348cd 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedObject.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedObject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedSerde.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedSerde.java
index 72ef80b48f165..65e789dc377f9 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedSerde.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedSerde.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToBaseFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToBaseFunction.java
index 8bcb0d028d546..48c4e6a2ce107 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToBaseFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToBaseFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToDerivedFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToDerivedFunction.java
index 39379106b0fc2..9c0b4097f5dca 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToDerivedFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomDerivedToDerivedFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomObjectFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomObjectFunction.java
index d1df6ba9a223a..edd888bee6e00 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomObjectFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/CustomObjectFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java
index c2af6e5278f24..3f0fa2ff8acee 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/HostAppenderFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/HostAppenderFunction.java
index 9893c53a91891..7f021fd04767e 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/HostAppenderFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/HostAppenderFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InitializableFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InitializableFunction.java
index 8a85b76ba6bc7..7f8ac34169000 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InitializableFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InitializableFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InstanceIdAppenderFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InstanceIdAppenderFunction.java
index e7127eddcde44..174f689ae7726 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InstanceIdAppenderFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/InstanceIdAppenderFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/IntegerAdditionFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/IntegerAdditionFunction.java
index 78c8bc77bd6e2..a80eac05eb193 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/IntegerAdditionFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/IntegerAdditionFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeAsyncExclamationFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeAsyncExclamationFunction.java
index 7cad46be98c05..5a6c8ecfe6235 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeAsyncExclamationFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeAsyncExclamationFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java
index f09a43688dd4c..dc497c0e2f11d 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/LoggingFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/LoggingFunction.java
index 9f6e775a32ac6..4ac68067ef186 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/LoggingFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/LoggingFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/MergeTopicFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/MergeTopicFunction.java
index ea1784656b33d..c225a9a6c2f00 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/MergeTopicFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/MergeTopicFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java
index 5d59cb9f8ca2e..b824ab4e1a8ec 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RawFileKeyReader.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RawFileKeyReader.java
index 16afa159bf059..ab5aa09a2bbe2 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RawFileKeyReader.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RawFileKeyReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RecordFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RecordFunction.java
index 55adf848da570..e4b4a931ad14e 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RecordFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/RecordFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/TypedMessageBuilderPublish.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/TypedMessageBuilderPublish.java
index 50a413cae8249..624963b491fa9 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/TypedMessageBuilderPublish.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/TypedMessageBuilderPublish.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java
index c7bd2e5aa0650..db1cbe6eb88b4 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserExceptionFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserExceptionFunction.java
index 2979d22f02f3b..44fb81d2899e3 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserExceptionFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserExceptionFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java
index c81cadbfa24ee..a8c8f531944da 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserPublishFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserPublishFunction.java
index f178fc279c261..ee26c5b4a2d8f 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserPublishFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserPublishFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/VoidFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/VoidFunction.java
index 6a502f1eb8e56..fe2b72dcf34a6 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/VoidFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/VoidFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WindowDurationFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WindowDurationFunction.java
index 105815f5b42df..ba7ff511d07f9 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WindowDurationFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WindowDurationFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java
index 0657086368d36..70b752816a51d 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/package-info.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/package-info.java
index 38cb67709cee2..6b2d1598d8244 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/package-info.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.api.examples;
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/AvroTestObject.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/AvroTestObject.java
index dea4f5903f959..4967dbac9dae4 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/AvroTestObject.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/AvroTestObject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java
index 23d6d5a8554a5..7d6bd02907b49 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Users.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Users.java
index 15225133eb0ae..3cb556dad24ff 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Users.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Users.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/package-info.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/package-info.java
index bd5d4269e4a93..7bebc612a0cdc 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/package-info.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.api.examples.pojo;
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObject.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObject.java
index 1fca88797c90c..bc31b5c1292cb 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObject.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObjectSerde.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObjectSerde.java
index 16c011fb352d8..3c7a6edfbc179 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObjectSerde.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/CustomObjectSerde.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/package-info.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/package-info.java
index 63278d28937bd..95edb4ce1584d 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/package-info.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/serde/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.api.examples.serde;
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/ContextWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/ContextWindowFunction.java
index 6a2bdfeb3cd42..2654070178329 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/ContextWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/ContextWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/LoggingWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/LoggingWindowFunction.java
index 93397b8d225c5..e046dab8c68b0 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/LoggingWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/LoggingWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java
index bf44b1aee28d6..73d547a82db7a 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserConfigWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserConfigWindowFunction.java
index 98bf08f59f8c0..87fea6295ef10 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserConfigWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserConfigWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java
index d83320031d03d..d6982959964c5 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserMetricWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserMetricWindowFunction.java
index dca456b319105..bd3008ea6d7ef 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserMetricWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserMetricWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java
index 3e79c2457a61a..451a272c6a900 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/package-info.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/package-info.java
index 80b19a16acbee..bad83e811e0d1 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/package-info.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.api.examples.window;
diff --git a/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/LocalRunner.java b/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/LocalRunner.java
index ae38b8cd6523b..370dee271c6b9 100644
--- a/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/LocalRunner.java
+++ b/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/LocalRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/package-info.java b/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/package-info.java
index 54c9f840ea339..7caae20a8f9cf 100644
--- a/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/package-info.java
+++ b/pulsar-functions/localrun/src/main/java/org/apache/pulsar/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions;
diff --git a/pulsar-functions/proto/src/test/java/org/apache/pulsar/functions/proto/FunctionDetailsTest.java b/pulsar-functions/proto/src/test/java/org/apache/pulsar/functions/proto/FunctionDetailsTest.java
index 31551ef726f1b..c4208c7a4c512 100644
--- a/pulsar-functions/proto/src/test/java/org/apache/pulsar/functions/proto/FunctionDetailsTest.java
+++ b/pulsar-functions/proto/src/test/java/org/apache/pulsar/functions/proto/FunctionDetailsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime-all/pom.xml b/pulsar-functions/runtime-all/pom.xml
index e53f7aa6c2c33..bf0b3d36eb143 100644
--- a/pulsar-functions/runtime-all/pom.xml
+++ b/pulsar-functions/runtime-all/pom.xml
@@ -42,6 +42,7 @@
     6. log4j-api
     7. log4j-core
     8. AVRO
+    9. protobuf-java
   -->
 
   pulsar-functions-runtime-all
diff --git a/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceMain.java b/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceMain.java
index 2dfabae2164da..6fb7ff2606b6d 100644
--- a/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceMain.java
+++ b/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceMain.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/package-info.java b/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/package-info.java
index 7e71e9096dcec..f34b914e66d05 100644
--- a/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/package-info.java
+++ b/pulsar-functions/runtime-all/src/main/java/org/apache/pulsar/functions/instance/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.instance;
diff --git a/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java b/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java
index 6f4ee68c8a26d..854c146893243 100644
--- a/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java
+++ b/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.instance;
 
 import lombok.Cleanup;
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProvider.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProvider.java
index c58c40fddc96c..2e95e48489f26 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProvider.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthData.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthData.java
index 5d42e12a6fa22..149d05e5196fc 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthData.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthProvider.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthProvider.java
index 9a4749fa49fa2..bb900e4143af0 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthProvider.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthUtils.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthUtils.java
index 18d8d3ad3c200..6a19596cf97ae 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthUtils.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/FunctionAuthUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesFunctionAuthProvider.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesFunctionAuthProvider.java
index 1a29b3749d041..29365424f547f 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesFunctionAuthProvider.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesFunctionAuthProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
index 253874349fbe9..1053e6e170ef1 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/package-info.java
index 4b806e244c75f..2dd125ed8b4d8 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/auth/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions enables lightweight computation in Apache Pulsar.
  */
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/package-info.java
index f265fd2125fb3..5e9d989247719 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions enables lightweight computation in Apache Pulsar.
  */
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceStarter.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceStarter.java
index 3978e0f34fd5d..deff690815d9c 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceStarter.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceStarter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,8 @@
  */
 package org.apache.pulsar.functions.runtime;
 
+import static org.apache.pulsar.functions.utils.FunctionCommon.getSinkType;
+import static org.apache.pulsar.functions.utils.FunctionCommon.getSourceType;
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.converters.StringConverter;
@@ -37,6 +39,7 @@
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pulsar.common.functions.WindowConfig;
 import org.apache.pulsar.common.nar.NarClassLoader;
 import org.apache.pulsar.common.util.Reflections;
 import org.apache.pulsar.functions.instance.AuthenticationConfig;
@@ -49,6 +52,7 @@
 import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactory;
 import org.apache.pulsar.functions.secretsprovider.ClearTextSecretsProvider;
 import org.apache.pulsar.functions.secretsprovider.SecretsProvider;
+import org.apache.pulsar.functions.utils.FunctionCommon;
 
 
 @Slf4j
@@ -181,6 +185,7 @@ public void start(String[] args, ClassLoader functionInstanceClassLoader, ClassL
             functionDetailsJsonString = functionDetailsJsonString.substring(0, functionDetailsJsonString.length() - 1);
         }
         JsonFormat.parser().merge(functionDetailsJsonString, functionDetailsBuilder);
+        inferringMissingTypeClassName(functionDetailsBuilder, functionInstanceClassLoader);
         Function.FunctionDetails functionDetails = functionDetailsBuilder.build();
         instanceConfig.setFunctionDetails(functionDetails);
         instanceConfig.setPort(port);
@@ -259,16 +264,16 @@ public void start(String[] args, ClassLoader functionInstanceClassLoader, ClassL
         if (expectedHealthCheckInterval > 0) {
             healthCheckTimer =
                     InstanceCache.getInstanceCache().getScheduledExecutorService().scheduleAtFixedRate(() -> {
-                try {
-                    if (System.currentTimeMillis() - lastHealthCheckTs
-                            > 3 * expectedHealthCheckInterval * 1000) {
-                        log.info("Haven't received health check from spawner in a while. Stopping instance...");
-                        close();
-                    }
-                } catch (Exception e) {
-                    log.error("Error occurred when checking for latest health check", e);
-                }
-            }, expectedHealthCheckInterval * 1000, expectedHealthCheckInterval * 1000, TimeUnit.MILLISECONDS);
+                        try {
+                            if (System.currentTimeMillis() - lastHealthCheckTs
+                                    > 3 * expectedHealthCheckInterval * 1000) {
+                                log.info("Haven't received health check from spawner in a while. Stopping instance...");
+                                close();
+                            }
+                        } catch (Exception e) {
+                            log.error("Error occurred when checking for latest health check", e);
+                        }
+                    }, expectedHealthCheckInterval * 1000, expectedHealthCheckInterval * 1000, TimeUnit.MILLISECONDS);
         }
 
         runtimeSpawner.join();
@@ -306,6 +311,84 @@ public void close() {
         }
     }
 
+    private void inferringMissingTypeClassName(Function.FunctionDetails.Builder functionDetailsBuilder,
+                                               ClassLoader classLoader) throws ClassNotFoundException {
+        switch (functionDetailsBuilder.getComponentType()) {
+            case FUNCTION:
+                if ((functionDetailsBuilder.hasSource()
+                        && functionDetailsBuilder.getSource().getTypeClassName().isEmpty())
+                        || (functionDetailsBuilder.hasSink()
+                        && functionDetailsBuilder.getSink().getTypeClassName().isEmpty())) {
+                    Map userConfigs = new Gson().fromJson(functionDetailsBuilder.getUserConfig(),
+                            new TypeToken>() {
+                            }.getType());
+                    boolean isWindowConfigPresent = userConfigs.containsKey(WindowConfig.WINDOW_CONFIG_KEY);
+                    String className = functionDetailsBuilder.getClassName();
+                    if (isWindowConfigPresent) {
+                        WindowConfig windowConfig = new Gson().fromJson(
+                                (new Gson().toJson(userConfigs.get(WindowConfig.WINDOW_CONFIG_KEY))),
+                                WindowConfig.class);
+                        className = windowConfig.getActualWindowFunctionClassName();
+                    }
+
+                    Class[] typeArgs = FunctionCommon.getFunctionTypes(classLoader.loadClass(className),
+                            isWindowConfigPresent);
+                    if (functionDetailsBuilder.hasSource()
+                            && functionDetailsBuilder.getSource().getTypeClassName().isEmpty()
+                            && typeArgs[0] != null) {
+                        Function.SourceSpec.Builder sourceBuilder = functionDetailsBuilder.getSource().toBuilder();
+                        sourceBuilder.setTypeClassName(typeArgs[0].getName());
+                        functionDetailsBuilder.setSource(sourceBuilder.build());
+                    }
+
+                    if (functionDetailsBuilder.hasSink()
+                            && functionDetailsBuilder.getSink().getTypeClassName().isEmpty()
+                            && typeArgs[1] != null) {
+                        Function.SinkSpec.Builder sinkBuilder = functionDetailsBuilder.getSink().toBuilder();
+                        sinkBuilder.setTypeClassName(typeArgs[1].getName());
+                        functionDetailsBuilder.setSink(sinkBuilder.build());
+                    }
+                }
+                break;
+            case SINK:
+                if ((functionDetailsBuilder.hasSink()
+                        && functionDetailsBuilder.getSink().getTypeClassName().isEmpty())) {
+                    String typeArg = getSinkType(functionDetailsBuilder.getClassName(), classLoader).getName();
+
+                    Function.SinkSpec.Builder sinkBuilder =
+                            Function.SinkSpec.newBuilder(functionDetailsBuilder.getSink());
+                    sinkBuilder.setTypeClassName(typeArg);
+                    functionDetailsBuilder.setSink(sinkBuilder);
+
+                    Function.SourceSpec sourceSpec = functionDetailsBuilder.getSource();
+                    if (null == sourceSpec || StringUtils.isEmpty(sourceSpec.getTypeClassName())) {
+                        Function.SourceSpec.Builder sourceBuilder = Function.SourceSpec.newBuilder(sourceSpec);
+                        sourceBuilder.setTypeClassName(typeArg);
+                        functionDetailsBuilder.setSource(sourceBuilder);
+                    }
+                }
+                break;
+            case SOURCE:
+                if ((functionDetailsBuilder.hasSource()
+                        && functionDetailsBuilder.getSource().getTypeClassName().isEmpty())) {
+                    String typeArg = getSourceType(functionDetailsBuilder.getClassName(), classLoader).getName();
+
+                    Function.SourceSpec.Builder sourceBuilder =
+                            Function.SourceSpec.newBuilder(functionDetailsBuilder.getSource());
+                    sourceBuilder.setTypeClassName(typeArg);
+                    functionDetailsBuilder.setSource(sourceBuilder);
+
+                    Function.SinkSpec sinkSpec = functionDetailsBuilder.getSink();
+                    if (null == sinkSpec || StringUtils.isEmpty(sinkSpec.getTypeClassName())) {
+                        Function.SinkSpec.Builder sinkBuilder = Function.SinkSpec.newBuilder(sinkSpec);
+                        sinkBuilder.setTypeClassName(typeArg);
+                        functionDetailsBuilder.setSink(sinkBuilder);
+                    }
+                }
+                break;
+        }
+    }
+
 
     class InstanceControlImpl extends InstanceControlGrpc.InstanceControlImplBase {
         private RuntimeSpawner runtimeSpawner;
@@ -331,8 +414,8 @@ public void getFunctionStatus(Empty request,
 
         @Override
         public void getAndResetMetrics(com.google.protobuf.Empty request,
-            io.grpc.stub.StreamObserver
-                    responseObserver) {
+                   io.grpc.stub.StreamObserver
+                   responseObserver) {
             Runtime runtime = runtimeSpawner.getRuntime();
             if (runtime != null) {
                 try {
@@ -348,8 +431,8 @@ public void getAndResetMetrics(com.google.protobuf.Empty request,
 
         @Override
         public void getMetrics(com.google.protobuf.Empty request,
-          io.grpc.stub.StreamObserver
-                  responseObserver) {
+                   io.grpc.stub.StreamObserver
+                   responseObserver) {
             Runtime runtime = runtimeSpawner.getRuntime();
             if (runtime != null) {
                 try {
@@ -380,8 +463,8 @@ public void resetMetrics(com.google.protobuf.Empty request,
 
         @Override
         public void healthCheck(com.google.protobuf.Empty request,
-         io.grpc.stub.StreamObserver
-                 responseObserver) {
+                io.grpc.stub.StreamObserver
+                responseObserver) {
             log.debug("Received health check request...");
             InstanceCommunication.HealthCheckResult healthCheckResult =
                     InstanceCommunication.HealthCheckResult.newBuilder().setSuccess(true).build();
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/Runtime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/Runtime.java
index 528deedc96e13..edb564e82af78 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/Runtime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/Runtime.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeCustomizer.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeCustomizer.java
index 989b5ad136c05..beffc870e6921 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeCustomizer.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeCustomizer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeFactory.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeFactory.java
index 0ee2c430a72b1..af33656106359 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeFactory.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeSpawner.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeSpawner.java
index 4f9e9b672cb55..1dc15bbc61c6c 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeSpawner.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeSpawner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java
index e5baa7ae9671a..a6a0fc6961c97 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizer.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizer.java
index 6fabb359b34e5..30d31a79497db 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizer.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesManifestCustomizer.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesManifestCustomizer.java
index 9a088e6a9c013..2df01c9e3540d 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesManifestCustomizer.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesManifestCustomizer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
index e6e85d66d0ecd..e206862b68a67 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.kubernetes;
 
 import static java.net.HttpURLConnection.HTTP_CONFLICT;
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
index 740d6cc0fdc4b..692884a303d58 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.kubernetes;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java
index d83c0a4a079e1..5cbca7b65bfd7 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/package-info.java
index beeaf0bcdad7c..2c33baea79c16 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions enables lightweight computation in Apache Pulsar.
  */
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/package-info.java
index c4a33d739ce5e..4e2f14a960f7a 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions Execution Runtime.
  */
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java
index 678296eeec05c..e59fcadc729ed 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactory.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactory.java
index 2324d0ee441f6..61d783ae4e1ff 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactory.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java
index b6db3084e1c44..2e02d03d8125f 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/package-info.java
index 7df6f72487cf0..5a348601c6345 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions enables lightweight computation in Apache Pulsar.
  */
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntime.java
index d1b536732090a..0aa0cd95aef09 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntime.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.thread;
 
 import java.io.File;
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactory.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactory.java
index 64ea2d0f17298..7bc055b25d6b9 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactory.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java
index 3b96bdbb8bfac..b31142f4b57fb 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/package-info.java
index abe478eb58998..73cabb10fd5c0 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions enables lightweight computation in Apache Pulsar.
  */
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/ConnectorsManager.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/ConnectorsManager.java
index 643afa4f26c3c..e1770b8b64415 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/ConnectorsManager.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/ConnectorsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/FunctionsManager.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/FunctionsManager.java
index 5937d09eaa0b8..9199d568cad03 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/FunctionsManager.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/FunctionsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
index e7630f7c46345..876f62bba2cc0 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/package-info.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/package-info.java
index 00bd46f540aff..78e26d148263d 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/package-info.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Pulsar Functions enables lightweight computation in Apache Pulsar.
  */
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProviderTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProviderTest.java
index 924653fec1189..78e0cbdb2b7ab 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProviderTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/ClearTextFunctionTokenAuthProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
index 38dd91426b46b..081e693b6a321 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/auth/KubernetesSecretsTokenAuthProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
index 343f3495a6743..51f2dc9f32b52 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/config/TestWorkerConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java
index f7cdf707d3219..27c2f2618278f 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/RuntimeUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizerTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizerTest.java
index 1b383061bda31..0f42755694288 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizerTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/BasicKubernetesManifestCustomizerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
index 2347f6e726c31..ab3cd268a8026 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.kubernetes;
 
 import io.kubernetes.client.openapi.apis.CoreV1Api;
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
index cf86623eafddb..9d9357c7a2990 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.kubernetes;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
index ea1d6bbc6293f..027c37d0aecfd 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.process;
 
 import static org.apache.pulsar.functions.runtime.RuntimeUtils.FUNCTIONS_INSTANCE_CLASSPATH;
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryTest.java
index e41c440dc85ab..d99a41471ee6a 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.runtime.thread;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/worker/WorkerApiV2ResourceConfigTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/worker/WorkerApiV2ResourceConfigTest.java
index 51dd4ab2928d9..281a690bcbf0e 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/worker/WorkerApiV2ResourceConfigTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/worker/WorkerApiV2ResourceConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/package-info.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/package-info.java
index 54c9f840ea339..7caae20a8f9cf 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/package-info.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions;
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProvider.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProvider.java
index 79aa58a3c1b47..df6acf4d02702 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProvider.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProvider.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProvider.java
index 9793b7ef74269..92db72a21eb82 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProvider.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/SecretsProvider.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/SecretsProvider.java
index 2ee0a3ff3194d..ac479d1cb1452 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/SecretsProvider.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/SecretsProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/package-info.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/package-info.java
index c7a6460bb6c04..24303e2dba4b7 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/package-info.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsprovider/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.secretsprovider;
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/DefaultSecretsProviderConfigurator.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/DefaultSecretsProviderConfigurator.java
index 0d956b1fedff2..02d9d00634e3a 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/DefaultSecretsProviderConfigurator.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/DefaultSecretsProviderConfigurator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfigurator.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfigurator.java
index 7c90f2759ea72..cb289c642d687 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfigurator.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfigurator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/NameAndConfigBasedSecretsProviderConfigurator.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/NameAndConfigBasedSecretsProviderConfigurator.java
index 2143c3a6ddbcd..e35814a359b7c 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/NameAndConfigBasedSecretsProviderConfigurator.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/NameAndConfigBasedSecretsProviderConfigurator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/SecretsProviderConfigurator.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/SecretsProviderConfigurator.java
index 9ebc940148053..75ee7c20a49ae 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/SecretsProviderConfigurator.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/SecretsProviderConfigurator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/package-info.java b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/package-info.java
index 849f35819c630..d0fc6eb61857d 100644
--- a/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/package-info.java
+++ b/pulsar-functions/secrets/src/main/java/org/apache/pulsar/functions/secretsproviderconfigurator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.secretsproviderconfigurator;
diff --git a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProviderTest.java b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProviderTest.java
index 5f579f8a78c18..f21623723d6b1 100644
--- a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProviderTest.java
+++ b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/ClearTextSecretsProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.secretsprovider;
 
 import static org.testng.Assert.assertEquals;
diff --git a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java
index ef4d41ee80cad..3cc0b693eb8f1 100644
--- a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java
+++ b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.secretsprovider;
 
 import static org.testng.Assert.assertEquals;
diff --git a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfiguratorTest.java b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfiguratorTest.java
index c2db339aead62..287205a8bbb83 100644
--- a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfiguratorTest.java
+++ b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsproviderconfigurator/KubernetesSecretsProviderConfiguratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.secretsproviderconfigurator;
 
 import com.google.gson.Gson;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Actions.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Actions.java
index 2446da6be3f3c..62b4530d9a0b1 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Actions.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Actions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ComponentTypeUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ComponentTypeUtils.java
index 240eb6335f59b..69aa845c5bc3a 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ComponentTypeUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ComponentTypeUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import org.apache.pulsar.functions.proto.Function.FunctionDetails;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/CryptoUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/CryptoUtils.java
index 6c80b22a29433..916ad31d34634 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/CryptoUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/CryptoUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Exceptions.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Exceptions.java
index c1e804c072103..442a3fce97de1 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Exceptions.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Exceptions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import java.io.IOException;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionCommon.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionCommon.java
index 54b23d5200beb..96f6f4708a7f1 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionCommon.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionCommon.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
index bcd56b1d25f38..f6a5da1177fc4 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionInstanceId.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionInstanceId.java
index d0bc207530b30..0fa5371b0488f 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionInstanceId.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionInstanceId.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtils.java
index 975a1996737f5..b1e13921ad172 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import org.apache.pulsar.functions.proto.Function;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ResourceConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ResourceConfigUtils.java
index 6d258479044b1..03e7efdac3a28 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ResourceConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ResourceConfigUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import org.apache.pulsar.common.functions.Resources;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
index 2a06339d00a15..8ef5665af2e07 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
index f8fc091aecef6..ccd35414f41b8 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java
index 9e9ee27dfebad..390671c5606af 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/WindowConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/WindowConfigUtils.java
index a3864724239ea..5f7a5b668af75 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/WindowConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/WindowConfigUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import org.apache.pulsar.common.functions.WindowConfig;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java
index 8da61300c7969..92285844ba203 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManager.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManager.java
index 58508eccb7984..88d2324d73b19 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManager.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils.functioncache;
 
 import java.io.IOException;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManagerImpl.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManagerImpl.java
index 787e015af5cb0..78e19ba4010c4 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManagerImpl.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheManagerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionClassLoaders.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionClassLoaders.java
index f2ad12d237f01..5891bc3510094 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionClassLoaders.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionClassLoaders.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils.functioncache;
 
 import java.net.URL;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/package-info.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/package-info.java
index 5bca86a27062d..cc07ce334fd99 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/package-info.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils.functioncache;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionArchive.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionArchive.java
index 8d621cc965f80..028b57d69c86b 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionArchive.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionArchive.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionUtils.java
index 8b70a4b650814..e5639da960b57 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/FunctionUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/package-info.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/package-info.java
index d7e7a42cc82d8..a006579e46552 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/package-info.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils.functions;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/Connector.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/Connector.java
index e2e6e39e273ff..f1a03f4424ec6 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/Connector.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/Connector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/ConnectorUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/ConnectorUtils.java
index a1835856f0b37..08e650a1308c1 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/ConnectorUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/ConnectorUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/package-info.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/package-info.java
index 94a12fb0af0ef..d0fefe996bee9 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/package-info.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/io/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils.io;
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/package-info.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/package-info.java
index c45cbae913eca..1d74642e3257f 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/package-info.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,5 +16,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ActionsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ActionsTest.java
index 03b3a102d8f39..fccee8e1a2d62 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ActionsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ActionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ExceptionsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ExceptionsTest.java
index f08c1435879e6..4bd71bc8e8182 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ExceptionsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/ExceptionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import static org.apache.pulsar.functions.utils.Exceptions.rethrowIOException;
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionCommonTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionCommonTest.java
index b991f8b4f473c..aae2292752005 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionCommonTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionCommonTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import java.util.Collection;
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
index 389da88e583d8..4ba5138f7c6b9 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionInstanceIdTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionInstanceIdTest.java
index 8fd9e63de75d4..b08ab096fc79b 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionInstanceIdTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionInstanceIdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtilsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtilsTest.java
index 4e09c05a3244b..41b3b85aec4b3 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtilsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionMetaDataUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import org.apache.pulsar.functions.proto.Function;
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
index 4f316cac7c7d6..676f452a84335 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
index 111065214d94b..63485d7993fad 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/WindowConfigUtilsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/WindowConfigUtilsTest.java
index 44d36ffbde977..9ddb649f0acdc 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/WindowConfigUtilsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/WindowConfigUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.utils;
 
 import org.apache.pulsar.common.functions.WindowConfig;
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinator.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinator.java
index b020a729d8af1..e01b5bc6943be 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinator.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.worker;
 
 import static org.apache.pulsar.common.util.Runnables.catchingAndLoggingThrowables;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
@@ -31,6 +29,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.util.ExecutorProvider;
 
 @Slf4j
 public class ClusterServiceCoordinator implements AutoCloseable {
@@ -55,7 +54,7 @@ public TimerTaskInfo(long interval, Runnable task) {
 
     public ClusterServiceCoordinator(String workerId, LeaderService leaderService, Supplier isLeader) {
         this(workerId, leaderService, isLeader, Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder().setNameFormat("cluster-service-coordinator-timer").build()));
+                new ExecutorProvider.ExtendedThreadFactory("cluster-service-coordinator-timer")));
     }
 
     @VisibleForTesting
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifier.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifier.java
index 5f60818c1d608..a1885899460d5 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifier.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierImpl.java
index f0bedf7e56b1a..0fda0fbeb54ab 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierShutdownServiceImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierShutdownServiceImpl.java
index 491d5eb78cbdc..c7134d98a00a1 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierShutdownServiceImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/ErrorNotifierShutdownServiceImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.worker;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
index a4f8532dbc60b..bd8e429700379 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailer.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailer.java
index 2d7ad712a859a..f33a5d22ab3b8 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailer.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataManager.java
index aee2157aedb28..944b4e8e34491 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataManager.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailer.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailer.java
index cf0b9943f5bec..a3699ab87e769 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailer.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java
index ca4e2b064b711..fbd36c23add90 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java
index c05ffe9ca8ca1..b8b035a1435e3 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionWorkerStarter.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionWorkerStarter.java
index 5bd6fd931ea12..5869bbce4fe9a 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionWorkerStarter.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionWorkerStarter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionsStatsGenerator.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionsStatsGenerator.java
index 37d93812d54c9..e4f386a0ce40a 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionsStatsGenerator.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionsStatsGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/LeaderService.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/LeaderService.java
index 132441b1be282..7f035b5562f24 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/LeaderService.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/LeaderService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java
index 55484b62e9075..d4839bd17467a 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MetricsGenerator.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MetricsGenerator.java
index e61328ad711f0..971b724401aef 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MetricsGenerator.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MetricsGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/PulsarWorkerService.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/PulsarWorkerService.java
index 307e63262afb5..e0990abe73b9a 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/PulsarWorkerService.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/PulsarWorkerService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java
index 1f4b7852fe2f0..c378b1494e1e5 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
index d4d4873737d69..03a040369999f 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Worker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerService.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerService.java
index ff3e8b6f5061c..3bc35c0bc6ec8 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerService.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerStatsManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerStatsManager.java
index c9b7c1da8db44..d746f867d8ece 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerStatsManager.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerStatsManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.functions.worker;
 
 import static org.apache.pulsar.common.stats.JvmMetrics.getJvmDirectMemoryUsed;
@@ -329,7 +328,8 @@ private void writeMetric(String metricName, long value, StringWriter stream) {
     stream.write("# TYPE ");
     stream.write(PULSAR_FUNCTION_WORKER_METRICS_PREFIX);
     stream.write(metricName);
-    stream.write(" gauge \n");
+    stream.write(" gauge");
+    stream.write("\n");
 
     stream.write(PULSAR_FUNCTION_WORKER_METRICS_PREFIX);
     stream.write(metricName);
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java
index b59765d209370..415c278f25c4b 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLInputStream.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLInputStream.java
index 2137f4db4e76f..f009f57d1aed3 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLInputStream.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLOutputStream.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLOutputStream.java
index 67d020d7533d9..ae1ebaf84d209 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLOutputStream.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/DLOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/package-info.java
index 4bd11c02f1115..f10ce793befcb 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/dlog/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/package-info.java
index 9f2bbce7e1b15..dfa32ff30f3d7 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/ConfigurationResource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/ConfigurationResource.java
index f139544823169..830ab027a79cc 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/ConfigurationResource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/ConfigurationResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/FunctionApiResource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/FunctionApiResource.java
index ce2fa77e836ea..d37f7f15c606e 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/FunctionApiResource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/FunctionApiResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/Resources.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/Resources.java
index 1192d0cf88e14..d98ae68d9666b 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/Resources.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/Resources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/RestUtils.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/RestUtils.java
index 99843754372f9..519063a6981bc 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/RestUtils.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/RestUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerReadinessResource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerReadinessResource.java
index eac6eb40b1084..36fb89d6606aa 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerReadinessResource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerReadinessResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
index e913db0ae797d..2b3ea30121015 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/WorkerServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
index 95c9d70058d3b..0b6c2bbd61f55 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/ComponentImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -524,21 +524,13 @@ private void deleteComponentFromStorage(String tenant, String namespace, String
                                             String functionPackagePath) {
         if (!functionPackagePath.startsWith(Utils.HTTP)
                 && !functionPackagePath.startsWith(Utils.FILE)
-                && !functionPackagePath.startsWith(Utils.BUILTIN)) {
-            if (worker().getWorkerConfig().isFunctionsWorkerEnablePackageManagement()) {
-                try {
-                    worker().getBrokerAdmin().packages().delete(functionPackagePath);
-                } catch (PulsarAdminException e) {
-                    log.error("{}/{}/{} Failed to cleanup package in package management with url {}", tenant,
-                            namespace, componentName, functionPackagePath, e);
-                }
-            } else {
-                try {
-                    WorkerUtils.deleteFromBookkeeper(worker().getDlogNamespace(), functionPackagePath);
-                } catch (IOException e) {
-                    log.error("{}/{}/{} Failed to cleanup package in BK with path {}", tenant, namespace, componentName,
-                            functionPackagePath, e);
-                }
+                && !functionPackagePath.startsWith(Utils.BUILTIN)
+                && !worker().getWorkerConfig().isFunctionsWorkerEnablePackageManagement()) {
+            try {
+                WorkerUtils.deleteFromBookkeeper(worker().getDlogNamespace(), functionPackagePath);
+            } catch (IOException e) {
+                log.error("{}/{}/{} Failed to cleanup package in BK with path {}", tenant, namespace, componentName,
+                        functionPackagePath, e);
             }
 
         }
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
index 799de49d3cc63..b7883e14c91e8 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplV2.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplV2.java
index 2570bf3ee867a..7b7f84aa82823 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplV2.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplV2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsMetricsResource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsMetricsResource.java
index f8ee8f6444f90..e48169d122f62 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsMetricsResource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsMetricsResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java
index 80454ee890160..fff376c5dcca1 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SourcesImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SourcesImpl.java
index 44199dd9917fa..2c5921bf7ea9d 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SourcesImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SourcesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java
index 0569e5a4d55cb..364c3ec1ab104 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/package-info.java
index 4dbb7c0dbc06e..ec6e16ba9c582 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java
index afb95c1fab481..9176013b783f6 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerApiV2Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerApiV2Resource.java
index 932ee07bff028..496f6f43028fe 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerApiV2Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerApiV2Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerStatsApiV2Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerStatsApiV2Resource.java
index ef96e180670ca..b6a7914f0fdfd 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerStatsApiV2Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/WorkerStatsApiV2Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/package-info.java
index 02a0dac3c6233..a16e9b41acf33 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java
index 092844db489dd..bca0cf4bf3d75 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3Resource.java
index 622dd15cd79a7..4f91208f14320 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java
index 99a39f2496d63..b110c8f72c677 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3Resource.java
index c72498f084aae..47c7c5aad6fdc 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java
index 49bcb57b5c974..a669d4f089dd0 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/package-info.java
index c3bee89057a16..fe927ee8fb55d 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/package-info.java
index b92227143c008..d7b1f7752bc7a 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/IScheduler.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/IScheduler.java
index dec216c7701b2..5454bdf48d505 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/IScheduler.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/IScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinScheduler.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinScheduler.java
index 8cf905f7a83fe..b19036e9412ac 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinScheduler.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/package-info.java
index ae7e568f3edc5..78d61aecdc3e5 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/scheduler/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceDefinition.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceDefinition.java
index 497f7bdd8709d..fb04458213703 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceDefinition.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java
index 89f3c7ef72be6..5b235a328d676 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceMetadata.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceMetadata.java
index 6a44cb4dd273c..97a76fc53b045 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceMetadata.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceWithClassLoader.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceWithClassLoader.java
index 6959616ce3d7d..18b56ef269c69 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceWithClassLoader.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/WorkerServiceWithClassLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Component.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Component.java
index db315f1181e81..fc01ec55b6c4c 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Component.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Component.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Functions.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Functions.java
index e63cb59147576..954ab1d26182f 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Functions.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Functions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/FunctionsV2.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/FunctionsV2.java
index a3f53c338de08..6a4be7cdf6f0e 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/FunctionsV2.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/FunctionsV2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sinks.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sinks.java
index d97a2856cd2c6..2c0dcb82e0dbc 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sinks.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sinks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sources.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sources.java
index 089115228b2d9..781a25e92cc87 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sources.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Sources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Workers.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Workers.java
index 2045e4b2af656..a13157ea6476c 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Workers.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/Workers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/package-info.java
index 9195251f2322f..601e94e0193a5 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/package-info.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/package-info.java
index f8dfc2b0cfc9b..b148142d83fcc 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/package-info.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/service/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinatorTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinatorTest.java
index afd8314615f74..561b52076d72c 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinatorTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/ClusterServiceCoordinatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionActionerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionActionerTest.java
index 2412aebc294b2..e84bf85d6c74b 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionActionerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionActionerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailerTest.java
index a64d451628dda..e8d991d6e4b92 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionAssignmentTailerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataManagerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataManagerTest.java
index 4fd6f85c4aff6..8c0a0595a17e5 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataManagerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java
index 713bfc41cb8e1..626cede140dea 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionRuntimeManagerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionRuntimeManagerTest.java
index 61237cdf481ea..d538458dbae04 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionRuntimeManagerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionRuntimeManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionWorkerStarterTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionWorkerStarterTest.java
index b0529430b97d1..51bcd974f509a 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionWorkerStarterTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionWorkerStarterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/LeaderServiceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/LeaderServiceTest.java
index e8313306b4c89..dc8fd81034c4d 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/LeaderServiceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/LeaderServiceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java
index 486ff95e17c15..86c518910258c 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java
index 0d2f1bda95270..67590e81e128e 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
index e504b2b6da0a5..c5e6b4aaded74 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLInputStreamTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLInputStreamTest.java
index a1f1688b5e614..c78cce45d6f88 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLInputStreamTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLInputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLOutputStreamTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLOutputStreamTest.java
index 7e86da7972c07..ebcaf37389f81 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLOutputStreamTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/dlog/DLOutputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClock.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClock.java
index 621cba1db3503..7c2076a521fe8 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClock.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClockTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClockTest.java
index d643a2b67a6c9..eab84d0c71d89 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClockTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockClockTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java
index ee86317744162..2cd877041d6fc 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorControllerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorControllerTest.java
index aaeb825f51304..6f9c0004c0796 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorControllerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorControllerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java
index 7ffebcb3216f8..998d85683e204 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/PulsarFunctionTestTemporaryDirectory.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/PulsarFunctionTestTemporaryDirectory.java
index 5f403ddfd84a4..b4dd1e6d503e7 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/PulsarFunctionTestTemporaryDirectory.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/PulsarFunctionTestTemporaryDirectory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
index 420b7c113cad5..80b626165a5d8 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java
index d8dc9a063c4d1..c34b26180f876 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java
index 05073b9732e2f..9f0de2a12e091 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SinkApiV3ResourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java
index 2be82945afe05..85d80edeff90b 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/SourceApiV3ResourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinSchedulerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinSchedulerTest.java
index b592a5f2da255..e3cf0ed5413cd 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinSchedulerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/scheduler/RoundRobinSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
index f177a7ca18f78..a0cc2809239ed 100644
--- a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
+++ b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.aerospike;
 
 import com.aerospike.client.AerospikeClient;
diff --git a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeSinkConfig.java b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeSinkConfig.java
index facfea8717a22..79ce5a40d4497 100644
--- a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeSinkConfig.java
+++ b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.aerospike;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
index 7a6f1ee2aa895..93a081e48f513 100644
--- a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
+++ b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.aerospike;
 
 import java.nio.charset.StandardCharsets;
diff --git a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/package-info.java b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/package-info.java
index 24264fc49862d..b4b597024d2dc 100644
--- a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/package-info.java
+++ b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AbstractAwsConnector.java b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AbstractAwsConnector.java
index d5f6284b17bc6..82d044637f0b5 100644
--- a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AbstractAwsConnector.java
+++ b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AbstractAwsConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsCredentialProviderPlugin.java b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsCredentialProviderPlugin.java
index 36cec76a28878..4ba299eb27936 100644
--- a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsCredentialProviderPlugin.java
+++ b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsCredentialProviderPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.aws;
 
 import com.amazonaws.auth.AWSCredentials;
diff --git a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsDefaultProviderChainPlugin.java b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsDefaultProviderChainPlugin.java
index a7444e46cce6f..48a2646cabb8a 100644
--- a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsDefaultProviderChainPlugin.java
+++ b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsDefaultProviderChainPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/STSAssumeRoleProviderPlugin.java b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/STSAssumeRoleProviderPlugin.java
index 024ba06cb278c..efb5f394c0c2e 100644
--- a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/STSAssumeRoleProviderPlugin.java
+++ b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/STSAssumeRoleProviderPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/package-info.java b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/package-info.java
index e784ff5b9d007..151c6a3ebbc37 100644
--- a/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/package-info.java
+++ b/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPrintSink.java b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPrintSink.java
index 3cf8877c0135e..4e859f7ff6934 100644
--- a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPrintSink.java
+++ b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPrintSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPushSource.java b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPushSource.java
index de4654e5f5f3c..ed610ea10781d 100644
--- a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPushSource.java
+++ b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorPushSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.batchdatagenerator;
 
 import io.codearte.jfairy.Fairy;
diff --git a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java
index 3a7fed0ed650d..5f3b18576b410 100644
--- a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java
+++ b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/Person.java b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/Person.java
index f112b111a741b..43339faf41d1e 100644
--- a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/Person.java
+++ b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/Person.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/package-info.java b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/package-info.java
index 2decd5c7fde23..57090a760381c 100644
--- a/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/package-info.java
+++ b/pulsar-io/batch-data-generator/src/main/java/org/apache/pulsar/io/batchdatagenerator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-data-generator/src/test/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorExec.java b/pulsar-io/batch-data-generator/src/test/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorExec.java
index 1e7ed7ffd3e94..2cb15274eb335 100644
--- a/pulsar-io/batch-data-generator/src/test/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorExec.java
+++ b/pulsar-io/batch-data-generator/src/test/java/org/apache/pulsar/io/batchdatagenerator/BatchDataGeneratorExec.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/CronTriggerer.java b/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/CronTriggerer.java
index fd3be2fd09726..53d3244ed6ddd 100644
--- a/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/CronTriggerer.java
+++ b/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/CronTriggerer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/ImmediateTriggerer.java b/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/ImmediateTriggerer.java
index 57b09b3554d00..4501ad6c88464 100644
--- a/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/ImmediateTriggerer.java
+++ b/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/ImmediateTriggerer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/package-info.java b/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/package-info.java
index be49d3d4a0b4c..6eaea44a4f284 100644
--- a/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/package-info.java
+++ b/pulsar-io/batch-discovery-triggerers/src/main/java/org/apache/pulsar/io/batchdiscovery/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/canal/pom.xml b/pulsar-io/canal/pom.xml
index 9a579be9d9fe5..e1ae956bbf660 100644
--- a/pulsar-io/canal/pom.xml
+++ b/pulsar-io/canal/pom.xml
@@ -87,6 +87,12 @@
             com.alibaba.otter
             canal.protocol
             ${canal.version}
+            
+                
+                    ch.qos.logback
+                    *
+                
+            
         
         
             com.alibaba.otter
diff --git a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalAbstractSource.java b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalAbstractSource.java
index c871242234855..06c8788d5aea1 100644
--- a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalAbstractSource.java
+++ b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalAbstractSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalByteSource.java b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalByteSource.java
index cf489600fcfcf..f27c5c21f10d7 100644
--- a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalByteSource.java
+++ b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalByteSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalSourceConfig.java b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalSourceConfig.java
index da9c199eb5158..54bdcf9f06153 100644
--- a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalSourceConfig.java
+++ b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalStringSource.java b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalStringSource.java
index f615bfee615ed..cad6eeb9ba680 100644
--- a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalStringSource.java
+++ b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalStringSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/MessageUtils.java b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/MessageUtils.java
index 77ee5bb7ef976..5f3caa696f996 100644
--- a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/MessageUtils.java
+++ b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/MessageUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/package-info.java b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/package-info.java
index 2727f77afd864..801724d6919a2 100644
--- a/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/package-info.java
+++ b/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
index 7a872ff6504ec..4f96df280d2c5 100644
--- a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
+++ b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.cassandra;
 
 import com.datastax.driver.core.BoundStatement;
@@ -99,7 +98,7 @@ private void createClient(String roots) {
                 b.withPort(Integer.parseInt(hostPort[1]));
             }
         }
-        cluster = b.build();
+        cluster = b.withoutJMXReporting().build();
         session = cluster.connect();
         session.execute("USE " + cassandraSinkConfig.getKeyspace());
     }
diff --git a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraSinkConfig.java b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraSinkConfig.java
index 821e973dec656..14519e4d4a714 100644
--- a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraSinkConfig.java
+++ b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.cassandra;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
index 694b79b055be6..789e7c2b73b73 100644
--- a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
+++ b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.cassandra;
 
 import org.apache.pulsar.functions.api.Record;
diff --git a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/package-info.java b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/package-info.java
index 5448c17ac0787..0968ec792a31b 100644
--- a/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/package-info.java
+++ b/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/IOConfigUtils.java b/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/IOConfigUtils.java
index 9bedcc37bab7e..97224ca872128 100644
--- a/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/IOConfigUtils.java
+++ b/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/IOConfigUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/package-info.java b/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/package-info.java
index 3673438f8316c..dc7301ab85b57 100644
--- a/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/package-info.java
+++ b/pulsar-io/common/src/main/java/org/apache/pulsar/io/common/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/common/src/test/java/org/apache/pulsar/io/common/IOConfigUtilsTest.java b/pulsar-io/common/src/test/java/org/apache/pulsar/io/common/IOConfigUtilsTest.java
index 52126c538e03a..52afac1a5ac0c 100644
--- a/pulsar-io/common/src/test/java/org/apache/pulsar/io/common/IOConfigUtilsTest.java
+++ b/pulsar-io/common/src/test/java/org/apache/pulsar/io/common/IOConfigUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchPushSource.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchPushSource.java
index f6821aceaefb9..edf7b2756dd99 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchPushSource.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchPushSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSource.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSource.java
index d8baf58fd0092..0a4eadc5fabe4 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSource.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSourceTriggerer.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSourceTriggerer.java
index 74917f65f0067..88c5480b1b515 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSourceTriggerer.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/BatchSourceTriggerer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java
index 59f37dfca310a..a84e3774b526f 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/KeyValue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/PushSource.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/PushSource.java
index bc0155070ce22..dbd4dc4e1e9ff 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/PushSource.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/PushSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java
index 7f6bdc7213b2a..40405f5db9287 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SinkContext.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SinkContext.java
index 4718d64235d93..72fb6eb8cec0f 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SinkContext.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SinkContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java
index dbe08d35f37e3..a160245e8a087 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SourceContext.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SourceContext.java
index 3f1665ab48c93..eef4c31e6d0b7 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SourceContext.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/SourceContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/Connector.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/Connector.java
index a5364e150d6a5..b62f22fef1f86 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/Connector.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/Connector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/FieldDoc.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/FieldDoc.java
index dee16120c56cf..40c6eee197691 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/FieldDoc.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/FieldDoc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/IOType.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/IOType.java
index b5a33a4fd08af..59cd0c6c1d8b8 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/IOType.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/IOType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/package-info.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/package-info.java
index 2b92e76d4063b..e38968fc1f160 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/package-info.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/annotations/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/package-info.java b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/package-info.java
index 77d9d15ce5b94..8aebc6eff49a7 100644
--- a/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/package-info.java
+++ b/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/BatchPushSourceTest.java b/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/BatchPushSourceTest.java
index 3ac2b49545fc8..3de9f7c680525 100644
--- a/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/BatchPushSourceTest.java
+++ b/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/BatchPushSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SinkTest.java b/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SinkTest.java
index 0980bd1562505..c34aeb0d27052 100644
--- a/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SinkTest.java
+++ b/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SourceTest.java b/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SourceTest.java
index a281a54de400d..a9eeaaad9ff80 100644
--- a/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SourceTest.java
+++ b/pulsar-io/core/src/test/java/org/apache/pulsar/io/core/SourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorPrintSink.java b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorPrintSink.java
index 05d64061d1967..8046d8a0271e6 100644
--- a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorPrintSink.java
+++ b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorPrintSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java
index 40938a65c5d12..6a8d501b297f7 100644
--- a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java
+++ b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSourceConfig.java b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSourceConfig.java
index c4c7021a71f72..b99b59487593d 100644
--- a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSourceConfig.java
+++ b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/DataGeneratorSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/Person.java b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/Person.java
index fed9e34be3e7c..a5bf2abb54c21 100644
--- a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/Person.java
+++ b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/Person.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/package-info.java b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/package-info.java
index eab046c1fae5b..8f24f7af6935b 100644
--- a/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/package-info.java
+++ b/pulsar-io/data-generator/src/main/java/org/apache/pulsar/io/datagenerator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/core/pom.xml b/pulsar-io/debezium/core/pom.xml
index 5b4b7f4deb892..f3701887faf60 100644
--- a/pulsar-io/debezium/core/pom.xml
+++ b/pulsar-io/debezium/core/pom.xml
@@ -36,12 +36,7 @@
       ${project.groupId}
       pulsar-io-core
       ${project.version}
-    
-
-    
-      ${project.groupId}
-      pulsar-client-original
-      ${project.version}
+      provided
     
 
     
@@ -50,6 +45,17 @@
       ${debezium.version}
     
 
+    
+      org.apache.commons
+      commons-lang3
+    
+
+    
+      ${project.groupId}
+      pulsar-common
+      ${project.version}
+    
+
     
       ${project.groupId}
       pulsar-io-kafka-connect-adaptor
@@ -103,6 +109,13 @@
       test
     
 
+    
+      ${project.groupId}
+      pulsar-client-original
+      ${project.version}
+      test
+    
+
   
 
 
diff --git a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/DebeziumSource.java b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/DebeziumSource.java
index 62c3984ef603c..4cdd363dbe9a9 100644
--- a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/DebeziumSource.java
+++ b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/DebeziumSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistory.java b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistory.java
index 306a791fa9ecd..7ca0d309cf973 100644
--- a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistory.java
+++ b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,9 +18,9 @@
  */
 package org.apache.pulsar.io.debezium;
 
-import static org.apache.commons.lang.StringUtils.isBlank;
-import static org.apache.pulsar.io.common.IOConfigUtils.loadConfigFromJsonString;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
 import io.debezium.annotation.ThreadSafe;
 import io.debezium.config.Configuration;
@@ -33,6 +33,7 @@
 import io.debezium.relational.history.HistoryRecord;
 import io.debezium.relational.history.HistoryRecordComparator;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -99,6 +100,7 @@ public final class PulsarDatabaseHistory extends AbstractDatabaseHistory {
         DatabaseHistory.NAME,
         READER_CONFIG);
 
+    private final ObjectMapper mapper = new ObjectMapper();
     private final DocumentReader reader = DocumentReader.defaultReader();
     private String topicName;
     private Map readerConfigMap = new HashMap<>();
@@ -120,7 +122,13 @@ public void configure(
         }
         this.topicName = config.getString(TOPIC);
         try {
-            this.readerConfigMap = loadConfigFromJsonString(config.getString(READER_CONFIG));
+            final String configString = config.getString(READER_CONFIG);
+            if (configString == null) {
+                this.readerConfigMap = Collections.emptyMap();
+            } else {
+                this.readerConfigMap = mapper.readValue(configString, Map.class);
+            }
+
         } catch (JsonProcessingException exception) {
             log.warn("The provided reader configs are invalid, "
                     + "will not passing any extra config to the reader builder.", exception);
diff --git a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/SerDeUtils.java b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/SerDeUtils.java
index 1c3897a407eba..3d8dd3bd08d5c 100644
--- a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/SerDeUtils.java
+++ b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/SerDeUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.debezium;
 
 import java.io.ByteArrayInputStream;
diff --git a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/package-info.java b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/package-info.java
index 4522ccf283e4e..4dba285d03104 100644
--- a/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/package-info.java
+++ b/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/core/src/test/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistoryTest.java b/pulsar-io/debezium/core/src/test/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistoryTest.java
index 081cfdcc5435a..1c5863e557e9a 100644
--- a/pulsar-io/debezium/core/src/test/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistoryTest.java
+++ b/pulsar-io/debezium/core/src/test/java/org/apache/pulsar/io/debezium/PulsarDatabaseHistoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/mongodb/pom.xml b/pulsar-io/debezium/mongodb/pom.xml
index 1650fe2a650b3..e01948d1125ac 100644
--- a/pulsar-io/debezium/mongodb/pom.xml
+++ b/pulsar-io/debezium/mongodb/pom.xml
@@ -32,6 +32,13 @@
 
     
 
+        
+            ${project.groupId}
+            pulsar-io-core
+            ${project.version}
+            provided
+        
+
         
             ${project.groupId}
             pulsar-io-debezium-core
diff --git a/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/DebeziumMongoDbSource.java b/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/DebeziumMongoDbSource.java
index 8017ffef4595b..a78664301be8e 100644
--- a/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/DebeziumMongoDbSource.java
+++ b/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/DebeziumMongoDbSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/package-info.java b/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/package-info.java
index 465695aa51232..d400a3788d734 100644
--- a/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/package-info.java
+++ b/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/mssql/pom.xml b/pulsar-io/debezium/mssql/pom.xml
index 6f5fb6dd5d802..62da307f4b866 100644
--- a/pulsar-io/debezium/mssql/pom.xml
+++ b/pulsar-io/debezium/mssql/pom.xml
@@ -32,6 +32,13 @@
 
   
 
+    
+      ${project.groupId}
+      pulsar-io-core
+      ${project.version}
+      provided
+    
+
     
       ${project.groupId}
       pulsar-io-debezium-core
diff --git a/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/DebeziumMsSqlSource.java b/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/DebeziumMsSqlSource.java
index 46b58276d9bf9..f60653e7aaede 100644
--- a/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/DebeziumMsSqlSource.java
+++ b/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/DebeziumMsSqlSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/package-info.java b/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/package-info.java
index 2ceb1d4b6a355..681e561000a16 100644
--- a/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/package-info.java
+++ b/pulsar-io/debezium/mssql/src/main/java/org/apache/pulsar/io/debezium/mssql/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/mysql/pom.xml b/pulsar-io/debezium/mysql/pom.xml
index fa0c7b7953507..d3c18122086b1 100644
--- a/pulsar-io/debezium/mysql/pom.xml
+++ b/pulsar-io/debezium/mysql/pom.xml
@@ -31,6 +31,12 @@
   Pulsar IO :: Debezium :: mysql
 
   
+    
+      ${project.groupId}
+      pulsar-io-core
+      ${project.version}
+      provided
+    
 
     
       ${project.groupId}
diff --git a/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/DebeziumMysqlSource.java b/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/DebeziumMysqlSource.java
index ba3d2e1eaadfe..633535512d25b 100644
--- a/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/DebeziumMysqlSource.java
+++ b/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/DebeziumMysqlSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/package-info.java b/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/package-info.java
index 5a6d9e727a994..f41c1590df40b 100644
--- a/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/package-info.java
+++ b/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/oracle/pom.xml b/pulsar-io/debezium/oracle/pom.xml
index 030a72b09b4b9..3da3b8d9ac245 100644
--- a/pulsar-io/debezium/oracle/pom.xml
+++ b/pulsar-io/debezium/oracle/pom.xml
@@ -32,6 +32,13 @@
 
   
 
+    
+      ${project.groupId}
+      pulsar-io-core
+      ${project.version}
+      provided
+    
+
     
       ${project.groupId}
       pulsar-io-debezium-core
diff --git a/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/DebeziumOracleSource.java b/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/DebeziumOracleSource.java
index 3670c5c5043ad..cb7363ac8cd94 100644
--- a/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/DebeziumOracleSource.java
+++ b/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/DebeziumOracleSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/package-info.java b/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/package-info.java
index 320146983a992..7efd1fea05d77 100644
--- a/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/package-info.java
+++ b/pulsar-io/debezium/oracle/src/main/java/org/apache/pulsar/io/debezium/oracle/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/postgres/pom.xml b/pulsar-io/debezium/postgres/pom.xml
index 7c8d74a229f24..2b9596c9f88d9 100644
--- a/pulsar-io/debezium/postgres/pom.xml
+++ b/pulsar-io/debezium/postgres/pom.xml
@@ -32,6 +32,13 @@
 
   
 
+    
+      ${project.groupId}
+      pulsar-io-core
+      ${project.version}
+      provided
+    
+
     
       ${project.groupId}
       pulsar-io-debezium-core
diff --git a/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/DebeziumPostgresSource.java b/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/DebeziumPostgresSource.java
index 28907d9492069..ef645aad6b102 100644
--- a/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/DebeziumPostgresSource.java
+++ b/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/DebeziumPostgresSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/package-info.java b/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/package-info.java
index 5413a8d32f0d1..bda08b8926fdd 100644
--- a/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/package-info.java
+++ b/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/docs/pom.xml b/pulsar-io/docs/pom.xml
index 3ed776035fc02..dca0edbc759d3 100644
--- a/pulsar-io/docs/pom.xml
+++ b/pulsar-io/docs/pom.xml
@@ -157,6 +157,11 @@
       pulsar-io-jdbc-openmldb
       ${project.version}
     
+    
+      ${project.groupId}
+      pulsar-io-http
+      ${project.version}
+    
     
       ${project.groupId}
       pulsar-io-kafka
diff --git a/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java b/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
index f023b5b5e9104..927d94b3e198c 100644
--- a/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
+++ b/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/package-info.java b/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/package-info.java
index cc716cd7aaff3..500c339050d70 100644
--- a/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/package-info.java
+++ b/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/pom.xml b/pulsar-io/dynamodb/pom.xml
index 4028bbf5dde36..86a8fbbf95802 100644
--- a/pulsar-io/dynamodb/pom.xml
+++ b/pulsar-io/dynamodb/pom.xml
@@ -70,7 +70,6 @@
     
       com.fasterxml.jackson.dataformat
       jackson-dataformat-cbor
-      ${jackson.version}
     
 
     
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSource.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSource.java
index 07ec53fb05cd1..d67c4e21154ee 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSource.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfig.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfig.java
index e85bdb34b6fe7..19092652369b7 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfig.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java
index 4be63c1f3ecd9..e1e6c3077fa96 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessor.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessor.java
index e5c6c9e8eb6a4..df2d2e3c0140b 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessor.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessorFactory.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessorFactory.java
index d30434634a4e0..33fdd9438d1ae 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessorFactory.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/StreamsRecordProcessorFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/package-info.java b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/package-info.java
index a8dcd692ca2e1..5bae50abcfea7 100644
--- a/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/package-info.java
+++ b/pulsar-io/dynamodb/src/main/java/org/apache/pulsar/io/dynamodb/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/dynamodb/src/test/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfigTests.java b/pulsar-io/dynamodb/src/test/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfigTests.java
index 2d7ac728c3bcf..f84cb785896e6 100644
--- a/pulsar-io/dynamodb/src/test/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfigTests.java
+++ b/pulsar-io/dynamodb/src/test/java/org/apache/pulsar/io/dynamodb/DynamoDBSourceConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClient.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClient.java
index e46795e2b8841..d6fb5bb705d86 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClient.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
index 51dfeedf2531c..4f9a91a81ba97 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConnectionException.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConnectionException.java
index ca8d213a0d359..d0dbc00b0abe6 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConnectionException.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConnectionException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java
index 6f029e1f2dccc..1e7df55527101 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSslConfig.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSslConfig.java
index 1c8fb64bc8ddc..e96926576cb72 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSslConfig.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSslConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatter.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatter.java
index d176fea072ae4..38ba6fdb9a754 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatter.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/JsonConverter.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/JsonConverter.java
index 9acf11b81157d..01958cac58e37 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/JsonConverter.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/JsonConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetry.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetry.java
index 67d195cf71d23..ba1a2950851f1 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetry.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/BulkProcessor.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/BulkProcessor.java
index 709d421239055..19e164b8433e9 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/BulkProcessor.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/BulkProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
index 561358a3e5c08..a81a229607b55 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactory.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactory.java
index 76429d07fc144..9ceda9631a364 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactory.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticBulkProcessor.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticBulkProcessor.java
index fd4dc757bd391..270da84d94224 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticBulkProcessor.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticBulkProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticSearchJavaRestClient.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticSearchJavaRestClient.java
index bd1efcb971b70..4749ea2e2d383 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticSearchJavaRestClient.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticSearchJavaRestClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -36,7 +36,9 @@
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.util.Map;
@@ -53,8 +55,9 @@
 public class ElasticSearchJavaRestClient extends RestClient {
 
     private final ElasticsearchClient client;
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
+    private final ObjectMapper objectMapper = new ObjectMapper()
+            .configure(SerializationFeature.INDENT_OUTPUT, false)
+            .setSerializationInclusion(JsonInclude.Include.ALWAYS);
     private BulkProcessor bulkProcessor;
     private ElasticsearchTransport transport;
 
@@ -87,8 +90,7 @@ public void onFailure(Node node) {
                         log.warn("Node host={} failed", node.getHost());
                     }
                 });
-        transport = new RestClientTransport(builder.build(),
-                new JacksonJsonpMapper());
+        transport = new RestClientTransport(builder.build(), new JacksonJsonpMapper(objectMapper));
         client = new ElasticsearchClient(transport);
         if (elasticSearchConfig.isBulkEnabled()) {
             bulkProcessor = new ElasticBulkProcessor(elasticSearchConfig, client, bulkProcessorListener);
@@ -117,7 +119,7 @@ public boolean createIndex(String index) throws IOException {
                 .build();
         try {
             final CreateIndexResponse createIndexResponse = client.indices().create(createIndexRequest);
-            if ((createIndexResponse.acknowledged() != null && createIndexResponse.acknowledged())
+            if ((createIndexResponse.acknowledged())
                     && createIndexResponse.shardsAcknowledged()) {
                 return true;
             }
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/package-info.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/package-info.java
index c345a41bdd19b..4f3333547921d 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/package-info.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/OpenSearchHighLevelRestClient.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/OpenSearchHighLevelRestClient.java
index df2597fdf70b7..7b7041967026e 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/OpenSearchHighLevelRestClient.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/OpenSearchHighLevelRestClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.elasticsearch.client.opensearch;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/RandomExponentialBackoffPolicy.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/RandomExponentialBackoffPolicy.java
index 2310385a4881b..2c242d53a120c 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/RandomExponentialBackoffPolicy.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/RandomExponentialBackoffPolicy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/package-info.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/package-info.java
index 92ca087abd4d7..2d57050c78833 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/package-info.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/package-info.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/package-info.java
index acb4eef97e7db..75fa4139f0be2 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/package-info.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/package-info.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/package-info.java
index c4f5d6dcccabb..a1d40638d13b1 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/package-info.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchAuthTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchAuthTests.java
index 67524b4233481..7c56bfc23c96d 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchAuthTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchAuthTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchBWCTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchBWCTests.java
index 04a92be11b956..2fb9c4e818ab4 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchBWCTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchBWCTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientSslTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientSslTests.java
index 7781b6724a392..5598a88d410a9 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientSslTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientSslTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientTests.java
index 8a453dfe4514a..6d9928c042697 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchClientTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,6 +29,7 @@
 import static org.testng.Assert.assertTrue;
 import eu.rekawek.toxiproxy.model.ToxicDirection;
 import java.io.IOException;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.atomic.LongAdder;
@@ -193,7 +194,7 @@ public void testIndexExists() throws IOException {
     @Test
     public void testTopicToIndexName() throws IOException {
         try (ElasticSearchClient client = new ElasticSearchClient(new ElasticSearchConfig()
-                .setElasticSearchUrl("http://" + container.getHttpHostAddress())); ) {
+                .setElasticSearchUrl("http://" + container.getHttpHostAddress()));) {
             assertEquals(client.topicToIndexName("data-ks1.table1"), "data-ks1.table1");
             assertEquals(client.topicToIndexName("persistent://public/default/testesjson"), "testesjson");
             assertEquals(client.topicToIndexName("default/testesjson"), "testesjson");
@@ -211,7 +212,7 @@ public void testTopicToIndexName() throws IOException {
     public void testMalformedDocFails() throws Exception {
         String index = "indexmalformed-" + UUID.randomUUID();
         ElasticSearchConfig config = new ElasticSearchConfig()
-                .setElasticSearchUrl("http://"+container.getHttpHostAddress())
+                .setElasticSearchUrl("http://" + container.getHttpHostAddress())
                 .setIndexName(index)
                 .setBulkEnabled(true)
                 .setBulkFlushIntervalInMs(-1L)
@@ -235,7 +236,7 @@ public void testMalformedDocFails() throws Exception {
     public void testMalformedDocIgnore() throws Exception {
         String index = "indexmalformed2-" + UUID.randomUUID();
         ElasticSearchConfig config = new ElasticSearchConfig()
-                .setElasticSearchUrl("http://"+container.getHttpHostAddress())
+                .setElasticSearchUrl("http://" + container.getHttpHostAddress())
                 .setIndexName(index)
                 .setBulkEnabled(true)
                 .setBulkFlushIntervalInMs(-1)
@@ -366,7 +367,7 @@ public void testBulkBlocking() throws Exception {
     public void testBulkIndexAndDelete() throws Exception {
         final String index = "indexbulktest-" + UUID.randomUUID();
         ElasticSearchConfig config = new ElasticSearchConfig()
-                .setElasticSearchUrl("http://"+container.getHttpHostAddress())
+                .setElasticSearchUrl("http://" + container.getHttpHostAddress())
                 .setIndexName(index)
                 .setBulkEnabled(true)
                 .setBulkActions(10)
@@ -389,4 +390,30 @@ public void testBulkIndexAndDelete() throws Exception {
         }
     }
 
+    @Test
+    public void testIndexKeepNulls() throws Exception {
+        final String index = "indexnulls";
+        ElasticSearchConfig config = new ElasticSearchConfig()
+                .setElasticSearchUrl("http://" + container.getHttpHostAddress())
+                .setIndexName(index);
+
+        try (ElasticSearchClient client = new ElasticSearchClient(config)) {
+            MockRecord mockRecord = new MockRecord<>();
+            client.indexDocument(mockRecord, Pair.of("key0", "{\"a\":1,\"b\":null}"));
+            final Map sourceAsMap;
+            if (elasticImageName.equals(ELASTICSEARCH_8)) {
+                final ElasticSearchJavaRestClient restClient = (ElasticSearchJavaRestClient) client.getRestClient();
+                sourceAsMap =
+                        restClient.search(index, "*:*").hits().hits().get(0).source();
+            } else {
+                final OpenSearchHighLevelRestClient restClient = (OpenSearchHighLevelRestClient) client.getRestClient();
+                sourceAsMap =
+                        restClient.search(index, "*:*").getHits().getHits()[0].getSourceAsMap();
+            }
+            assertEquals(sourceAsMap.get("a"), 1);
+            assertTrue(sourceAsMap.containsKey("b"));
+            assertNull(sourceAsMap.get("b"));
+        }
+    }
+
 }
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
index 5f59f8212774c..28f3c444e88e4 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchExtractTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchExtractTests.java
index 0d6c9126314fb..cbc3de908c68f 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchExtractTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchExtractTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkRawDataTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkRawDataTests.java
index bff1f7d791aba..7749dc5ecca2f 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkRawDataTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkRawDataTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkTests.java
index 4975217c62008..7ab2342e101e1 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java
index 16b0423d8b1b7..4c6fd020fa338 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -39,10 +39,10 @@
 public abstract class ElasticSearchTestBase {
 
     public static final String ELASTICSEARCH_8 = Optional.ofNullable(System.getenv("ELASTICSEARCH_IMAGE_V8"))
-            .orElse("docker.elastic.co/elasticsearch/elasticsearch:8.1.0");
+            .orElse("docker.elastic.co/elasticsearch/elasticsearch:8.5.1");
 
     public static final String ELASTICSEARCH_7 = Optional.ofNullable(System.getenv("ELASTICSEARCH_IMAGE_V7"))
-            .orElse("docker.elastic.co/elasticsearch/elasticsearch:7.16.3-amd64");
+            .orElse("docker.elastic.co/elasticsearch/elasticsearch:7.17.7");
 
     public static final String OPENSEARCH = Optional.ofNullable(System.getenv("OPENSEARCH_IMAGE"))
             .orElse("opensearchproject/opensearch:1.2.4");
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatterTest.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatterTest.java
index 4fbbe1d5b3cfa..301f621c800ee 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatterTest.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/IndexNameFormatterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/JsonConverterTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/JsonConverterTests.java
index 322891c7be066..d641aefc5de66 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/JsonConverterTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/JsonConverterTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetryTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetryTests.java
index dcdfc63dbec81..8127cb532ef8f 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetryTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/RandomExponentialRetryTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactoryTest.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactoryTest.java
index 58211fdef0442..e1aaadcd54973 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactoryTest.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/Profile.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/Profile.java
index 64797303fc803..5b6452bd8b0b2 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/Profile.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/Profile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/UserProfile.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/UserProfile.java
index 2b75a90e4cdf4..159af07c92503 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/UserProfile.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/data/UserProfile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientSslTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientSslTests.java
index 92bfd2509ffcf..de6946136855a 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientSslTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientSslTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientTests.java
index 2b7d72d6d5d54..6b4e67305fbef 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchClientTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkRawDataTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkRawDataTests.java
index ce18e6ea2b799..b3b717fd41cb0 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkRawDataTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkRawDataTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkTests.java
index b224c7b69093d..fb7bba9e18f0c 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/opensearch/OpenSearchSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/testcontainers/ElasticToxiproxiContainer.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/testcontainers/ElasticToxiproxiContainer.java
index 348c350743a9c..a8af70045500a 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/testcontainers/ElasticToxiproxiContainer.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/testcontainers/ElasticToxiproxiContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.elasticsearch.testcontainers;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7AuthTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7AuthTests.java
index 3bbb012c8fe47..b211b2c030a41 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7AuthTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7AuthTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientSslTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientSslTests.java
index 9709b259e381b..e5863d514064e 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientSslTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientSslTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientTests.java
index d982ed9826030..9318f10607459 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7ClientTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkRawDataTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkRawDataTests.java
index a193982ad388e..9cabc7d63cb49 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkRawDataTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkRawDataTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkTests.java
index fbd8979ac8023..8949a30bf44d4 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v7/ElasticSearch7SinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8AuthTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8AuthTests.java
index c2d29b1de6d73..4570e69626d08 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8AuthTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8AuthTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientSslTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientSslTests.java
index 25155b0d0a232..578311c9be125 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientSslTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientSslTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientTests.java
index 19546d45f960e..188a04ab856db 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8ClientTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkRawDataTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkRawDataTests.java
index 09343e947930d..b546ca83dfc31 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkRawDataTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkRawDataTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkTests.java
index b2f293f64fb62..bf56ee91f491a 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/v8/ElasticSearch8SinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileConsumerThread.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileConsumerThread.java
index 163de6c4ea8fc..7e0c9344e8877 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileConsumerThread.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileConsumerThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileListingThread.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileListingThread.java
index dac8f45754c31..5958fc3748c31 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileListingThread.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileListingThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileRecord.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileRecord.java
index 5cdd5d0158437..585e98bf84067 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileRecord.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java
index a67e3195ad724..c201977d56e25 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSourceConfig.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSourceConfig.java
index 5290c87a78350..804f64c4602d3 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSourceConfig.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/ProcessedFileThread.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/ProcessedFileThread.java
index ecde87d4f89b0..e5755b2e4a000 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/ProcessedFileThread.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/ProcessedFileThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/package-info.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/package-info.java
index 079534397925b..706e3fa47b412 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/package-info.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java
index 4e7d927e2a255..858a499ee284f 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java
index 367b04edd487e..bc4cfc3ffbf87 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/package-info.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/package-info.java
index 2b21e913bd78e..1211e23995aed 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/package-info.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/AbstractFileTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/AbstractFileTests.java
index 1feccb7e24e10..7680ce7f40fa4 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/AbstractFileTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/AbstractFileTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.file;
 
 import java.io.File;
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileConsumerThreadTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileConsumerThreadTests.java
index 30284a5357285..b96d56ca69061 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileConsumerThreadTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileConsumerThreadTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileListingThreadTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileListingThreadTests.java
index e56d90d76f762..bd6ffc536a238 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileListingThreadTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileListingThreadTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileSourceConfigTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileSourceConfigTests.java
index d2cf21899c904..45a95217d1d3d 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileSourceConfigTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/FileSourceConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/ProcessedFileThreadTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/ProcessedFileThreadTests.java
index 49ac9595e1612..8365f97575860 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/ProcessedFileThreadTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/ProcessedFileThreadTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/TestFileGenerator.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/TestFileGenerator.java
index 21ad85279a6a8..dfdeb0aa743af 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/TestFileGenerator.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/TestFileGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/GZipFilesTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/GZipFilesTests.java
index b08bb0086a999..1cc7faf84f419 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/GZipFilesTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/GZipFilesTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/ZipFilesTests.java b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/ZipFilesTests.java
index 2fc7286b3a3e5..c45ee199dc517 100644
--- a/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/ZipFilesTests.java
+++ b/pulsar-io/file/src/test/java/org/apache/pulsar/io/file/utils/ZipFilesTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConfig.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConfig.java
index 83302b8c6c390..fbcda414bdc8a 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConfig.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java
index e13461a9508bc..82c843813e85e 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/package-info.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/package-info.java
index 885a6b7c8c8ad..2ce89df678cdd 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/package-info.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/AbstractSink.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/AbstractSink.java
index 0b59bf8ae8cfb..038642edc379b 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/AbstractSink.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/AbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/SourceOfFlume.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/SourceOfFlume.java
index 76ac1e3b945aa..e6825c7f906ba 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/SourceOfFlume.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/SourceOfFlume.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/StringSink.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/StringSink.java
index a05950a9aa808..24b6c1b871bc3 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/StringSink.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/StringSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/package-info.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/package-info.java
index 53cd17eaa3281..64e4b0370abeb 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/package-info.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/sink/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSinkOfFlume.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSinkOfFlume.java
index 79874cf07a4f4..761b7dcbb1929 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSinkOfFlume.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSinkOfFlume.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSource.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSource.java
index af8e1b9bdce21..5f3b1676aac29 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSource.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/AbstractSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/SinkOfFlume.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/SinkOfFlume.java
index 46d12e25c7e35..522566cb1cbe2 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/SinkOfFlume.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/SinkOfFlume.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/StringSource.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/StringSource.java
index 3c25986b214fb..7c2920808c8c9 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/StringSource.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/StringSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/package-info.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/package-info.java
index d1f5be0a03e88..d6e93a3d32d0e 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/package-info.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/source/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/AbstractFlumeTests.java b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/AbstractFlumeTests.java
index c9fe6c67332ed..42b5afc0eaaf3 100644
--- a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/AbstractFlumeTests.java
+++ b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/AbstractFlumeTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
index 58c6db74f010c..cb03f065b7416 100644
--- a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
+++ b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
index c9f7ceac28099..5c900f905f547 100644
--- a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
+++ b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/HbaseAbstractConfig.java b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/HbaseAbstractConfig.java
index 00ace82bccb2e..6b76f7e3f1881 100644
--- a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/HbaseAbstractConfig.java
+++ b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/HbaseAbstractConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/package-info.java b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/package-info.java
index b8f7722dbb0cf..82e37e33c87e4 100644
--- a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/package-info.java
+++ b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseAbstractSink.java b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseAbstractSink.java
index 5c771233edccf..af92643e0a0ae 100644
--- a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseAbstractSink.java
+++ b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSink.java b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSink.java
index 54673bf5aecbc..4d03fe1eb70f7 100644
--- a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSink.java
+++ b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfig.java b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfig.java
index aa09b1fa8703a..0b1eda15ab8d0 100644
--- a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfig.java
+++ b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/package-info.java b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/package-info.java
index f3899654fdf71..c4dc52c092973 100644
--- a/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/package-info.java
+++ b/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/sink/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/TableUtils.java b/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/TableUtils.java
index 7c3c78e8a7d56..9cb5864e6a97b 100644
--- a/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/TableUtils.java
+++ b/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/TableUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSinkTest.java b/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSinkTest.java
index 09127eba5ef8f..a4dc2c6abe29a 100644
--- a/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSinkTest.java
+++ b/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseGenericRecordSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfigTest.java b/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfigTest.java
index 8312bad0e44c3..d495726a3f647 100644
--- a/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfigTest.java
+++ b/pulsar-io/hbase/src/test/java/org/apache/pulsar/io/hbase/sink/HbaseSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConfig.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConfig.java
index 2448875ff10c9..757360e04533c 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConfig.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConnector.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConnector.java
index c79ee49689b36..d7277aa627383 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConnector.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/AbstractHdfsConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/Compression.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/Compression.java
index e698b327a82b2..e7617d231c169 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/Compression.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/Compression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/HdfsResources.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/HdfsResources.java
index e7575c045dd3e..5fd6b283e6b41 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/HdfsResources.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/HdfsResources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/SecurityUtil.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/SecurityUtil.java
index 184296945a0e3..ca178aad911e2 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/SecurityUtil.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/SecurityUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/package-info.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/package-info.java
index ece38d0f6481a..464c6db341e8f 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/package-info.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsAbstractSink.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsAbstractSink.java
index 27e841a0df24e..7b025d16378ff 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsAbstractSink.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfig.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfig.java
index 13ce2df48ac61..f7d73a52e12ec 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfig.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSyncThread.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSyncThread.java
index 85248693e5169..9ddd83f4423f9 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSyncThread.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/HdfsSyncThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/package-info.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/package-info.java
index 650ccb746fd95..238a441ee0ee3 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/package-info.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsAbstractSequenceFileSink.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsAbstractSequenceFileSink.java
index 1c41cd27effcd..355c00080effe 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsAbstractSequenceFileSink.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsAbstractSequenceFileSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialTextSink.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialTextSink.java
index 3d35512b2125e..8fa908c3c8c3f 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialTextSink.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialTextSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSink.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSink.java
index 122cb698a2cab..3c643e287a960 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSink.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/package-info.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/package-info.java
index 31eba30a2655b..0bcb0d837fcea 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/package-info.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/seq/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsAbstractTextFileSink.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsAbstractTextFileSink.java
index 582c58d1d0fd4..d96309695f11c 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsAbstractTextFileSink.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsAbstractTextFileSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSink.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSink.java
index c289ac59b2d9c..4de5de1aedf8d 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSink.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/package-info.java b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/package-info.java
index 34b76d34b8f1c..a5618597197a6 100644
--- a/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/package-info.java
+++ b/pulsar-io/hdfs2/src/main/java/org/apache/pulsar/io/hdfs2/sink/text/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/AbstractHdfsSinkTest.java b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/AbstractHdfsSinkTest.java
index dee3ec491cd03..2660199dc18ae 100644
--- a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/AbstractHdfsSinkTest.java
+++ b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/AbstractHdfsSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfigTests.java b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfigTests.java
index aa76064f2a374..1d4b379011e0b 100644
--- a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfigTests.java
+++ b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/HdfsSinkConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialSinkTests.java b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialSinkTests.java
index 60f2ba51eb9de..fcf6ab2f5c4dc 100644
--- a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialSinkTests.java
+++ b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsSequentialSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,75 +21,75 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertNotNull;
-
 import org.apache.pulsar.io.hdfs2.sink.AbstractHdfsSinkTest;
-import org.apache.pulsar.io.hdfs2.sink.seq.HdfsSequentialTextSink;
 import org.testng.annotations.Test;
 
 public class HdfsSequentialSinkTests extends AbstractHdfsSinkTest {
-	
+
     @Override
     protected void createSink() {
         sink = new HdfsSequentialTextSink();
     }
-    
-    @Test(enabled = false)
-	public final void write100Test() throws Exception {
-		map.put("filenamePrefix", "write100Test-seq");
-		map.put("fileExtension", ".seq");
-		map.put("syncInterval", 1000);
-		sink.open(map, mockSinkContext);
-		
-		assertNotNull(sink);
-		send(100);
-		
-		Thread.sleep(2000);
-		verify(mockRecord, times(100)).ack();
-		sink.close();
-	}
-	
-	@Test(enabled = false)
-	public final void write5000Test() throws Exception {
-		map.put("filenamePrefix", "write5000Test-seq");
-		map.put("fileExtension", ".seq");
-		map.put("syncInterval", 1000);
-		sink.open(map, mockSinkContext);
-		
-		assertNotNull(sink);
-		send(5000);
-		
-		Thread.sleep(2000);
-		verify(mockRecord, times(5000)).ack();
-		sink.close();
-	}
-	
-	@Test(enabled = false)
-	public final void tenSecondTest() throws Exception {
-		map.put("filenamePrefix", "tenSecondTest-seq");
-		map.put("fileExtension", ".seq");
-		map.put("syncInterval", 1000);
-		sink.open(map, mockSinkContext);
-		runFor(10);	
-		sink.close();
-	}
-	
-	@Test(enabled = false)
-	public final void bzip2CompressionTest() throws Exception {
-		map.put("filenamePrefix", "bzip2CompressionTest-seq");
-		map.put("compression", "BZIP2");
-		map.remove("fileExtension");
-		sink.open(map, mockSinkContext);
-		send(5000);
-		verify(mockRecord, times(5000)).ack();
-	}
-	
-	@Test(enabled = false)
-	public final void deflateCompressionTest() throws Exception {
-		map.put("filenamePrefix", "deflateCompressionTest-seq");
-		map.put("compression", "DEFLATE");
-		map.remove("fileExtension");
-		sink.open(map, mockSinkContext);
-		send(5000);
-		verify(mockRecord, times(5000)).ack();
-	}
+
+    @Test
+    public final void write100Test() throws Exception {
+        map.put("filenamePrefix", "write100Test-seq");
+        map.put("fileExtension", ".seq");
+        map.put("syncInterval", 1000);
+        sink.open(map, mockSinkContext);
+
+        assertNotNull(sink);
+        send(100);
+
+        Thread.sleep(2000);
+        verify(mockRecord, times(100)).ack();
+        sink.close();
+    }
+
+    @Test
+    public final void write5000Test() throws Exception {
+        map.put("filenamePrefix", "write5000Test-seq");
+        map.put("fileExtension", ".seq");
+        map.put("syncInterval", 1000);
+        sink.open(map, mockSinkContext);
+
+        assertNotNull(sink);
+        send(5000);
+
+        Thread.sleep(2000);
+        verify(mockRecord, times(5000)).ack();
+        sink.close();
+    }
+
+    @Test
+    public final void tenSecondTest() throws Exception {
+        map.put("filenamePrefix", "tenSecondTest-seq");
+        map.put("fileExtension", ".seq");
+        map.put("syncInterval", 1000);
+        sink.open(map, mockSinkContext);
+        runFor(10);
+        sink.close();
+    }
+
+    @Test
+    public final void bzip2CompressionTest() throws Exception {
+        map.put("filenamePrefix", "bzip2CompressionTest-seq");
+        map.put("compression", "BZIP2");
+        map.remove("fileExtension");
+        sink.open(map, mockSinkContext);
+        send(5000);
+        sink.close();
+        verify(mockRecord, times(5000)).ack();
+    }
+
+    @Test
+    public final void deflateCompressionTest() throws Exception {
+        map.put("filenamePrefix", "deflateCompressionTest-seq");
+        map.put("compression", "DEFLATE");
+        map.remove("fileExtension");
+        sink.open(map, mockSinkContext);
+        send(5000);
+        sink.close();
+        verify(mockRecord, times(5000)).ack();
+    }
 }
diff --git a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSinkTests.java b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSinkTests.java
index c0a051d8d838e..9b1357ba0a2ff 100644
--- a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSinkTests.java
+++ b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/seq/HdfsTextSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,85 +21,85 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertNotNull;
-
 import org.apache.pulsar.io.hdfs2.sink.AbstractHdfsSinkTest;
-import org.apache.pulsar.io.hdfs2.sink.seq.HdfsTextSink;
 import org.testng.annotations.Test;
 
 public class HdfsTextSinkTests extends AbstractHdfsSinkTest {
-    
+
     @Override
     protected void createSink() {
         sink = new HdfsTextSink();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void write100Test() throws Exception {
         map.put("filenamePrefix", "write100TestText-seq");
         map.put("fileExtension", ".seq");
         map.put("syncInterval", 1000);
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(sink);
         assertNotNull(mockRecord);
         send(100);
-        
+
         Thread.sleep(2000);
         verify(mockRecord, times(100)).ack();
         sink.close();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void write5000Test() throws Exception {
         map.put("filenamePrefix", "write5000TestText-seq");
         map.put("fileExtension", ".seq");
         map.put("syncInterval", 1000);
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(sink);
         assertNotNull(mockRecord);
         send(5000);
-        
+
         Thread.sleep(2000);
         verify(mockRecord, times(5000)).ack();
         sink.close();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void tenSecondTest() throws Exception {
         map.put("filenamePrefix", "tenSecondTestText-seq");
         map.put("fileExtension", ".seq");
         map.put("syncInterval", 1000);
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(mockRecord);
-        
-        runFor(10); 
+
+        runFor(10);
         sink.close();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void bzip2CompressionTest() throws Exception {
         map.put("filenamePrefix", "bzip2CompressionTestText-seq");
         map.put("compression", "BZIP2");
         map.remove("fileExtension");
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(mockRecord);
-        
+
         send(5000);
+        sink.close();
         verify(mockRecord, times(5000)).ack();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void deflateCompressionTest() throws Exception {
         map.put("filenamePrefix", "deflateCompressionTestText-seq");
         map.put("compression", "DEFLATE");
         map.remove("fileExtension");
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(mockRecord);
         send(5000);
+        sink.close();
         verify(mockRecord, times(5000)).ack();
     }
 }
diff --git a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSinkTests.java b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSinkTests.java
index 3e9f403df5d08..d0dff98e79e49 100644
--- a/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSinkTests.java
+++ b/pulsar-io/hdfs2/src/test/java/org/apache/pulsar/io/hdfs2/sink/text/HdfsStringSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,19 +20,17 @@
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-
 import org.apache.pulsar.io.hdfs2.sink.AbstractHdfsSinkTest;
-import org.apache.pulsar.io.hdfs2.sink.text.HdfsStringSink;
 import org.testng.annotations.Test;
 
 public class HdfsStringSinkTests extends AbstractHdfsSinkTest {
-	
+
     @Override
     protected void createSink() {
         sink = new HdfsStringSink();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void write5000Test() throws Exception {
         map.put("filenamePrefix", "write5000Test");
         map.put("fileExtension", ".txt");
@@ -43,42 +41,42 @@ public final void write5000Test() throws Exception {
         verify(mockRecord, times(5000)).ack();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void fiveByTwoThousandTest() throws Exception {
         map.put("filenamePrefix", "fiveByTwoThousandTest");
         map.put("fileExtension", ".txt");
         map.put("separator", '\n');
         sink.open(map, mockSinkContext);
-        
+
         for (int idx = 1; idx < 6; idx++) {
-        	send(2000);
+            send(2000);
         }
         sink.close();
         verify(mockRecord, times(2000 * 5)).ack();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void tenSecondTest() throws Exception {
         map.put("filenamePrefix", "tenSecondTest");
         map.put("fileExtension", ".txt");
         map.put("separator", '\n');
         sink.open(map, mockSinkContext);
-        runFor(10);	
+        runFor(10);
         sink.close();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void maxPendingRecordsTest() throws Exception {
         map.put("filenamePrefix", "maxPendingRecordsTest");
         map.put("fileExtension", ".txt");
         map.put("separator", '\n');
         map.put("maxPendingRecords", 500);
         sink.open(map, mockSinkContext);
-        runFor(10);	
+        runFor(10);
         sink.close();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void bzip2CompressionTest() throws Exception {
         map.put("filenamePrefix", "bzip2CompressionTest");
         map.put("compression", "BZIP2");
@@ -90,7 +88,7 @@ public final void bzip2CompressionTest() throws Exception {
         verify(mockRecord, times(5000)).ack();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void deflateCompressionTest() throws Exception {
         map.put("filenamePrefix", "deflateCompressionTest");
         map.put("compression", "DEFLATE");
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConfig.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConfig.java
index 32ee7da4821fe..a371c6131a6a2 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConfig.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConnector.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConnector.java
index c6edbe99cc8d8..1252020c53b40 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConnector.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/AbstractHdfsConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/Compression.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/Compression.java
index 81a96b07e97c4..ab128474fe1d9 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/Compression.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/Compression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/HdfsResources.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/HdfsResources.java
index 29ce81adf3fcd..f2657b66f400c 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/HdfsResources.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/HdfsResources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/SecurityUtil.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/SecurityUtil.java
index a005aa10e1503..a99db62fd39ea 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/SecurityUtil.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/SecurityUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/package-info.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/package-info.java
index 86fa537069efd..f10a427e888bb 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/package-info.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsAbstractSink.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsAbstractSink.java
index 04b982047130d..0a8f4d94cf8c6 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsAbstractSink.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfig.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfig.java
index 75a7cf0eee5f1..dc1584427609a 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfig.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSyncThread.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSyncThread.java
index 550d5e1938730..24aac838a9bc2 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSyncThread.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/HdfsSyncThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/package-info.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/package-info.java
index c419cbd941a59..bd9c4d3ecbcb2 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/package-info.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsAbstractSequenceFileSink.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsAbstractSequenceFileSink.java
index be7e988674970..049057a0497d7 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsAbstractSequenceFileSink.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsAbstractSequenceFileSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialTextSink.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialTextSink.java
index 3a0ebc070e1dc..4700b08e1ac93 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialTextSink.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialTextSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSink.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSink.java
index f4bbbbc6d44a2..b420f801a3709 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSink.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/package-info.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/package-info.java
index 2a30ad36ccf1f..31380c40d4ae1 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/package-info.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/seq/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsAbstractTextFileSink.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsAbstractTextFileSink.java
index e7c6294d29052..66fd7a629557c 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsAbstractTextFileSink.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsAbstractTextFileSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSink.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSink.java
index eeecc971203ae..7fa8ef99fd892 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSink.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/package-info.java b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/package-info.java
index 7d7f1abdbcfd7..25b6ac118d17a 100644
--- a/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/package-info.java
+++ b/pulsar-io/hdfs3/src/main/java/org/apache/pulsar/io/hdfs3/sink/text/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/AbstractHdfsSinkTest.java b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/AbstractHdfsSinkTest.java
index 5fd16796a8b5e..f1ee0ebba81b1 100644
--- a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/AbstractHdfsSinkTest.java
+++ b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/AbstractHdfsSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,15 +20,12 @@
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-
 import org.apache.pulsar.functions.api.Record;
 import org.apache.pulsar.io.core.SinkContext;
-import org.apache.pulsar.io.hdfs3.sink.HdfsAbstractSink;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -37,49 +34,54 @@
 /**
  * Simple base class for all the HDFS sink test cases.
  * Provides utility methods for sending records to the sink.
- *
  */
 public abstract class AbstractHdfsSinkTest {
-    
+
     @Mock
     protected SinkContext mockSinkContext;
-    
+
     @Mock
     protected Record mockRecord;
-    
+
     protected Map map;
     protected HdfsAbstractSink sink;
-    
+
     @SuppressWarnings("unchecked")
     @BeforeMethod(alwaysRun = true)
     public final void setUp() throws Exception {
-        map = new HashMap ();
+        map = new HashMap<>();
         map.put("hdfsConfigResources", "../pulsar/pulsar-io/hdfs/src/test/resources/hadoop/core-site.xml,"
                 + "../pulsar/pulsar-io/hdfs/src/test/resources/hadoop/hdfs-site.xml");
         map.put("directory", "/tmp/testing");
         map.put("filenamePrefix", "prefix");
-        
+
         mockSinkContext = mock(SinkContext.class);
-        
+
         mockRecord = mock(Record.class);
         when(mockRecord.getRecordSequence()).thenAnswer(new Answer>() {
-          long sequenceCounter = 0;
-          public Optional answer(InvocationOnMock invocation) throws Throwable {
-             return Optional.of(sequenceCounter++);
-          }});
-        
+            long sequenceCounter = 0;
+
+            public Optional answer(InvocationOnMock invocation) throws Throwable {
+                return Optional.of(sequenceCounter++);
+            }
+        });
+
         when(mockRecord.getKey()).thenAnswer(new Answer>() {
             long sequenceCounter = 0;
+
             public Optional answer(InvocationOnMock invocation) throws Throwable {
-               return Optional.of( "key-" + sequenceCounter++);
-            }});
-        
+                return Optional.of("key-" + sequenceCounter++);
+            }
+        });
+
         when(mockRecord.getValue()).thenAnswer(new Answer() {
             long sequenceCounter = 0;
+
             public String answer(InvocationOnMock invocation) throws Throwable {
-                 return new String( "value-" + sequenceCounter++ + "-" + UUID.randomUUID().toString());
-            }});
-        
+                return "value-" + sequenceCounter++ + "-" + UUID.randomUUID();
+            }
+        });
+
         createSink();
     }
 
@@ -90,7 +92,7 @@ protected final void send(int numRecords) throws Exception {
             sink.write(mockRecord);
         }
     }
-    
+
     protected final void runFor(int numSeconds) throws InterruptedException {
         Producer producer = new Producer();
         producer.start();
@@ -98,9 +100,10 @@ protected final void runFor(int numSeconds) throws InterruptedException {
         producer.halt();
         producer.join(2000);
     }
-    
+
     protected final class Producer extends Thread {
         public boolean keepRunning = true;
+
         @Override
         public void run() {
             while (keepRunning)
@@ -111,10 +114,10 @@ public void run() {
                     e.printStackTrace();
                 }
         }
-        
-        public void halt() { 
-            keepRunning = false; 
+
+        public void halt() {
+            keepRunning = false;
         }
-        
+
     }
 }
diff --git a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfigTests.java b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfigTests.java
index 2706795d1994c..5b66f294fa2b5 100644
--- a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfigTests.java
+++ b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/HdfsSinkConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialSinkTests.java b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialSinkTests.java
index 7c89f572a84f3..307ae59047b0c 100644
--- a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialSinkTests.java
+++ b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsSequentialSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,75 +21,75 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertNotNull;
-
 import org.apache.pulsar.io.hdfs3.sink.AbstractHdfsSinkTest;
-import org.apache.pulsar.io.hdfs3.sink.seq.HdfsSequentialTextSink;
 import org.testng.annotations.Test;
 
 public class HdfsSequentialSinkTests extends AbstractHdfsSinkTest {
-	
+
     @Override
     protected void createSink() {
         sink = new HdfsSequentialTextSink();
     }
-    
-    @Test(enabled = false)
-	public final void write100Test() throws Exception {
-		map.put("filenamePrefix", "write100Test-seq");
-		map.put("fileExtension", ".seq");
-		map.put("syncInterval", 1000);
-		sink.open(map, mockSinkContext);
-		
-		assertNotNull(sink);
-		send(100);
-		
-		Thread.sleep(2000);
-		verify(mockRecord, times(100)).ack();
-		sink.close();
-	}
-	
-	@Test(enabled = false)
-	public final void write5000Test() throws Exception {
-		map.put("filenamePrefix", "write5000Test-seq");
-		map.put("fileExtension", ".seq");
-		map.put("syncInterval", 1000);
-		sink.open(map, mockSinkContext);
-		
-		assertNotNull(sink);
-		send(5000);
-		
-		Thread.sleep(2000);
-		verify(mockRecord, times(5000)).ack();
-		sink.close();
-	}
-	
-	@Test(enabled = false)
-	public final void tenSecondTest() throws Exception {
-		map.put("filenamePrefix", "tenSecondTest-seq");
-		map.put("fileExtension", ".seq");
-		map.put("syncInterval", 1000);
-		sink.open(map, mockSinkContext);
-		runFor(10);	
-		sink.close();
-	}
-	
-	@Test(enabled = false)
-	public final void bzip2CompressionTest() throws Exception {
-		map.put("filenamePrefix", "bzip2CompressionTest-seq");
-		map.put("compression", "BZIP2");
-		map.remove("fileExtension");
-		sink.open(map, mockSinkContext);
-		send(5000);
-		verify(mockRecord, times(5000)).ack();
-	}
-	
-	@Test(enabled = false)
-	public final void deflateCompressionTest() throws Exception {
-		map.put("filenamePrefix", "deflateCompressionTest-seq");
-		map.put("compression", "DEFLATE");
-		map.remove("fileExtension");
-		sink.open(map, mockSinkContext);
-		send(5000);
-		verify(mockRecord, times(5000)).ack();
-	}
+
+    @Test
+    public final void write100Test() throws Exception {
+        map.put("filenamePrefix", "write100Test-seq");
+        map.put("fileExtension", ".seq");
+        map.put("syncInterval", 1000);
+        sink.open(map, mockSinkContext);
+
+        assertNotNull(sink);
+        send(100);
+
+        Thread.sleep(2000);
+        verify(mockRecord, times(100)).ack();
+        sink.close();
+    }
+
+    @Test
+    public final void write5000Test() throws Exception {
+        map.put("filenamePrefix", "write5000Test-seq");
+        map.put("fileExtension", ".seq");
+        map.put("syncInterval", 1000);
+        sink.open(map, mockSinkContext);
+
+        assertNotNull(sink);
+        send(5000);
+
+        Thread.sleep(2000);
+        verify(mockRecord, times(5000)).ack();
+        sink.close();
+    }
+
+    @Test
+    public final void tenSecondTest() throws Exception {
+        map.put("filenamePrefix", "tenSecondTest-seq");
+        map.put("fileExtension", ".seq");
+        map.put("syncInterval", 1000);
+        sink.open(map, mockSinkContext);
+        runFor(10);
+        sink.close();
+    }
+
+    @Test
+    public final void bzip2CompressionTest() throws Exception {
+        map.put("filenamePrefix", "bzip2CompressionTest-seq");
+        map.put("compression", "BZIP2");
+        map.remove("fileExtension");
+        sink.open(map, mockSinkContext);
+        send(5000);
+        sink.close();
+        verify(mockRecord, times(5000)).ack();
+    }
+
+    @Test
+    public final void deflateCompressionTest() throws Exception {
+        map.put("filenamePrefix", "deflateCompressionTest-seq");
+        map.put("compression", "DEFLATE");
+        map.remove("fileExtension");
+        sink.open(map, mockSinkContext);
+        send(5000);
+        sink.close();
+        verify(mockRecord, times(5000)).ack();
+    }
 }
diff --git a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSinkTests.java b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSinkTests.java
index a8c4238d2fe67..07b7dd21845b6 100644
--- a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSinkTests.java
+++ b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/seq/HdfsTextSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,85 +21,85 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertNotNull;
-
 import org.apache.pulsar.io.hdfs3.sink.AbstractHdfsSinkTest;
-import org.apache.pulsar.io.hdfs3.sink.seq.HdfsTextSink;
 import org.testng.annotations.Test;
 
 public class HdfsTextSinkTests extends AbstractHdfsSinkTest {
-    
+
     @Override
     protected void createSink() {
         sink = new HdfsTextSink();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void write100Test() throws Exception {
         map.put("filenamePrefix", "write100TestText-seq");
         map.put("fileExtension", ".seq");
         map.put("syncInterval", 1000);
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(sink);
         assertNotNull(mockRecord);
         send(100);
-        
+
         Thread.sleep(2000);
         verify(mockRecord, times(100)).ack();
         sink.close();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void write5000Test() throws Exception {
         map.put("filenamePrefix", "write5000TestText-seq");
         map.put("fileExtension", ".seq");
         map.put("syncInterval", 1000);
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(sink);
         assertNotNull(mockRecord);
         send(5000);
-        
+
         Thread.sleep(2000);
         verify(mockRecord, times(5000)).ack();
         sink.close();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void tenSecondTest() throws Exception {
         map.put("filenamePrefix", "tenSecondTestText-seq");
         map.put("fileExtension", ".seq");
         map.put("syncInterval", 1000);
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(mockRecord);
-        
-        runFor(10); 
+
+        runFor(10);
         sink.close();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void bzip2CompressionTest() throws Exception {
         map.put("filenamePrefix", "bzip2CompressionTestText-seq");
         map.put("compression", "BZIP2");
         map.remove("fileExtension");
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(mockRecord);
-        
+
         send(5000);
+        sink.close();
         verify(mockRecord, times(5000)).ack();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void deflateCompressionTest() throws Exception {
         map.put("filenamePrefix", "deflateCompressionTestText-seq");
         map.put("compression", "DEFLATE");
         map.remove("fileExtension");
         sink.open(map, mockSinkContext);
-        
+
         assertNotNull(mockRecord);
         send(5000);
+        sink.close();
         verify(mockRecord, times(5000)).ack();
     }
 }
diff --git a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSinkTests.java b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSinkTests.java
index a63974e33ffe1..87d6ba8f4371e 100644
--- a/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSinkTests.java
+++ b/pulsar-io/hdfs3/src/test/java/org/apache/pulsar/io/hdfs3/sink/text/HdfsStringSinkTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,19 +20,17 @@
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-
 import org.apache.pulsar.io.hdfs3.sink.AbstractHdfsSinkTest;
-import org.apache.pulsar.io.hdfs3.sink.text.HdfsStringSink;
 import org.testng.annotations.Test;
 
 public class HdfsStringSinkTests extends AbstractHdfsSinkTest {
-	
+
     @Override
     protected void createSink() {
         sink = new HdfsStringSink();
     }
-    
-    @Test(enabled = false)
+
+    @Test
     public final void write5000Test() throws Exception {
         map.put("filenamePrefix", "write5000Test");
         map.put("fileExtension", ".txt");
@@ -41,9 +39,9 @@ public final void write5000Test() throws Exception {
         send(5000);
         sink.close();
         verify(mockRecord, times(5000)).ack();
-	}
-	
-    @Test(enabled = false)
+    }
+
+    @Test
     public final void fiveByTwoThousandTest() throws Exception {
         map.put("filenamePrefix", "fiveByTwoThousandTest");
         map.put("fileExtension", ".txt");
@@ -51,34 +49,34 @@ public final void fiveByTwoThousandTest() throws Exception {
         sink.open(map, mockSinkContext);
 
         for (int idx = 1; idx < 6; idx++) {
-           send(2000);
+            send(2000);
         }
         sink.close();
         verify(mockRecord, times(2000 * 5)).ack();
     }
-	
-    @Test(enabled = false)
+
+    @Test
     public final void tenSecondTest() throws Exception {
         map.put("filenamePrefix", "tenSecondTest");
         map.put("fileExtension", ".txt");
         map.put("separator", '\n');
         sink.open(map, mockSinkContext);
-        runFor(10);	
+        runFor(10);
         sink.close();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void maxPendingRecordsTest() throws Exception {
         map.put("filenamePrefix", "maxPendingRecordsTest");
         map.put("fileExtension", ".txt");
         map.put("separator", '\n');
         map.put("maxPendingRecords", 500);
         sink.open(map, mockSinkContext);
-        runFor(10);	
+        runFor(10);
         sink.close();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void bzip2CompressionTest() throws Exception {
         map.put("filenamePrefix", "bzip2CompressionTest");
         map.put("compression", "BZIP2");
@@ -90,7 +88,7 @@ public final void bzip2CompressionTest() throws Exception {
         verify(mockRecord, times(5000)).ack();
     }
 
-    @Test(enabled = false)
+    @Test
     public final void deflateCompressionTest() throws Exception {
         map.put("filenamePrefix", "deflateCompressionTest");
         map.put("compression", "DEFLATE");
diff --git a/pulsar-io/http/pom.xml b/pulsar-io/http/pom.xml
new file mode 100644
index 0000000000000..b190b0f5cc124
--- /dev/null
+++ b/pulsar-io/http/pom.xml
@@ -0,0 +1,86 @@
+
+
+    4.0.0
+    
+        org.apache.pulsar
+        pulsar-io
+        2.11.0-SNAPSHOT
+    
+
+    pulsar-io-http
+    Pulsar IO :: HTTP
+
+    
+
+        
+            ${project.groupId}
+            pulsar-io-core
+            ${project.version}
+        
+
+        
+            com.fasterxml.jackson.core
+            jackson-databind
+        
+
+        
+            com.fasterxml.jackson.dataformat
+            jackson-dataformat-yaml
+        
+
+        
+            com.fasterxml.jackson.datatype
+            jackson-datatype-jsr310
+        
+
+        
+            org.apache.avro
+            avro
+            ${avro.version}
+        
+
+        
+            org.apache.pulsar
+            pulsar-client-original
+            ${project.version}
+            test
+        
+
+        
+            com.github.tomakehurst
+            wiremock-jre8
+            ${wiremock.version}
+            test
+        
+
+    
+
+    
+        
+            
+                org.apache.nifi
+                nifi-nar-maven-plugin
+            
+        
+    
+
diff --git a/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/HttpSink.java b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/HttpSink.java
new file mode 100644
index 0000000000000..31b5053ba7a18
--- /dev/null
+++ b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/HttpSink.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.http;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.api.schema.GenericObject;
+import org.apache.pulsar.client.api.schema.KeyValueSchema;
+import org.apache.pulsar.functions.api.Record;
+import org.apache.pulsar.io.core.Sink;
+import org.apache.pulsar.io.core.SinkContext;
+
+/**
+ * A Sink that makes a POST request to a configured HTTP endpoint for each record (webhook).
+ * The body of the HTTP request is the JSON representation of the record value.
+ * Some headers are added to the HTTP request:
+ * 
      
+ *   
    • PulsarTopic: the topic of the record
      • 
+ *   
    • PulsarKey: the key of the record
      • 
+ *   
    • PulsarEventTime: the event time of the record
      • 
+ *   
    • PulsarPublishTime: the publish time of the record
      • 
+ *   
    • PulsarMessageId: the ID of the message contained in the record
      • 
+ *   
    • PulsarProperties-*: each record property is passed with the property name prefixed by PulsarProperties-
      • 
+ * 
    
+ */
+public class HttpSink implements Sink {
+
+    HttpSinkConfig httpSinkConfig;
+    private HttpClient httpClient;
+    private ObjectMapper mapper;
+    private URI uri;
+
+    @Override
+    public void open(Map config, SinkContext sinkContext) throws Exception {
+        httpSinkConfig = HttpSinkConfig.load(config);
+        uri = new URI(httpSinkConfig.getUrl());
+        httpClient = HttpClient.newHttpClient();
+        mapper = new ObjectMapper().registerModule(new JavaTimeModule());
+    }
+
+    @Override
+    public void write(Record record) throws Exception {
+        Object json = toJsonSerializable(record.getSchema(), record.getValue().getNativeObject());
+        byte[] bytes = mapper.writeValueAsBytes(json);
+        HttpRequest.Builder builder = HttpRequest.newBuilder()
+            .uri(uri)
+            .POST(HttpRequest.BodyPublishers.ofByteArray(bytes));
+        httpSinkConfig.getHeaders().forEach(builder::header);
+        record.getProperties().forEach((k, v) -> builder.header("PulsarProperties-" + k, v));
+        record.getTopicName().ifPresent(topic -> builder.header("PulsarTopic", topic));
+        record.getEventTime().ifPresent(eventTime -> builder.header("PulsarEventTime", eventTime.toString()));
+        record.getKey().ifPresent(key -> builder.header("PulsarKey", key));
+        record.getMessage().ifPresent(
+            message -> {
+              if (message.getMessageId() != null) {
+                String messageId = Base64.getEncoder().encodeToString(message.getMessageId().toByteArray());
+                builder.header("PulsarMessageId", messageId);
+              }
+              if (message.getPublishTime() != 0) {
+                builder.header("PulsarPublishTime", String.valueOf(message.getPublishTime()));
+              }
+            }
+        );
+        builder.header("Content-Type", "application/json");
+
+        HttpResponse response = httpClient.send(builder.build(), HttpResponse.BodyHandlers.ofString());
+
+        if (response.statusCode() < 200 || response.statusCode() >= 300) {
+            throw new IOException(
+                String.format("HTTP call to %s failed with status code %s", uri, response.statusCode()));
+        }
+
+    }
+
+    private static Object toJsonSerializable(Schema schema, Object val) {
+        if (schema == null || schema.getSchemaInfo().getType().isPrimitive()) {
+            return val;
+        }
+        switch (schema.getSchemaInfo().getType()) {
+            case KEY_VALUE:
+                KeyValueSchema keyValueSchema = (KeyValueSchema) schema;
+                org.apache.pulsar.common.schema.KeyValue keyValue =
+                    (org.apache.pulsar.common.schema.KeyValue) val;
+                Map jsonKeyValue = new HashMap<>();
+                Object key = keyValue.getKey();
+                Object value = keyValue.getValue();
+                jsonKeyValue.put("key", toJsonSerializable(keyValueSchema.getKeySchema(),
+                    key instanceof GenericObject ? ((GenericObject) key).getNativeObject() : key));
+                jsonKeyValue.put("value", toJsonSerializable(keyValueSchema.getValueSchema(),
+                    value instanceof GenericObject ? ((GenericObject) value).getNativeObject() : value));
+                return jsonKeyValue;
+            case AVRO:
+                return JsonConverter.toJson((org.apache.avro.generic.GenericRecord) val);
+            case JSON:
+                return val;
+            default:
+                throw new UnsupportedOperationException("Unsupported schema type ="
+                    + schema.getSchemaInfo().getType());
+        }
+    }
+
+    @Override
+    public void close() {}
+}
diff --git a/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/HttpSinkConfig.java b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/HttpSinkConfig.java
new file mode 100644
index 0000000000000..2113aec720686
--- /dev/null
+++ b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/HttpSinkConfig.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.pulsar.io.http;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.pulsar.io.core.annotations.FieldDoc;
+
+@Data
+@Accessors(chain = true)
+public class HttpSinkConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @FieldDoc(
+        defaultValue = "http://localhost",
+        help = "The URL of the HTTP server")
+    private String url = "http://localhost";
+
+    @FieldDoc(
+        defaultValue = "",
+        help = "The list of default headers added to each request")
+    private Map headers = new HashMap<>();
+
+    public static HttpSinkConfig load(String yamlFile) throws IOException {
+        ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+        return mapper.readValue(new File(yamlFile), HttpSinkConfig.class);
+    }
+
+    public static HttpSinkConfig load(Map map) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.readValue(new ObjectMapper().writeValueAsString(map), HttpSinkConfig.class);
+    }
+}
diff --git a/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/JsonConverter.java b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/JsonConverter.java
new file mode 100644
index 0000000000000..65ae6e876047e
--- /dev/null
+++ b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/JsonConverter.java
@@ -0,0 +1,241 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.io.http;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.avro.Conversion;
+import org.apache.avro.Conversions;
+import org.apache.avro.Schema;
+import org.apache.avro.data.TimeConversions;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericFixed;
+import org.apache.avro.generic.GenericRecord;
+
+/**
+ * Convert an AVRO GenericRecord to a JsonNode.
+ */
+public class JsonConverter {
+
+    private static final Map> logicalTypeConverters = new HashMap<>();
+    private static final JsonNodeFactory jsonNodeFactory = JsonNodeFactory.withExactBigDecimals(true);
+
+    public static JsonNode topLevelMerge(JsonNode n1, JsonNode n2) {
+        ObjectNode objectNode = jsonNodeFactory.objectNode();
+        n1.fieldNames().forEachRemaining(f -> objectNode.put(f, n1.get(f)));
+        n2.fieldNames().forEachRemaining(f -> objectNode.put(f, n2.get(f)));
+        return objectNode;
+    }
+
+    public static JsonNode toJson(GenericRecord genericRecord) {
+        if (genericRecord == null) {
+            return null;
+        }
+        ObjectNode objectNode = jsonNodeFactory.objectNode();
+        for (Schema.Field field : genericRecord.getSchema().getFields()) {
+            objectNode.set(field.name(), toJson(field.schema(), genericRecord.get(field.name())));
+        }
+        return objectNode;
+    }
+
+    public static JsonNode toJson(Schema schema, Object value) {
+        if (schema.getLogicalType() != null && logicalTypeConverters.containsKey(schema.getLogicalType().getName())) {
+            return logicalTypeConverters.get(schema.getLogicalType().getName()).toJson(schema, value);
+        }
+        if (value == null) {
+            return jsonNodeFactory.nullNode();
+        }
+        switch(schema.getType()) {
+            case NULL: // this should not happen
+                return jsonNodeFactory.nullNode();
+            case INT:
+                return jsonNodeFactory.numberNode((Integer) value);
+            case LONG:
+                return jsonNodeFactory.numberNode((Long) value);
+            case DOUBLE:
+                return jsonNodeFactory.numberNode((Double) value);
+            case FLOAT:
+                return jsonNodeFactory.numberNode((Float) value);
+            case BOOLEAN:
+                return jsonNodeFactory.booleanNode((Boolean) value);
+            case BYTES:
+                return jsonNodeFactory.binaryNode((byte[]) value);
+            case FIXED:
+                return jsonNodeFactory.binaryNode(((GenericFixed) value).bytes());
+            case ENUM: // GenericEnumSymbol
+            case STRING:
+                return jsonNodeFactory.textNode(value.toString()); // can be a String or org.apache.avro.util.Utf8
+            case ARRAY: {
+                Schema elementSchema = schema.getElementType();
+                ArrayNode arrayNode = jsonNodeFactory.arrayNode();
+                Object[] iterable;
+                if (value instanceof GenericData.Array) {
+                    iterable = ((GenericData.Array) value).toArray();
+                } else {
+                    iterable = (Object[]) value;
+                }
+                for (Object elem : iterable) {
+                    JsonNode fieldValue = toJson(elementSchema, elem);
+                    arrayNode.add(fieldValue);
+                }
+                return arrayNode;
+            }
+            case MAP: {
+                Map map = (Map) value;
+                ObjectNode objectNode = jsonNodeFactory.objectNode();
+                for (Map.Entry entry : map.entrySet()) {
+                    JsonNode jsonNode = toJson(schema.getValueType(), entry.getValue());
+                    // can be a String or org.apache.avro.util.Utf8
+                    final String entryKey = entry.getKey() == null ? null : entry.getKey().toString();
+                    objectNode.set(entryKey, jsonNode);
+                }
+                return objectNode;
+            }
+            case RECORD:
+                return toJson((GenericRecord) value);
+            case UNION:
+                for (Schema s : schema.getTypes()) {
+                    if (s.getType() == Schema.Type.NULL) {
+                        continue;
+                    }
+                    return toJson(s, value);
+                }
+                // this case should not happen
+                return jsonNodeFactory.textNode(value.toString());
+            default:
+                throw new UnsupportedOperationException("Unknown AVRO schema type=" + schema.getType());
+        }
+    }
+
+    abstract static class LogicalTypeConverter {
+        final Conversion conversion;
+
+        public LogicalTypeConverter(Conversion conversion) {
+            this.conversion = conversion;
+        }
+
+        abstract JsonNode toJson(Schema schema, Object value);
+    }
+
+    static {
+        logicalTypeConverters.put("decimal", new LogicalTypeConverter(
+                new Conversions.DecimalConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                if (!(value instanceof BigDecimal)) {
+                    throw new IllegalArgumentException("Invalid type for Decimal, expected BigDecimal but was "
+                            + value.getClass());
+                }
+                BigDecimal decimal = (BigDecimal) value;
+                return jsonNodeFactory.numberNode(decimal);
+            }
+        });
+        logicalTypeConverters.put("date", new LogicalTypeConverter(
+                new TimeConversions.DateConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                if (!(value instanceof Integer)) {
+                    throw new IllegalArgumentException("Invalid type for date, expected Integer but was "
+                            + value.getClass());
+                }
+                Integer daysFromEpoch = (Integer) value;
+                return jsonNodeFactory.numberNode(daysFromEpoch);
+            }
+        });
+        logicalTypeConverters.put("time-millis", new LogicalTypeConverter(
+                new TimeConversions.TimeMillisConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                if (!(value instanceof Integer)) {
+                    throw new IllegalArgumentException("Invalid type for time-millis, expected Integer but was "
+                            + value.getClass());
+                }
+                Integer timeMillis = (Integer) value;
+                return jsonNodeFactory.numberNode(timeMillis);
+            }
+        });
+        logicalTypeConverters.put("time-micros", new LogicalTypeConverter(
+                new TimeConversions.TimeMicrosConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                if (!(value instanceof Long)) {
+                    throw new IllegalArgumentException("Invalid type for time-micros, expected Long but was "
+                            + value.getClass());
+                }
+                Long timeMicro = (Long) value;
+                return jsonNodeFactory.numberNode(timeMicro);
+            }
+        });
+        logicalTypeConverters.put("timestamp-millis", new LogicalTypeConverter(
+                new TimeConversions.TimestampMillisConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                if (!(value instanceof Long)) {
+                    throw new IllegalArgumentException("Invalid type for timestamp-millis, expected Long but was "
+                            + value.getClass());
+                }
+                Long epochMillis = (Long) value;
+                return jsonNodeFactory.numberNode(epochMillis);
+            }
+        });
+        logicalTypeConverters.put("timestamp-micros", new LogicalTypeConverter(
+                new TimeConversions.TimestampMicrosConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                if (!(value instanceof Long)) {
+                    throw new IllegalArgumentException("Invalid type for timestamp-micros, expected Long but was "
+                            + value.getClass());
+                }
+                Long epochMillis = (Long) value;
+                return jsonNodeFactory.numberNode(epochMillis);
+            }
+        });
+        logicalTypeConverters.put("uuid", new LogicalTypeConverter(
+                new Conversions.UUIDConversion()) {
+            @Override
+            JsonNode toJson(Schema schema, Object value) {
+                return jsonNodeFactory.textNode(value == null ? null : value.toString());
+            }
+        });
+    }
+
+    public static ArrayNode toJsonArray(JsonNode jsonNode, List fields) {
+        ArrayNode arrayNode = jsonNodeFactory.arrayNode();
+        Iterator it = jsonNode.fieldNames();
+        while (it.hasNext()) {
+            String fieldName = it.next();
+            if (fields.contains(fieldName)) {
+                arrayNode.add(jsonNode.get(fieldName));
+            }
+        }
+        return arrayNode;
+    }
+
+}
diff --git a/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/package-info.java b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/package-info.java
new file mode 100644
index 0000000000000..87131fdf3be8c
--- /dev/null
+++ b/pulsar-io/http/src/main/java/org/apache/pulsar/io/http/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.io.http;
diff --git a/pulsar-io/http/src/main/resources/META-INF/services/pulsar-io.yaml b/pulsar-io/http/src/main/resources/META-INF/services/pulsar-io.yaml
new file mode 100644
index 0000000000000..bdd1712b9249a
--- /dev/null
+++ b/pulsar-io/http/src/main/resources/META-INF/services/pulsar-io.yaml
@@ -0,0 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: http
+description: Writes data to an HTTP server (Webhook)
+sinkClass: org.apache.pulsar.io.http.HttpSink
+sinkConfigClass: org.apache.pulsar.io.http.HttpSinkConfig
diff --git a/pulsar-io/http/src/test/java/org/apache/pulsar/io/http/HttpSinkTest.java b/pulsar-io/http/src/test/java/org/apache/pulsar/io/http/HttpSinkTest.java
new file mode 100644
index 0000000000000..d5de27d628407
--- /dev/null
+++ b/pulsar-io/http/src/test/java/org/apache/pulsar/io/http/HttpSinkTest.java
@@ -0,0 +1,445 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.io.http;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import java.io.IOException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.api.schema.GenericObject;
+import org.apache.pulsar.client.api.schema.GenericRecord;
+import org.apache.pulsar.client.api.schema.GenericSchema;
+import org.apache.pulsar.client.api.schema.RecordSchemaBuilder;
+import org.apache.pulsar.client.api.schema.SchemaBuilder;
+import org.apache.pulsar.client.impl.MessageIdImpl;
+import org.apache.pulsar.client.impl.schema.KeyValueSchemaImpl;
+import org.apache.pulsar.common.api.EncryptionContext;
+import org.apache.pulsar.common.schema.KeyValue;
+import org.apache.pulsar.common.schema.KeyValueEncodingType;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.functions.api.Record;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class HttpSinkTest {
+
+    WireMockServer server;
+
+    @BeforeClass
+    public void setUp() {
+        server = new WireMockServer(0);
+        server.start();
+        configureFor(server.port());
+        stubFor(post(urlPathEqualTo("/"))
+            .willReturn(aResponse().withStatus(200)));
+    }
+
+    @AfterClass
+    public void tearDown() {
+        server.stop();
+    }
+
+    @DataProvider(name = "primitives")
+    public Object[][] primitives() {
+        return new Object[][]{
+            new Object[] {Schema.STRING, "test-string", "\"test-string\""},
+            new Object[] {Schema.INT8, (byte) 42, "42"},
+            new Object[] {Schema.INT16, (short) 42, "42"},
+            new Object[] {Schema.INT32, 42, "42"},
+            new Object[] {Schema.INT64, 42L, "42"},
+            new Object[] {Schema.BOOL, true, "true"},
+            new Object[] {Schema.FLOAT, 0.1F, "0.1"},
+            new Object[] {Schema.DOUBLE, 0.1D, "0.1"},
+            new Object[] {Schema.DATE, new Date(1662418008047L), "1662418008047"},
+            new Object[] {Schema.TIME, new Time(0, 46, 48), "\"00:46:48\""},
+            new Object[] {Schema.TIMESTAMP, new Timestamp(1662418008047L), "1662418008047"},
+            new Object[] {Schema.INSTANT, Instant.ofEpochMilli(1662418008047L), "1662418008.047000000"},
+            new Object[] {Schema.LOCAL_DATE, LocalDate.of(2022, 1, 1), "[2022,1,1]"},
+            new Object[] {Schema.LOCAL_TIME, LocalTime.of(11, 12), "[11,12]"},
+            new Object[] {Schema.LOCAL_DATE_TIME, new Timestamp(1662418008047L), "1662418008047"},
+        };
+    }
+
+    @Test(dataProvider = "primitives")
+    public void testPrimitives(Schema schema, Object value, String responseBody) throws Exception {
+        GenericObject genericObject = new GenericObject() {
+            @Override
+            public SchemaType getSchemaType() {
+                return null;
+            }
+
+            @Override
+            public Object getNativeObject() {
+                return value;
+            }
+        };
+        test(schema, genericObject, responseBody);
+    }
+
+    @DataProvider(name = "schema")
+    public Object[][] schema() {
+        return new Object[][]{
+            new Object[]{Schema.JSON(Object.class)},
+            new Object[]{Schema.AVRO(Object.class)},
+        };
+    }
+
+    @Test(dataProvider = "schema")
+    public void testGenericRecord(Schema schema) throws Exception {
+        SchemaType schemaType = schema.getSchemaInfo().getType();
+        RecordSchemaBuilder valueSchemaBuilder = org.apache.pulsar.client.api.schema.SchemaBuilder.record("value");
+        valueSchemaBuilder.field("c").type(SchemaType.STRING).optional().defaultValue(null);
+        valueSchemaBuilder.field("d").type(SchemaType.INT32).optional().defaultValue(null);
+        RecordSchemaBuilder udtSchemaBuilder = SchemaBuilder.record("type1");
+        udtSchemaBuilder.field("a").type(SchemaType.STRING).optional().defaultValue(null);
+        udtSchemaBuilder.field("b").type(SchemaType.BOOLEAN).optional().defaultValue(null);
+        udtSchemaBuilder.field("d").type(SchemaType.DOUBLE).optional().defaultValue(null);
+        udtSchemaBuilder.field("f").type(SchemaType.FLOAT).optional().defaultValue(null);
+        udtSchemaBuilder.field("i").type(SchemaType.INT32).optional().defaultValue(null);
+        udtSchemaBuilder.field("l").type(SchemaType.INT64).optional().defaultValue(null);
+        GenericSchema udtGenericSchema = Schema.generic(udtSchemaBuilder.build(schemaType));
+        valueSchemaBuilder.field("e", udtGenericSchema).type(schemaType).optional().defaultValue(null);
+        GenericSchema valueSchema = Schema.generic(valueSchemaBuilder.build(schemaType));
+
+        GenericRecord valueGenericRecord = valueSchema.newRecordBuilder()
+            .set("c", "1")
+            .set("d", 1)
+            .set("e", udtGenericSchema.newRecordBuilder()
+                .set("a", "a")
+                .set("b", true)
+                .set("d", 1.0)
+                .set("f", 1.0f)
+                .set("i", 1)
+                .set("l", 10L)
+                .build())
+            .build();
+
+        String responseBody =
+            "{\"c\":\"1\",\"d\":1,\"e\":{\"a\":\"a\",\"b\":true,\"d\":1.0,\"f\":1.0,\"i\":1,\"l\":10}}";
+        test(schema, valueGenericRecord, responseBody);
+    }
+
+    @Test
+    public void testKeyValuePrimitives() throws Exception {
+        Schema> keyValueSchema = KeyValueSchemaImpl.of(Schema.STRING, Schema.STRING);
+        GenericObject genericObject = new GenericObject() {
+            @Override
+            public SchemaType getSchemaType() {
+                return null;
+            }
+
+            @Override
+            public Object getNativeObject() {
+                return new KeyValue<>("test-key", "test-value");
+            }
+        };
+        test(keyValueSchema, genericObject, "{\"value\":\"test-value\",\"key\":\"test-key\"}");
+    }
+
+    @Test(dataProvider = "schema")
+    public void testKeyValueGenericRecord(Schema schema) throws Exception {
+        SchemaType schemaType = schema.getSchemaInfo().getType();
+        RecordSchemaBuilder keySchemaBuilder = org.apache.pulsar.client.api.schema.SchemaBuilder.record("key");
+        keySchemaBuilder.field("a").type(SchemaType.STRING).optional().defaultValue(null);
+        keySchemaBuilder.field("b").type(SchemaType.INT32).optional().defaultValue(null);
+        GenericSchema keySchema = Schema.generic(keySchemaBuilder.build(schemaType));
+        GenericRecord keyGenericRecord = keySchema.newRecordBuilder()
+            .set("a", "1")
+            .set("b", 1)
+            .build();
+
+        RecordSchemaBuilder valueSchemaBuilder = org.apache.pulsar.client.api.schema.SchemaBuilder.record("value");
+        valueSchemaBuilder.field("c").type(SchemaType.STRING).optional().defaultValue(null);
+        valueSchemaBuilder.field("d").type(SchemaType.INT32).optional().defaultValue(null);
+        RecordSchemaBuilder udtSchemaBuilder = SchemaBuilder.record("type1");
+        udtSchemaBuilder.field("a").type(SchemaType.STRING).optional().defaultValue(null);
+        udtSchemaBuilder.field("b").type(SchemaType.BOOLEAN).optional().defaultValue(null);
+        udtSchemaBuilder.field("d").type(SchemaType.DOUBLE).optional().defaultValue(null);
+        udtSchemaBuilder.field("f").type(SchemaType.FLOAT).optional().defaultValue(null);
+        udtSchemaBuilder.field("i").type(SchemaType.INT32).optional().defaultValue(null);
+        udtSchemaBuilder.field("l").type(SchemaType.INT64).optional().defaultValue(null);
+        GenericSchema udtGenericSchema = Schema.generic(udtSchemaBuilder.build(schemaType));
+        valueSchemaBuilder.field("e", udtGenericSchema).type(schemaType).optional().defaultValue(null);
+        GenericSchema valueSchema = Schema.generic(valueSchemaBuilder.build(schemaType));
+
+        GenericRecord valueGenericRecord = valueSchema.newRecordBuilder()
+            .set("c", "1")
+            .set("d", 1)
+            .set("e", udtGenericSchema.newRecordBuilder()
+                .set("a", "a")
+                .set("b", true)
+                .set("d", 1.0)
+                .set("f", 1.0f)
+                .set("i", 1)
+                .set("l", 10L)
+                .build())
+            .build();
+
+        Schema> keyValueSchema = Schema.KeyValue(keySchema, valueSchema, KeyValueEncodingType.INLINE);
+        KeyValue keyValue = new KeyValue<>(keyGenericRecord, valueGenericRecord);
+        GenericObject genericObject = new GenericObject() {
+            @Override
+            public SchemaType getSchemaType() {
+                return SchemaType.KEY_VALUE;
+            }
+
+            @Override
+            public Object getNativeObject() {
+                return keyValue;
+            }
+        };
+        String responseBody = "{\"value\":{\"c\":\"1\",\"d\":1,\"e\":{\"a\":\"a\",\"b\":true,\"d\":1.0,\"f\":1.0,"
+            + "\"i\":1,\"l\":10}},\"key\":{\"a\":\"1\",\"b\":1}}";
+        test(keyValueSchema, genericObject, responseBody);
+    }
+
+    private void test(Schema schema, GenericObject genericObject, String responseBody) throws Exception {
+        HttpSink httpSink = new HttpSink();
+        Map config = new HashMap<>();
+        config.put("url", server.baseUrl());
+        Map headers = new HashMap<>();
+        headers.put("header-name", "header-value");
+        config.put("headers", headers);
+        httpSink.open(config, null);
+
+        long now = 1662418008000L;
+        Map messageProperties = new HashMap<>();
+        messageProperties.put("prop-name", "prop-value");
+
+        Record record = new Record<>() {
+            @Override
+            public GenericObject getValue() {
+                return genericObject;
+            }
+
+            @Override
+            public Schema getSchema() {
+                return schema;
+            }
+
+            @Override
+            public Optional getEventTime() {
+                return Optional.of(now);
+            }
+
+            @Override
+            public Map getProperties() {
+                return messageProperties;
+            }
+
+            @Override
+            public Optional getTopicName() {
+                return Optional.of("test-topic");
+            }
+
+            @Override
+            public Optional getKey() {
+                return Optional.of("test-key");
+            }
+
+            @Override
+            public Optional> getMessage() {
+                return Optional.of(new Message<>() {
+
+                    @Override
+                    public Map getProperties() {
+                        return null;
+                    }
+
+                    @Override
+                    public boolean hasProperty(String name) {
+                        return false;
+                    }
+
+                    @Override
+                    public String getProperty(String name) {
+                        return null;
+                    }
+
+                    @Override
+                    public byte[] getData() {
+                        return new byte[0];
+                    }
+
+                    @Override
+                    public int size() {
+                        return 0;
+                    }
+
+                    @Override
+                    public GenericObject getValue() {
+                        return null;
+                    }
+
+                    @Override
+                    public MessageId getMessageId() {
+                        return new MessageIdImpl(1, 2, 3);
+                    }
+
+                    @Override
+                    public long getPublishTime() {
+                        return now + 1;
+                    }
+
+                    @Override
+                    public long getEventTime() {
+                        return 0;
+                    }
+
+                    @Override
+                    public long getSequenceId() {
+                        return 0;
+                    }
+
+                    @Override
+                    public String getProducerName() {
+                        return null;
+                    }
+
+                    @Override
+                    public boolean hasKey() {
+                        return false;
+                    }
+
+                    @Override
+                    public String getKey() {
+                        return null;
+                    }
+
+                    @Override
+                    public boolean hasBase64EncodedKey() {
+                        return false;
+                    }
+
+                    @Override
+                    public byte[] getKeyBytes() {
+                        return new byte[0];
+                    }
+
+                    @Override
+                    public boolean hasOrderingKey() {
+                        return false;
+                    }
+
+                    @Override
+                    public byte[] getOrderingKey() {
+                        return new byte[0];
+                    }
+
+                    @Override
+                    public String getTopicName() {
+                        return null;
+                    }
+
+                    @Override
+                    public Optional getEncryptionCtx() {
+                        return Optional.empty();
+                    }
+
+                    @Override
+                    public int getRedeliveryCount() {
+                        return 0;
+                    }
+
+                    @Override
+                    public byte[] getSchemaVersion() {
+                        return new byte[0];
+                    }
+
+                    @Override
+                    public boolean isReplicated() {
+                        return false;
+                    }
+
+                    @Override
+                    public String getReplicatedFrom() {
+                        return null;
+                    }
+
+                    @Override
+                    public void release() {
+
+                    }
+
+                    @Override
+                    public boolean hasBrokerPublishTime() {
+                        return false;
+                    }
+
+                    @Override
+                    public Optional getBrokerPublishTime() {
+                        return Optional.empty();
+                    }
+
+                    @Override
+                    public boolean hasIndex() {
+                        return false;
+                    }
+
+                    @Override
+                    public Optional getIndex() {
+                        return Optional.empty();
+                    }
+                });
+            }
+        };
+        httpSink.write(record);
+
+        verify(postRequestedFor(urlEqualTo("/"))
+            .withRequestBody(equalTo(responseBody))
+            .withHeader("Content-Type", equalTo("application/json"))
+            .withHeader("header-name", equalTo("header-value"))
+            .withHeader("PulsarTopic", equalTo("test-topic"))
+            .withHeader("PulsarKey", equalTo("test-key"))
+            .withHeader("PulsarEventTime", equalTo("1662418008000"))
+            .withHeader("PulsarPublishTime", equalTo("1662418008001"))
+            .withHeader("PulsarMessageId", equalTo("CAEQAhgDMAA="))
+            .withHeader("PulsarProperties-prop-name", equalTo("prop-value"))
+        );
+    }
+
+    @Test(expectedExceptions = IOException.class)
+    public void testRequestFailure() throws Exception {
+        stubFor(post(urlPathEqualTo("/"))
+            .willReturn(aResponse().withStatus(500)));
+
+        testKeyValuePrimitives();
+    }
+}
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/BatchSink.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/BatchSink.java
index 014410888ad75..98ffa5fdd452b 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/BatchSink.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/BatchSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSink.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSink.java
index 6acb1b99787ed..5b51461fc7b8e 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSink.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/package-info.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/package-info.java
index 1e9f5661a8179..acb2bda59ca57 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/package-info.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBAbstractSink.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBAbstractSink.java
index 1ca9b05567133..06856bad80edc 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBAbstractSink.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilder.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilder.java
index e71145fc8244b..acfd703286011 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilder.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilderImpl.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilderImpl.java
index 760592148efc8..6e6cf11574870 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilderImpl.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSink.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSink.java
index bc4e32b7d9198..55c747a8c92e3 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSink.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfig.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfig.java
index 97bb7ee753cfc..5dc8f3a1e64af 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfig.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/package-info.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/package-info.java
index 7a4728f13578b..50fa8d3ef0c82 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/package-info.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v1/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilder.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilder.java
index 20a7f56875033..fb6f200aa1159 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilder.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilderImpl.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilderImpl.java
index 45b565f48cc9d..3283724bdb022 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilderImpl.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBClientBuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSink.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSink.java
index 0938ab22058fe..08f1ab2339992 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSink.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfig.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfig.java
index 247c3ad06a4f0..b79db8bbc2a34 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfig.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/package-info.java b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/package-info.java
index d3314287eed5e..6b18d5934b9bb 100644
--- a/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/package-info.java
+++ b/pulsar-io/influxdb/src/main/java/org/apache/pulsar/io/influxdb/v2/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
index fea40a71dfa37..92786811bd5bf 100644
--- a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
+++ b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/InfluxDBGenericRecordSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSinkTest.java b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSinkTest.java
index 1990495456b6c..bf57f3f989f2b 100644
--- a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSinkTest.java
+++ b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBGenericRecordSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfigTest.java b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfigTest.java
index 7467fd858aba1..4493dcfb24854 100644
--- a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfigTest.java
+++ b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v1/InfluxDBSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
index c43b8178cb01f..df1f7fd29a637 100644
--- a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
+++ b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
index 6e003b37cddf0..f4718feee14df 100644
--- a/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
+++ b/pulsar-io/influxdb/src/test/java/org/apache/pulsar/io/influxdb/v2/InfluxDBSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/ClickHouseJdbcAutoSchemaSink.java b/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/ClickHouseJdbcAutoSchemaSink.java
index 89e58d63d238b..1dde7852929a5 100644
--- a/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/ClickHouseJdbcAutoSchemaSink.java
+++ b/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/ClickHouseJdbcAutoSchemaSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/package-info.java b/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
index 34097b2c56e4a..36d5cc921b70f 100644
--- a/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
+++ b/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSink.java b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSink.java
index 45e71a5f0cedf..1c98069403c52 100644
--- a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSink.java
+++ b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcAbstractSink.java b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcAbstractSink.java
index 06beaaacf9e24..4586fcebcf167 100644
--- a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcAbstractSink.java
+++ b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import com.google.common.collect.Lists;
@@ -25,7 +24,6 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
 import java.util.HashMap;
@@ -334,7 +332,12 @@ private void internalFlush(Deque> swapList) throws SQLException {
         }
     }
 
-    private void internalFlushBatch(Deque> swapList, PreparedStatement currentBatch, int count, long start) throws SQLException {
+    private void internalFlushBatch(
+            Deque> swapList,
+            PreparedStatement currentBatch,
+            int count,
+            long start
+    ) throws SQLException {
         executeBatch(swapList, currentBatch);
         if (log.isDebugEnabled()) {
             log.debug("Flushed {} messages in {} ms", count, (System.nanoTime() - start) / 1000 / 1000);
diff --git a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcSinkConfig.java b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcSinkConfig.java
index ac9a36be796eb..dc13f1bae9604 100644
--- a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcSinkConfig.java
+++ b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcUtils.java b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcUtils.java
index 02e39f145eaa5..ed809a95e91f3 100644
--- a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcUtils.java
+++ b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/JdbcUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import static com.google.common.base.Preconditions.checkState;
diff --git a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/package-info.java b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
index 34097b2c56e4a..36d5cc921b70f 100644
--- a/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
+++ b/pulsar-io/jdbc/core/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/core/src/test/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSinkTest.java b/pulsar-io/jdbc/core/src/test/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSinkTest.java
index 459468facf206..b15eb832242c7 100644
--- a/pulsar-io/jdbc/core/src/test/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSinkTest.java
+++ b/pulsar-io/jdbc/core/src/test/java/org/apache/pulsar/io/jdbc/BaseJdbcAutoSchemaSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import java.util.function.Function;
diff --git a/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/MariadbJdbcAutoSchemaSink.java b/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/MariadbJdbcAutoSchemaSink.java
index fcc135bfad74c..9fe693ceee1d3 100644
--- a/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/MariadbJdbcAutoSchemaSink.java
+++ b/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/MariadbJdbcAutoSchemaSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java b/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
index 34097b2c56e4a..36d5cc921b70f 100644
--- a/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
+++ b/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/OpenMLDBJdbcAutoSchemaSink.java b/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/OpenMLDBJdbcAutoSchemaSink.java
index c45f0407f8a42..4434ddac2499d 100644
--- a/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/OpenMLDBJdbcAutoSchemaSink.java
+++ b/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/OpenMLDBJdbcAutoSchemaSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import org.apache.pulsar.io.core.annotations.Connector;
diff --git a/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java b/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
index 34097b2c56e4a..36d5cc921b70f 100644
--- a/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
+++ b/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/PostgresJdbcAutoSchemaSink.java b/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/PostgresJdbcAutoSchemaSink.java
index 803f13724376a..2ddbf30c150be 100644
--- a/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/PostgresJdbcAutoSchemaSink.java
+++ b/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/PostgresJdbcAutoSchemaSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/package-info.java b/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
index 34097b2c56e4a..36d5cc921b70f 100644
--- a/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
+++ b/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/SqliteJdbcAutoSchemaSink.java b/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/SqliteJdbcAutoSchemaSink.java
index f67f0f1afbfb8..705819d8ab6c3 100644
--- a/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/SqliteJdbcAutoSchemaSink.java
+++ b/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/SqliteJdbcAutoSchemaSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/package-info.java b/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
index 34097b2c56e4a..36d5cc921b70f 100644
--- a/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
+++ b/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/JdbcUtilsTest.java b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/JdbcUtilsTest.java
index 13d5980b52e65..015ed5e2bcbca 100644
--- a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/JdbcUtilsTest.java
+++ b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/JdbcUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkBatchTest.java b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkBatchTest.java
index 012b37bacec95..ebe488611d2c2 100644
--- a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkBatchTest.java
+++ b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkBatchTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkTest.java b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkTest.java
index 38cdc29a1c9e0..d9ed4cbd442bf 100644
--- a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkTest.java
+++ b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteJdbcSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 import static org.mockito.Mockito.doAnswer;
diff --git a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteUtils.java b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteUtils.java
index 9e3a3fe255d73..b06ddc550a2c2 100644
--- a/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteUtils.java
+++ b/pulsar-io/jdbc/sqlite/src/test/java/org/apache/pulsar/io/jdbc/SqliteUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.jdbc;
 
 
diff --git a/pulsar-io/kafka-connect-adaptor/pom.xml b/pulsar-io/kafka-connect-adaptor/pom.xml
index 7c7de77ab1e5e..22dcebf80c147 100644
--- a/pulsar-io/kafka-connect-adaptor/pom.xml
+++ b/pulsar-io/kafka-connect-adaptor/pom.xml
@@ -36,18 +36,17 @@
       ${project.groupId}
       pulsar-io-core
       ${project.version}
+      provided
     
 
     
-      ${project.groupId}
-      pulsar-io-common
-      ${project.version}
+      com.fasterxml.jackson.core
+      jackson-databind
     
 
     
-      org.apache.kafka
-      kafka_${scala.binary.version}
-      ${kafka-client.version}
+      com.fasterxml.jackson.dataformat
+      jackson-dataformat-yaml
     
 
     
@@ -59,6 +58,14 @@
           org.apache.kafka
           kafka-log4j-appender
         
+        
+          org.slf4
+          *
+        
+        
+          org.eclipse.jetty
+          *
+        
       
     
 
@@ -74,10 +81,27 @@
       ${kafka-client.version}
     
 
+    
     
       ${project.groupId}
       pulsar-client-original
       ${project.version}
+      
+        
+          *
+          *
+        
+      
+    
+
+    
+      io.netty
+      netty-buffer
+    
+
+    
+      org.apache.commons
+      commons-lang3
     
 
     
@@ -96,6 +120,9 @@
       
     
 
+
+
+
     
       ${project.groupId}
       pulsar-broker
@@ -125,11 +152,30 @@
       test-jar
     
 
+    
+      org.apache.avro
+      avro
+      ${avro.version}
+      provided
+    
+
     
       com.google.protobuf
       protobuf-java
       provided
     
 
+    
+      org.asynchttpclient
+      async-http-client
+      test
+    
+
+    
+      com.typesafe.netty
+      netty-reactive-streams
+      test
+    
   
+
 
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java
index 97390a85fcae4..8743bb071ea6a 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/AbstractKafkaConnectSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSink.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSink.java
index 719642edf132c..37d0987e61023 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSink.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSource.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSource.java
index d4f86924de595..ca222fa58a6ba 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSource.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarIOSourceTaskContext.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarIOSourceTaskContext.java
index c831bbd872c7c..ab74ac4aa29bd 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarIOSourceTaskContext.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarIOSourceTaskContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaConnectSinkConfig.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaConnectSinkConfig.java
index a6e8b5c966ec0..8120bc5f77a47 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaConnectSinkConfig.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaConnectSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkContext.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkContext.java
index e34a0e3bc73b7..d92ae8eeb6db7 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkContext.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkTaskContext.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkTaskContext.java
index 8c4639a237392..99a8bf2908237 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkTaskContext.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaSinkTaskContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaWorkerConfig.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaWorkerConfig.java
index 70b0ab887c878..98edbe00b5234 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaWorkerConfig.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarKafkaWorkerConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStore.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStore.java
index 571b076f788da..02f315af68f14 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStore.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,15 +20,17 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.lang.StringUtils.isBlank;
-import static org.apache.pulsar.io.common.IOConfigUtils.loadConfigFromJsonString;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -53,6 +55,7 @@
 @Slf4j
 public class PulsarOffsetBackingStore implements OffsetBackingStore {
 
+    private final ObjectMapper mapper = new ObjectMapper();
     private final Map data = new ConcurrentHashMap<>();
     private PulsarClient client;
     private String topic;
@@ -249,4 +252,12 @@ public Future set(Map values, Callback callb
             }
         });
     }
+
+    private Map loadConfigFromJsonString(String config) throws JsonProcessingException {
+        if (!isBlank(config)) {
+            return mapper.readValue(config, new TypeReference<>() {});
+        } else {
+            return Collections.emptyMap();
+        }
+    }
 }
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/package-info.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/package-info.java
index 2fa31c97337c2..269246ad63bf3 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/package-info.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java
index 557cfbb9dd867..757241d411034 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaSchemaWrappedSchema.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaSchemaWrappedSchema.java
index e412d25127f21..7f85d1027aeb5 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaSchemaWrappedSchema.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaSchemaWrappedSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
index d1834e2f9ddd0..181c4c22eb4b0 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/PulsarSchemaToKafkaSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect.schema;
 
 import com.google.common.cache.Cache;
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/package-info.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/package-info.java
index 0e97fb5b3e266..875da036ec9bc 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/package-info.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/ErrFileStreamSourceTask.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/ErrFileStreamSourceTask.java
index d17f32cfc47a0..5f323af517f47 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/ErrFileStreamSourceTask.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/ErrFileStreamSourceTask.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import org.apache.kafka.connect.file.FileStreamSourceTask;
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java
index d3e1a40550f53..fe2def250233c 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
+import lombok.Cleanup;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.GenericData;
@@ -1096,9 +1096,11 @@ public void offsetTest() throws Exception {
 
         // close the producer, open again
         sink = new KafkaConnectSink();
-        when(context.getPulsarClient()).thenReturn(PulsarClient.builder()
+        @Cleanup
+        PulsarClient pulsarClient1 = PulsarClient.builder()
                 .serviceUrl(brokerUrl.toString())
-                .build());
+                .build();
+        when(context.getPulsarClient()).thenReturn(pulsarClient1);
         sink.open(props, context);
 
         // offset is 1 after reopening the producer
@@ -1226,9 +1228,11 @@ public void offsetNoIndexNoBatchTest() throws Exception {
 
         // close the producer, open again
         sink = new KafkaConnectSink();
-        when(context.getPulsarClient()).thenReturn(PulsarClient.builder()
+        @Cleanup
+        PulsarClient pulsarClient1 = PulsarClient.builder()
                 .serviceUrl(brokerUrl.toString())
-                .build());
+                .build();
+        when(context.getPulsarClient()).thenReturn(pulsarClient1);
         sink.open(props, context);
 
         // offset is 1 after reopening the producer
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceErrTest.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceErrTest.java
index cc04706f3ee45..fec53aa73896a 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceErrTest.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceErrTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceTest.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceTest.java
index 26ecf21aa0b5c..7dcf3ce8393df 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceTest.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/MockGenericObjectWrapper.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/MockGenericObjectWrapper.java
index b1550be2af078..5968c4df10d37 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/MockGenericObjectWrapper.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/MockGenericObjectWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStoreTest.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStoreTest.java
index 9681b4483b3b7..69362cb205493 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStoreTest.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarOffsetBackingStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,7 +21,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
-
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import java.nio.ByteBuffer;
@@ -37,7 +36,6 @@
 import org.apache.kafka.connect.util.Callback;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.ProducerConsumerBase;
-import org.apache.pulsar.client.api.PulsarClient;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -52,7 +50,6 @@ public class PulsarOffsetBackingStoreTest extends ProducerConsumerBase {
     private PulsarKafkaWorkerConfig distributedConfig;
     private String topicName;
     private PulsarOffsetBackingStore offsetBackingStore;
-    private PulsarClient client;
 
     @BeforeMethod
     @Override
@@ -62,10 +59,7 @@ protected void setup() throws Exception {
 
         this.topicName = "persistent://my-property/my-ns/offset-topic";
         this.defaultProps.put(PulsarKafkaWorkerConfig.OFFSET_STORAGE_TOPIC_CONFIG, topicName);
-        this.client = PulsarClient.builder()
-                .serviceUrl(brokerUrl.toString())
-                .build();
-        this.offsetBackingStore = new PulsarOffsetBackingStore(client);
+        this.offsetBackingStore = new PulsarOffsetBackingStore(pulsarClient);
     }
 
     @AfterMethod(alwaysRun = true)
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarSchemaToKafkaSchemaTest.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarSchemaToKafkaSchemaTest.java
index ecf0633f58878..9cc6db034c870 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarSchemaToKafkaSchemaTest.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/PulsarSchemaToKafkaSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkConnector.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkConnector.java
index 4a786617f754b..367af9eeaf00a 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkConnector.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import org.apache.kafka.connect.connector.Task;
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkTask.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkTask.java
index 07b9117d2e419..7860e42dec64c 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkTask.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/SchemaedFileStreamSinkTask.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.connect;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/kafka/pom.xml b/pulsar-io/kafka/pom.xml
index ca7485510c864..f6711e572ce37 100644
--- a/pulsar-io/kafka/pom.xml
+++ b/pulsar-io/kafka/pom.xml
@@ -113,6 +113,12 @@
       jjwt-jackson
     
 
+    
+      org.hamcrest
+      hamcrest
+      test
+    
+
   
 
   
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/AvroSchemaCache.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/AvroSchemaCache.java
index 9c92eba020170..f0ad79549eb13 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/AvroSchemaCache.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/AvroSchemaCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapper.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapper.java
index 9ced7e052a79b..fb4683e511dd6 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapper.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/BytesWithKafkaSchema.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/BytesWithKafkaSchema.java
index 218f7b0b5c1e6..f0429c92eedfd 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/BytesWithKafkaSchema.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/BytesWithKafkaSchema.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
index 45067e26a9ba3..8fbd6c8186110 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import java.io.IOException;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java
index ba6498ba5b771..c01158da50a7f 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import io.jsonwebtoken.io.Encoders;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSink.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSink.java
index 3e9640a697082..2a200531b67cb 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSink.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import java.util.Properties;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSource.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSource.java
index a270706e8a558..4e35d98e0bb71 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSource.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaBytesSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSinkConfig.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSinkConfig.java
index dc3c8d1454517..cc317e03692dd 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSinkConfig.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSourceConfig.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSourceConfig.java
index fb16352fc81f6..55a9845e4d455 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSourceConfig.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSource.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSource.java
index a8a7d4686e028..58df1838b2eb1 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSource.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import java.nio.charset.StandardCharsets;
diff --git a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/package-info.java b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/package-info.java
index 9b911a261a196..2263ff663be96 100644
--- a/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/package-info.java
+++ b/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapperTest.java b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapperTest.java
index 1d035c2be9931..e7f108bf60146 100644
--- a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapperTest.java
+++ b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/ByteBufferSchemaWrapperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/KafkaBytesSourceTest.java b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/KafkaBytesSourceTest.java
index 98aaf2ffd724b..d370d51cc23c1 100644
--- a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/KafkaBytesSourceTest.java
+++ b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/KafkaBytesSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/sink/KafkaAbstractSinkTest.java b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/sink/KafkaAbstractSinkTest.java
index b4ef9adbad708..ec9ee4a957d78 100644
--- a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/sink/KafkaAbstractSinkTest.java
+++ b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/sink/KafkaAbstractSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.sink;
 
 import org.apache.kafka.clients.producer.ProducerConfig;
diff --git a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/source/KafkaAbstractSourceTest.java b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/source/KafkaAbstractSourceTest.java
index 4eb30447fbf35..612cf0bc6d2b1 100644
--- a/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/source/KafkaAbstractSourceTest.java
+++ b/pulsar-io/kafka/src/test/java/org/apache/pulsar/io/kafka/source/KafkaAbstractSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kafka.source;
 
 
diff --git a/pulsar-io/kinesis/pom.xml b/pulsar-io/kinesis/pom.xml
index ffdab2e8fedd5..245df9d5c9c52 100644
--- a/pulsar-io/kinesis/pom.xml
+++ b/pulsar-io/kinesis/pom.xml
@@ -83,7 +83,6 @@
     
       com.fasterxml.jackson.dataformat
       jackson-dataformat-cbor
-      ${jackson.version}
     
 
     
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsCredentialProviderPlugin.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsCredentialProviderPlugin.java
index 23c3ec83ec0ac..e88a952293b4f 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsCredentialProviderPlugin.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsCredentialProviderPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kinesis;
 
 /**
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsDefaultProviderChainPlugin.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsDefaultProviderChainPlugin.java
index eea443cfbffec..75952a71a29a0 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsDefaultProviderChainPlugin.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsDefaultProviderChainPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Backoff.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Backoff.java
index 2aea394c48d14..a830c744bad44 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Backoff.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Backoff.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/BaseKinesisConfig.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/BaseKinesisConfig.java
index cf52d1e1f777b..c9c951ae2b70e 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/BaseKinesisConfig.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/BaseKinesisConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecord.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecord.java
index a2fe0229bfe0f..754b1e070f492 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecord.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessor.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessor.java
index 81b904bd52474..60dd263eab459 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessor.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessorFactory.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessorFactory.java
index 0e448707af63b..f211f828f10f2 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessorFactory.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisRecordProcessorFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSink.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSink.java
index f2917f18b17ef..fb8eedff82f0a 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSink.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kinesis;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSinkConfig.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSinkConfig.java
index b0742368f42c9..c5b26a26d0cf2 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSinkConfig.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kinesis;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSource.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSource.java
index 7ede462f18894..2412244e1b5dc 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSource.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSourceConfig.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSourceConfig.java
index 3bf03cb302353..f0bf7cfc9781d 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSourceConfig.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/STSAssumeRoleProviderPlugin.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/STSAssumeRoleProviderPlugin.java
index 5af3d699fddd8..e305c9c9b9fe2 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/STSAssumeRoleProviderPlugin.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/STSAssumeRoleProviderPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Utils.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Utils.java
index a3ebfb94be90e..32d3470524876 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Utils.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/Utils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.kinesis;
 
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonConverter.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonConverter.java
index b6314013fc95a..5308971e8d24e 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonConverter.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonRecord.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonRecord.java
index 6522fa5e0e8d9..6ac25f03c8136 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonRecord.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/JsonRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/package-info.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/package-info.java
index 9fe7d6a007df1..63e404b6b8c7d 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/package-info.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/json/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/package-info.java b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/package-info.java
index 9dc7e05cf4553..5257535373fb1 100644
--- a/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/package-info.java
+++ b/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkAuthTest.java b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkAuthTest.java
index cd35e2c13abff..7051b51c1f272 100644
--- a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkAuthTest.java
+++ b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkAuthTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkConfigTests.java b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkConfigTests.java
index dd799e042a475..6f76d9e69a211 100644
--- a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkConfigTests.java
+++ b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkTest.java b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkTest.java
index 152cc6e70dbb0..8a5d5be0ca40c 100644
--- a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkTest.java
+++ b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSourceConfigTests.java b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSourceConfigTests.java
index 4bca8e786c667..f6b0666d34ba3 100644
--- a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSourceConfigTests.java
+++ b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/KinesisSourceConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/UtilsTest.java b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/UtilsTest.java
index 5458008f5f604..b0f9456b9487c 100644
--- a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/UtilsTest.java
+++ b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/UtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/json/JsonConverterTests.java b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/json/JsonConverterTests.java
index cce2ea8e7d59a..94fd73135b398 100644
--- a/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/json/JsonConverterTests.java
+++ b/pulsar-io/kinesis/src/test/java/org/apache/pulsar/io/kinesis/json/JsonConverterTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoAbstractConfig.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoAbstractConfig.java
index 1c9786ea3d782..35c327ed82b99 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoAbstractConfig.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoAbstractConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSink.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSink.java
index 4077442e8af95..2206d232eaf97 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSink.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSinkConfig.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSinkConfig.java
index 500b0eceaed94..470d17aef753c 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSinkConfig.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSource.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSource.java
index b71b5eefd3b3a..6ee95fc4cd4b5 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSource.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSourceConfig.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSourceConfig.java
index 027c7743187b0..6d489686fad6a 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSourceConfig.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/MongoSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/SyncType.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/SyncType.java
index 37d8268087a87..ec011a165139a 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/SyncType.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/SyncType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/package-info.java b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/package-info.java
index df14171ceef1e..1753bbb031e5b 100644
--- a/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/package-info.java
+++ b/pulsar-io/mongo/src/main/java/org/apache/pulsar/io/mongodb/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkConfigTest.java b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkConfigTest.java
index 8cdcbe528ce6d..b1166eac5722a 100644
--- a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkConfigTest.java
+++ b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.mongodb;
 
 import java.util.Map;
diff --git a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkTest.java b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkTest.java
index f1e5ef1d95c81..a1fd0ab204747 100644
--- a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkTest.java
+++ b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.mongodb;
 
 import com.mongodb.MongoBulkWriteException;
diff --git a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceConfigTest.java b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceConfigTest.java
index 63e01551ae2b2..e7fd01549b033 100644
--- a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceConfigTest.java
+++ b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.mongodb;
 
 import static org.testng.Assert.assertEquals;
diff --git a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceTest.java b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceTest.java
index c9b9d02a20f03..c29dd98dcd841 100644
--- a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceTest.java
+++ b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/MongoSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.mongodb;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
diff --git a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/TestHelper.java b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/TestHelper.java
index fcfc46ecfee64..fbace31b1a418 100644
--- a/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/TestHelper.java
+++ b/pulsar-io/mongo/src/test/java/org/apache/pulsar/io/mongodb/TestHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.mongodb;
 
 import static org.testng.Assert.assertNotNull;
diff --git a/pulsar-io/netty/pom.xml b/pulsar-io/netty/pom.xml
index 4dc1cc34a4d93..f421b72c26eae 100644
--- a/pulsar-io/netty/pom.xml
+++ b/pulsar-io/netty/pom.xml
@@ -68,13 +68,6 @@
             org.apache.commons
             commons-lang3
         
-
-        
-            org.testng
-            testng
-            test
-        
-
     
 
     
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySource.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySource.java
index b97ff8e7f162e..9df73e498b1d9 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySource.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySourceConfig.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySourceConfig.java
index 207ff1e41af4a..ceb850dcbcf72 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySourceConfig.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/NettySourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializer.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializer.java
index dce26fbe6c34b..e9bb08e12c3fa 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializer.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpServerHandler.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpServerHandler.java
index 442ae7aae8313..29dcb9880cb2c 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpServerHandler.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/NettyHttpServerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/package-info.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/package-info.java
index 2e71305b280db..7ce2c73f2ebc7 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/package-info.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/http/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/package-info.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/package-info.java
index 482e05ac884d2..57ee134273657 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/package-info.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/NettyServer.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/NettyServer.java
index f85abfefdb72a..71d9b956f7324 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/NettyServer.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/NettyServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/package-info.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/package-info.java
index 5a1ab94659ff4..91076fc8c568a 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/package-info.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/server/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializer.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializer.java
index 8ca9832b5e5db..426dbe8dcbcff 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializer.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPServerHandler.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPServerHandler.java
index 5b74deba3e513..94ef3d8ef67a2 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPServerHandler.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/NettyTCPServerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/package-info.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/package-info.java
index b59d614e83635..5373e5fbd4610 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/package-info.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/tcp/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializer.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializer.java
index bc865597d6e78..643e79287d21e 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializer.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPServerHandler.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPServerHandler.java
index b6ad800aae891..915140752fced 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPServerHandler.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/NettyUDPServerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/package-info.java b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/package-info.java
index d936c6a2aace3..6c3adc645cd7b 100644
--- a/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/package-info.java
+++ b/pulsar-io/netty/src/main/java/org/apache/pulsar/io/netty/udp/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/main/java/package-info.java b/pulsar-io/netty/src/main/java/package-info.java
index 51da6c0f2bbf8..042f3ce1f3966 100644
--- a/pulsar-io/netty/src/main/java/package-info.java
+++ b/pulsar-io/netty/src/main/java/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/NettySourceConfigTest.java b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/NettySourceConfigTest.java
index 5b5b18822c93e..7ba75b945ff54 100644
--- a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/NettySourceConfigTest.java
+++ b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/NettySourceConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializerTest.java b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializerTest.java
index 760c333194895..d632888efda3a 100644
--- a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializerTest.java
+++ b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/http/NettyHttpChannelInitializerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/server/NettyServerTest.java b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/server/NettyServerTest.java
index 40b3f93c0e8c8..e51365c85a901 100644
--- a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/server/NettyServerTest.java
+++ b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/server/NettyServerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializerTest.java b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializerTest.java
index 40db6378ad8c4..471999f61ad21 100644
--- a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializerTest.java
+++ b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/tcp/NettyTCPChannelInitializerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializerTest.java b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializerTest.java
index 33d49407ccb5f..77ebb524642a9 100644
--- a/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializerTest.java
+++ b/pulsar-io/netty/src/test/java/org/apache/pulsar/io/netty/udp/NettyUDPChannelInitializerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSource.java b/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSource.java
index 732a5e6312a8b..453b17a54c89d 100644
--- a/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSource.java
+++ b/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSourceConfig.java b/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSourceConfig.java
index 78969a599d3e6..cb309455db9de 100644
--- a/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSourceConfig.java
+++ b/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/NSQSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/package-info.java b/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/package-info.java
index cbb34397136ff..f168171e8d518 100644
--- a/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/package-info.java
+++ b/pulsar-io/nsq/src/main/java/org/apache/pulsar/io/nsq/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/nsq/src/test/java/org/apache/pulsar/io/nsq/NSQConfigTests.java b/pulsar-io/nsq/src/test/java/org/apache/pulsar/io/nsq/NSQConfigTests.java
index 6d1c868bc6447..449169e9b686c 100644
--- a/pulsar-io/nsq/src/test/java/org/apache/pulsar/io/nsq/NSQConfigTests.java
+++ b/pulsar-io/nsq/src/test/java/org/apache/pulsar/io/nsq/NSQConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/pom.xml b/pulsar-io/pom.xml
index b2c400117a50a..a5e096aff59a7 100644
--- a/pulsar-io/pom.xml
+++ b/pulsar-io/pom.xml
@@ -51,6 +51,7 @@
         twitter
         cassandra
         aerospike
+        http
         kafka
         rabbitmq
         kinesis
@@ -88,6 +89,7 @@
         twitter
         cassandra
         aerospike
+        http
         kafka
         rabbitmq
         kinesis
diff --git a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQAbstractConfig.java b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQAbstractConfig.java
index 676db3f923baa..1f7f8cce2cf2f 100644
--- a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQAbstractConfig.java
+++ b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQAbstractConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.rabbitmq;
 
 import com.google.common.base.Preconditions;
diff --git a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSink.java b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSink.java
index 525303b1b7a40..f317a35734e69 100644
--- a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSink.java
+++ b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSinkConfig.java b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSinkConfig.java
index 2b2957b01909f..f1fa724cf06d0 100644
--- a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSinkConfig.java
+++ b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSource.java b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSource.java
index d65cbd6b04ac3..d15108c4d8288 100644
--- a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSource.java
+++ b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.rabbitmq;
 
 import com.rabbitmq.client.AMQP;
diff --git a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSourceConfig.java b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSourceConfig.java
index 7add731360b0b..0f4c804b4ee91 100644
--- a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSourceConfig.java
+++ b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSourceConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/package-info.java b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/package-info.java
index 0fb6b0e39a284..93019ee62accf 100644
--- a/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/package-info.java
+++ b/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/RabbitMQBrokerManager.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/RabbitMQBrokerManager.java
index 7189a9857430d..507313c86fd7f 100644
--- a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/RabbitMQBrokerManager.java
+++ b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/RabbitMQBrokerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkConfigTest.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkConfigTest.java
index 8c113e1ce8c48..3d4fd6f46e16f 100644
--- a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkConfigTest.java
+++ b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
index e089d7b76fbf1..3b20c61f82636 100644
--- a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
+++ b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceConfigTest.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceConfigTest.java
index b0cd5c9df03af..c33e0070c6fd0 100644
--- a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceConfigTest.java
+++ b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceTest.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceTest.java
index 279a002aa60ff..abff93a363298 100644
--- a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceTest.java
+++ b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisAbstractConfig.java b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisAbstractConfig.java
index 0c3ffda760172..978e7de31a51c 100644
--- a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisAbstractConfig.java
+++ b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisAbstractConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisSession.java b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisSession.java
index 2e67f24d2de9f..87620f495bfd5 100644
--- a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisSession.java
+++ b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/RedisSession.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/package-info.java b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/package-info.java
index 77eed446560f8..3ec1af73e3fdd 100644
--- a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/package-info.java
+++ b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSink.java b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSink.java
index 87597256dc67f..bff0a5c2da592 100644
--- a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSink.java
+++ b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSinkConfig.java b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSinkConfig.java
index 319ad4794ff05..455f46fd69621 100644
--- a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSinkConfig.java
+++ b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/RedisSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/package-info.java b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/package-info.java
index 2fd74997e18be..e137ea8b8d6c8 100644
--- a/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/package-info.java
+++ b/pulsar-io/redis/src/main/java/org/apache/pulsar/io/redis/sink/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/EmbeddedRedisUtils.java b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/EmbeddedRedisUtils.java
index 1bd529563b918..f671d2f74decc 100644
--- a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/EmbeddedRedisUtils.java
+++ b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/EmbeddedRedisUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkConfigTest.java b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkConfigTest.java
index 81fbf8085a9b2..1316d0994a1cd 100644
--- a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkConfigTest.java
+++ b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java
index 43fe9fe6b33bc..214151345b42c 100644
--- a/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java
+++ b/pulsar-io/redis/src/test/java/org/apache/pulsar/io/redis/sink/RedisSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrAbstractSink.java b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrAbstractSink.java
index 4556dd97ca1e6..de9cdb4a9d82a 100644
--- a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrAbstractSink.java
+++ b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrAbstractSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrGenericRecordSink.java b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrGenericRecordSink.java
index efed6d1d498d2..bbf863839cea3 100644
--- a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrGenericRecordSink.java
+++ b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrGenericRecordSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrSinkConfig.java b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrSinkConfig.java
index c0c0fff9de86d..58430af10e956 100644
--- a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrSinkConfig.java
+++ b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/SolrSinkConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/package-info.java b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/package-info.java
index 0fdfaae3eebc6..20002bd93d83f 100644
--- a/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/package-info.java
+++ b/pulsar-io/solr/src/main/java/org/apache/pulsar/io/solr/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrGenericRecordSinkTest.java b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrGenericRecordSinkTest.java
index 8ff86336f49c5..0d28c72dc68b9 100644
--- a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrGenericRecordSinkTest.java
+++ b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrGenericRecordSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java
index 6677b11b9b249..cc59c6dce6bf6 100644
--- a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java
+++ b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrSinkConfigTest.java b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrSinkConfigTest.java
index 234ab3193c402..42d2121dbfcbd 100644
--- a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrSinkConfigTest.java
+++ b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrSinkConfigTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHose.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHose.java
index 75d5fd7f01724..30950ffefe2a4 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHose.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHose.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.twitter;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfig.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfig.java
index 2c1b56fd2d44b..2edd77c17daca 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfig.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.twitter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TweetData.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TweetData.java
index c06f3798e2428..0b9a3199fa7f5 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TweetData.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TweetData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.io.twitter.data;
 
 import lombok.Data;
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TwitterRecord.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TwitterRecord.java
index 92faf571d4414..7292c05548b64 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TwitterRecord.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/TwitterRecord.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/package-info.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/package-info.java
index d7f96490ef23a..eadf21b6a8900 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/package-info.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/SampleStatusesEndpoint.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/SampleStatusesEndpoint.java
index 1a8e405ebb86f..ca942076a1603 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/SampleStatusesEndpoint.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/SampleStatusesEndpoint.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/package-info.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/package-info.java
index 6e99d7714be41..2bca50c06c1a9 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/package-info.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/endpoint/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/package-info.java b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/package-info.java
index 1690a64ebf847..23f810a0240fc 100644
--- a/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/package-info.java
+++ b/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-io/twitter/src/test/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfigTests.java b/pulsar-io/twitter/src/test/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfigTests.java
index c2cbb3daa7c65..0572e8bb332eb 100644
--- a/pulsar-io/twitter/src/test/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfigTests.java
+++ b/pulsar-io/twitter/src/test/java/org/apache/pulsar/io/twitter/TwitterFireHoseConfigTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/CacheGetResult.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/CacheGetResult.java
index ef0ca41f84647..8ae6833a7b98e 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/CacheGetResult.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/CacheGetResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/GetResult.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/GetResult.java
index 17e732ea02d81..6bb42202b1d22 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/GetResult.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/GetResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
index ef2df4980e982..94da382b74dcf 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCacheConfig.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCacheConfig.java
index 1671fd39956d8..55b159071fda4 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCacheConfig.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCacheConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEvent.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEvent.java
index 8682276a176f6..0fcf1704ef33c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEvent.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEventSynchronizer.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEventSynchronizer.java
index b2aa19edf5194..9a735e0f15ab8 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEventSynchronizer.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataEventSynchronizer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataSerde.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataSerde.java
index 19a097e70c40a..4517fa2cb87c2 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataSerde.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataSerde.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStore.java
index b4295f2586768..66c9f44d3426a 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreConfig.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreConfig.java
index f00cc4314807a..b742d03f9dbd5 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreConfig.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreException.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreException.java
index f1e72c27a6172..0572f9c7f1f8b 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreException.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreFactory.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreFactory.java
index 7154427c7760a..b15316574525c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreFactory.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreLifecycle.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreLifecycle.java
index e994584d405a4..330d02d03416d 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreLifecycle.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataStoreLifecycle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Notification.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Notification.java
index 0652ab4b4cb1b..cc205ab4a8a47 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Notification.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Notification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/NotificationType.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/NotificationType.java
index bbc1dfd641c93..f04b43f212edf 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/NotificationType.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/NotificationType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Stat.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Stat.java
index 5fd6a3b0c6e68..6f333be9add25 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Stat.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/Stat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/CoordinationService.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/CoordinationService.java
index 52e2bd98b33e0..708f91f4a33ca 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/CoordinationService.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/CoordinationService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElection.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElection.java
index e5cdee8f84227..016b7d061d073 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElection.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElectionState.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElectionState.java
index 5f500e4c5a3a7..23063e52d77dc 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElectionState.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LeaderElectionState.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LockManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LockManager.java
index 6daa49b2579ee..cb6601b170135 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LockManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/LockManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/ResourceLock.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/ResourceLock.java
index 22e59072cabf9..c85b13cdc1440 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/ResourceLock.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/ResourceLock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/package-info.java
index 136b02089f62e..3f7633f49f42f 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/coordination/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/CreateOption.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/CreateOption.java
index 3d46147bbecef..36975c7681717 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/CreateOption.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/CreateOption.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/MetadataStoreExtended.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/MetadataStoreExtended.java
index 831ef73dacdd5..5817b743e1512 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/MetadataStoreExtended.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/MetadataStoreExtended.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/SessionEvent.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/SessionEvent.java
index c89500312ef47..5b15c8d1d6e76 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/SessionEvent.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/SessionEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/package-info.java
index f340a9526cd94..0718d5cdec8f3 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/extended/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/package-info.java
index af0eb9d4e6794..f488e6914bd94 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractHierarchicalLedgerManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractHierarchicalLedgerManager.java
index cbfa68692ae7e..a33c8761cba9e 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractHierarchicalLedgerManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractHierarchicalLedgerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractMetadataDriver.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractMetadataDriver.java
index 8a9984d626dd7..cc5f759c73fe5 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractMetadataDriver.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/AbstractMetadataDriver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java
index 6505868331fac..c2f3f72ec21c0 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -30,9 +30,12 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bookkeeper.bookie.BookieImpl;
+import org.apache.bookkeeper.bookie.Cookie;
 import org.apache.bookkeeper.client.BookKeeper;
 import org.apache.bookkeeper.common.allocator.PoolingPolicy;
 import org.apache.bookkeeper.common.component.ComponentStarter;
@@ -65,6 +68,7 @@ public class BKCluster implements AutoCloseable {
     // BookKeeper related variables
     private final List tmpDirs = new ArrayList<>();
     private final List bookieComponents = new ArrayList<>();
+    @Getter
     private final List bsConfs = new ArrayList<>();
 
     protected final ServerConfiguration baseConf;
@@ -231,9 +235,24 @@ private ServerConfiguration newServerConfiguration(int index) throws Exception {
             // and 2nd bookie's cookie validation fails
             port = clusterConf.bkPort;
         }
+        File[] cookieDir = dataDir.listFiles((file) -> file.getName().equals("current"));
+        if (cookieDir != null && cookieDir.length > 0) {
+            String existBookieAddr = parseBookieAddressFromCookie(cookieDir[0]);
+            if (existBookieAddr != null) {
+                baseConf.setAdvertisedAddress(existBookieAddr.split(":")[0]);
+                port = Integer.parseInt(existBookieAddr.split(":")[1]);
+            }
+        }
         return newServerConfiguration(port, dataDir, new File[]{dataDir});
     }
 
+    private String parseBookieAddressFromCookie(File dir) throws IOException {
+        Cookie cookie = Cookie.readFromDirectory(dir);
+        Pattern pattern = Pattern.compile(".*bookieHost: \"(.*?)\".*", Pattern.DOTALL);
+        Matcher m = pattern.matcher(cookie.toString());
+        return m.find() ? m.group(1) : null;
+    }
+
     private ClientConfiguration newClientConfiguration() {
         return new ClientConfiguration(baseConf);
     }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BookieServiceInfoSerde.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BookieServiceInfoSerde.java
index b7e3024b637fb..37dc9a1648c72 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BookieServiceInfoSerde.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BookieServiceInfoSerde.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/CombinedLedgerRangeIterator.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/CombinedLedgerRangeIterator.java
index 2feab062ac7b1..f8515f27572bb 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/CombinedLedgerRangeIterator.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/CombinedLedgerRangeIterator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/HierarchicalLedgerUtils.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/HierarchicalLedgerUtils.java
index 07a4346f77d13..5a083cbe61b3e 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/HierarchicalLedgerUtils.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/HierarchicalLedgerUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerManager.java
index 2a4b6c06a0f44..76c5239fbda5b 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerRangeIterator.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerRangeIterator.java
index c2cc03abb0492..15b1d561f901c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerRangeIterator.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LegacyHierarchicalLedgerRangeIterator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerManager.java
index 4f64b63e42007..636d0f4df396c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerRangeIterator.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerRangeIterator.java
index 169ff572a0b84..9a36ac53b8991 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerRangeIterator.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/LongHierarchicalLedgerRangeIterator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManager.java
index 71241bfd35515..a4336b876398a 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManager.java
index aa3ead3216145..bc35380fec19c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGenerator.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGenerator.java
index 0e1703cf34365..b596d880fa88b 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGenerator.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManager.java
index cf6699a5b3091..59452a3d54db3 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManagerFactory.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManagerFactory.java
index 15c675d350c63..1b229757c9c30 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManagerFactory.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerManagerFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerUnderreplicationManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerUnderreplicationManager.java
index 18569ce8057c2..cf8ff208c94b6 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerUnderreplicationManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerUnderreplicationManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataBookieDriver.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataBookieDriver.java
index 95386f912a921..738015a6134cc 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataBookieDriver.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataBookieDriver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataClientDriver.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataClientDriver.java
index a6ebdcf2ab1cc..f2776062818d8 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataClientDriver.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataClientDriver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -37,6 +37,10 @@ public class PulsarMetadataClientDriver extends AbstractMetadataDriver implement
         MetadataDrivers.registerClientDriver(METADATA_STORE_SCHEME, PulsarMetadataClientDriver.class);
     }
 
+    public static void init() {
+        // cause  to be invoked
+    }
+
     @Override
     public MetadataClientDriver initialize(ClientConfiguration clientConfiguration,
                                            ScheduledExecutorService scheduledExecutorService,
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClient.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClient.java
index f314c0efaf058..b10c10469e717 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClient.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,7 +29,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -97,14 +96,9 @@ public CompletableFuture>> getWritableBookies() {
 
     @Override
     public CompletableFuture>> getAllBookies() {
-        CompletableFuture>> wb = getWritableBookies();
-        CompletableFuture>> rb = getReadOnlyBookies();
-        return wb.thenCombine(rb, (rw, ro) -> {
-            Set res = new HashSet<>();
-            res.addAll(rw.getValue());
-            res.addAll(ro.getValue());
-            return new Versioned<>(res, Version.NEW);
-        });
+        // this method is meant to return all the known bookies, even the bookies
+        // that are not in a running state
+        return getChildren(bookieAllRegistrationPath);
     }
 
     @Override
@@ -116,10 +110,9 @@ private CompletableFuture>> getChildren(String path) {
         return store.getChildren(path)
                 .thenComposeAsync(children -> {
                     Set bookieIds = PulsarRegistrationClient.convertToBookieAddresses(children);
-                    Set bookies = convertToBookieAddresses(children);
-                    List>> bookieInfoUpdated =
-                            new ArrayList<>(bookies.size());
-                    for (BookieId id : bookies) {
+                    List> bookieInfoUpdated =
+                            new ArrayList<>(bookieIds.size());
+                    for (BookieId id : bookieIds) {
                         // update the cache for new bookies
                         if (!bookieServiceInfoCache.containsKey(id)) {
                             bookieInfoUpdated.add(readBookieServiceInfoAsync(id));
@@ -160,26 +153,42 @@ public void unwatchReadOnlyBookies(RegistrationListener registrationListener) {
         readOnlyBookiesWatchers.remove(registrationListener);
     }
 
-    private void updatedBookies(Notification n) {
-        if (n.getType() == NotificationType.Created || n.getType() == NotificationType.Deleted) {
-
-            if (n.getType() == NotificationType.Deleted) {
-                BookieId bookieId = stripBookieIdFromPath(n.getPath());
+    private void handleDeletedBookieNode(Notification n) {
+        if (n.getType() == NotificationType.Deleted) {
+            BookieId bookieId = stripBookieIdFromPath(n.getPath());
+            if (bookieId != null) {
                 log.info("Bookie {} disappeared", bookieId);
-                if (bookieId != null) {
-                    bookieServiceInfoCache.remove(bookieId);
-                }
+                bookieServiceInfoCache.remove(bookieId);
             }
+        }
+    }
 
+    private void handleUpdatedBookieNode(Notification n) {
+        BookieId bookieId = stripBookieIdFromPath(n.getPath());
+        if (bookieId != null) {
+            log.info("Bookie {} info updated", bookieId);
+            readBookieServiceInfoAsync(bookieId);
+        }
+    }
+
+    private void updatedBookies(Notification n) {
+        if (n.getType() == NotificationType.Created || n.getType() == NotificationType.Deleted) {
             if (n.getPath().startsWith(bookieReadonlyRegistrationPath)) {
                 getReadOnlyBookies().thenAccept(bookies -> {
                     readOnlyBookiesWatchers.keySet()
                             .forEach(w -> executor.execute(() -> w.onBookiesChanged(bookies)));
                 });
+                handleDeletedBookieNode(n);
             } else if (n.getPath().startsWith(bookieRegistrationPath)) {
                 getWritableBookies().thenAccept(bookies ->
                         writableBookiesWatchers.keySet()
                                 .forEach(w -> executor.execute(() -> w.onBookiesChanged(bookies))));
+                handleDeletedBookieNode(n);
+            }
+        } else if (n.getType() == NotificationType.Modified) {
+            if (n.getPath().startsWith(bookieReadonlyRegistrationPath)
+                || n.getPath().startsWith(bookieRegistrationPath)) {
+                handleUpdatedBookieNode(n);
             }
         }
     }
@@ -231,7 +240,7 @@ public CompletableFuture> getBookieServiceInfo(Book
         }
     }
 
-    public CompletableFuture> readBookieServiceInfoAsync(BookieId bookieId) {
+    public CompletableFuture readBookieServiceInfoAsync(BookieId bookieId) {
         String asWritable = bookieRegistrationPath + "/" + bookieId;
         return bookieServiceInfoMetadataCache.get(asWritable)
                 .thenCompose((Optional getResult) -> {
@@ -240,7 +249,7 @@ public CompletableFuture> readBookieServiceInfoAsyn
                                 new Versioned<>(getResult.get(), new LongVersion(-1));
                         log.info("Update BookieInfoCache (writable bookie) {} -> {}", bookieId, getResult.get());
                         bookieServiceInfoCache.put(bookieId, res);
-                        return CompletableFuture.completedFuture(res);
+                        return CompletableFuture.completedFuture(null);
                     } else {
                         return readBookieInfoAsReadonlyBookie(bookieId);
                     }
@@ -248,7 +257,7 @@ public CompletableFuture> readBookieServiceInfoAsyn
         );
     }
 
-    final CompletableFuture> readBookieInfoAsReadonlyBookie(BookieId bookieId) {
+    final CompletableFuture readBookieInfoAsReadonlyBookie(BookieId bookieId) {
         String asReadonly = bookieReadonlyRegistrationPath + "/" + bookieId;
         return bookieServiceInfoMetadataCache.get(asReadonly)
                 .thenApply((Optional getResultAsReadOnly) -> {
@@ -258,10 +267,8 @@ final CompletableFuture> readBookieInfoAsReadonlyBo
                         log.info("Update BookieInfoCache (readonly bookie) {} -> {}", bookieId,
                                 getResultAsReadOnly.get());
                         bookieServiceInfoCache.put(bookieId, res);
-                        return res;
-                    } else {
-                        throw new CompletionException(new BKException.BKBookieHandleNotAvailableException());
                     }
+                    return null;
                 });
     }
 }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManager.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManager.java
index 36840b0134eb1..32ec89e717e0e 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManager.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -88,11 +88,25 @@ public class PulsarRegistrationManager implements RegistrationManager {
     @SneakyThrows
     public void close() {
         for (ResourceLock rwBookie : bookieRegistration.values()) {
-            rwBookie.release().get();
+            try {
+                rwBookie.release().get();
+            } catch (ExecutionException ignore) {
+                log.error("Cannot release correctly {}", rwBookie, ignore.getCause());
+            } catch (InterruptedException ignore) {
+                log.error("Cannot release correctly {}", rwBookie, ignore);
+                Thread.currentThread().interrupt();
+            }
         }
 
         for (ResourceLock roBookie : bookieRegistrationReadOnly.values()) {
-            roBookie.release().get();
+            try {
+                roBookie.release().get();
+            } catch (ExecutionException ignore) {
+                log.error("Cannot release correctly {}", roBookie, ignore.getCause());
+            } catch (InterruptedException ignore) {
+                log.error("Cannot release correctly {}", roBookie, ignore);
+                Thread.currentThread().interrupt();
+            }
         }
         coordinationService.close();
     }
@@ -115,11 +129,13 @@ public void registerBookie(BookieId bookieId, boolean readOnly, BookieServiceInf
             throws BookieException {
         String regPath = bookieRegistrationPath + "/" + bookieId;
         String regPathReadOnly = bookieReadonlyRegistrationPath + "/" + bookieId;
+        log.info("RegisterBookie {} readOnly {} info {}", bookieId, readOnly, bookieServiceInfo);
 
         try {
             if (readOnly) {
                 ResourceLock rwRegistration = bookieRegistration.remove(bookieId);
                 if (rwRegistration != null) {
+                    log.info("Bookie {} was already registered as writable, unregistering");
                     rwRegistration.release().get();
                 }
 
@@ -128,6 +144,7 @@ public void registerBookie(BookieId bookieId, boolean readOnly, BookieServiceInf
             } else {
                 ResourceLock roRegistration = bookieRegistrationReadOnly.remove(bookieId);
                 if (roRegistration != null) {
+                    log.info("Bookie {} was already registered as read-only, unregistering");
                     roRegistration.release().get();
                 }
 
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/package-info.java
index 658015dca27d2..21e5fdf609055 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeSimpleType.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeSimpleType.java
index a07a865bb35eb..db7354f2aafab 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeSimpleType.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeSimpleType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeTypeRef.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeTypeRef.java
index ca5500e00ecfd..b4a543af8c666 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeTypeRef.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/JSONMetadataSerdeTypeRef.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/MetadataCacheImpl.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/MetadataCacheImpl.java
index f58530bde311b..b9051a7dc7df4 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/MetadataCacheImpl.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/MetadataCacheImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/package-info.java
index 4ca1025208a44..158e6b5b67a73 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/cache/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/CoordinationServiceImpl.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/CoordinationServiceImpl.java
index 64ba31bd85716..5b91a1dee76cc 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/CoordinationServiceImpl.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/CoordinationServiceImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImpl.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImpl.java
index 86fac33f7c2c9..409d49dcd26ab 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImpl.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LockManagerImpl.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LockManagerImpl.java
index e677e99faf664..2a4a094fd6333 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LockManagerImpl.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/LockManagerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/ResourceLockImpl.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/ResourceLockImpl.java
index 134ee8030d96b..dea9aa1acb90f 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/ResourceLockImpl.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/ResourceLockImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/package-info.java
index 8bbd06a74c1b9..02ab3a6b33cbc 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java
index 96c97b31e51b0..17f4d99c4ab5c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/AbstractMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java
index bbe7034d99093..7ab34ba608b18 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -385,11 +385,12 @@ private void handleBatchOperationResult(TxnResponse txnResponse,
                     case GET_CHILDREN: {
                         OpGetChildren getChildren = op.asGetChildren();
                         GetResponse gr = txnResponse.getGetResponses().get(getIdx++);
-                        String basePath = getChildren.getPath() + "/";
+                        String basePath =
+                                getChildren.getPath().equals("/") ? "/" : getChildren.getPath() + "/";
 
                         Set children = gr.getKvs().stream()
                                 .map(kv -> kv.getKey().toString(StandardCharsets.UTF_8))
-                                .map(p -> p.replace(basePath, ""))
+                                .map(p -> p.replaceFirst(basePath, ""))
                                 // Only return first-level children
                                 .map(k -> k.split("/", 2)[0])
                                 .collect(Collectors.toCollection(TreeSet::new));
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdSessionWatcher.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdSessionWatcher.java
index 248e01ee68d63..26ece398b98fd 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdSessionWatcher.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdSessionWatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/FaultInjectionMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/FaultInjectionMetadataStore.java
index 4972570654c1f..3bf326080c484 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/FaultInjectionMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/FaultInjectionMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java
index b520745a40659..e682300612d88 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -129,7 +129,7 @@ public CompletableFuture> getChildrenFromStore(String path) {
 
             Set children = new TreeSet<>();
             map.subMap(firstKey, false, lastKey, false).forEach((key, value) -> {
-                String relativePath = key.replace(firstKey, "");
+                String relativePath = key.replaceFirst(firstKey, "");
 
                 // Only return first-level children
                 String child = relativePath.split("/", 2)[0];
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImpl.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImpl.java
index 9d59bcd199ccb..c64c849f5293e 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImpl.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
index ab4f59fa5072d..632bcbf2107b5 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java
index b276d3cb7a860..d06d35db7acc4 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.metadata.impl;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
index 4e488df478f76..6ef4d7d75e27f 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -76,7 +76,7 @@ public class ZKMetadataStore extends AbstractBatchedMetadataStore
     private final MetadataStoreConfig metadataStoreConfig;
     private final boolean isZkManaged;
     private final ZooKeeper zkc;
-    private Optional sessionWatcher;
+    private final ZKSessionWatcher sessionWatcher;
 
     public ZKMetadataStore(String metadataURL, MetadataStoreConfig metadataStoreConfig, boolean enableSessionWatcher)
             throws MetadataStoreException {
@@ -96,23 +96,25 @@ public ZKMetadataStore(String metadataURL, MetadataStoreConfig metadataStoreConf
                     .connectRetryPolicy(new BoundExponentialBackoffRetryPolicy(100, 60_000, Integer.MAX_VALUE))
                     .allowReadOnlyMode(metadataStoreConfig.isAllowReadOnlyOperations())
                     .sessionTimeoutMs(metadataStoreConfig.getSessionTimeoutMillis())
-                    .watchers(Collections.singleton(event -> {
-                        if (sessionWatcher != null) {
-                            sessionWatcher.ifPresent(sw -> executor.execute(() -> sw.process(event)));
-                        }
-                    }))
+                    .watchers(Collections.singleton(this::processSessionWatcher))
                     .build();
-            zkc.addWatch("/", this::handleWatchEvent, AddWatchMode.PERSISTENT_RECURSIVE);
             if (enableSessionWatcher) {
-                sessionWatcher = Optional.of(new ZKSessionWatcher(zkc, this::receivedSessionEvent));
+                sessionWatcher = new ZKSessionWatcher(zkc, this::receivedSessionEvent);
             } else {
-                sessionWatcher = Optional.empty();
+                sessionWatcher = null;
             }
+            zkc.addWatch("/", this::handleWatchEvent, AddWatchMode.PERSISTENT_RECURSIVE);
         } catch (Throwable t) {
             throw new MetadataStoreException(t);
         }
     }
 
+    private void processSessionWatcher(WatchedEvent event) {
+        if (sessionWatcher != null) {
+            executor.execute(() -> sessionWatcher.process(event));
+        }
+    }
+
     @VisibleForTesting
     @SneakyThrows
     public ZKMetadataStore(ZooKeeper zkc) {
@@ -129,7 +131,7 @@ public ZKMetadataStore(ZooKeeper zkc, MetadataStoreConfig config) {
         this.metadataStoreConfig = null;
         this.isZkManaged = false;
         this.zkc = zkc;
-        this.sessionWatcher = Optional.of(new ZKSessionWatcher(zkc, this::receivedSessionEvent));
+        this.sessionWatcher = new ZKSessionWatcher(zkc, this::receivedSessionEvent);
         zkc.addWatch("/", this::handleWatchEvent, AddWatchMode.PERSISTENT_RECURSIVE);
     }
 
@@ -143,9 +145,11 @@ protected void receivedSessionEvent(SessionEvent event) {
                             super.receivedSessionEvent(event);
                         } else {
                             log.error("Failed to recreate persistent watch on ZooKeeper: {}", Code.get(rc));
-                            sessionWatcher.ifPresent(ZKSessionWatcher::setSessionInvalid);
-                            // On the reconnectable client, mark the session as expired to trigger a new reconnect and
-                            // we will have the chance to set the watch again.
+                            if (sessionWatcher != null) {
+                                sessionWatcher.setSessionInvalid();
+                            }
+                            // On the re-connectable client, mark the session as expired to trigger a new reconnect,
+                            // and we will have the chance to set the watch again.
                             if (zkc instanceof PulsarZooKeeperClient) {
                                 ((PulsarZooKeeperClient) zkc).process(
                                         new WatchedEvent(Watcher.Event.EventType.None,
@@ -423,8 +427,8 @@ public void close() throws Exception {
         if (isZkManaged) {
             zkc.close();
         }
-        if (sessionWatcher.isPresent()) {
-            sessionWatcher.get().close();
+        if (sessionWatcher != null) {
+            sessionWatcher.close();
         }
         super.close();
     }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKSessionWatcher.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKSessionWatcher.java
index a350d4a5b3d9c..a0247e2231949 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKSessionWatcher.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKSessionWatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -149,8 +149,8 @@ private void checkState(Watcher.Event.KeeperState zkClientState) {
                 currentStatus = SessionEvent.SessionLost;
                 sessionListener.accept(currentStatus);
             } else if (currentStatus != SessionEvent.SessionLost) {
-                log.warn("ZooKeeper client is disconnected. Waiting to reconnect, time remaining = {} seconds",
-                        timeRemainingMillis / 1000.0);
+                log.warn("[{}] ZooKeeper client is disconnected. Waiting to reconnect, time remaining = {} seconds",
+                        zk.getSessionId(), timeRemainingMillis / 1000.0);
                 if (currentStatus == SessionEvent.SessionReestablished) {
                     currentStatus = SessionEvent.ConnectionLost;
                     sessionListener.accept(currentStatus);
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java
index de7088d74afbc..52cd81abc5139 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/AbstractBatchedMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -34,6 +34,7 @@
 import org.apache.pulsar.metadata.api.Stat;
 import org.apache.pulsar.metadata.api.extended.CreateOption;
 import org.apache.pulsar.metadata.impl.AbstractMetadataStore;
+import org.apache.pulsar.metadata.impl.stats.BatchMetadataStoreStats;
 import org.jctools.queues.MessagePassingQueue;
 import org.jctools.queues.MpscUnboundedArrayQueue;
 
@@ -50,7 +51,8 @@ public abstract class AbstractBatchedMetadataStore extends AbstractMetadataStore
     private final int maxDelayMillis;
     private final int maxOperations;
     private final int maxSize;
-    private MetadataEventSynchronizer synchronizer;
+    private final MetadataEventSynchronizer synchronizer;
+    private final BatchMetadataStoreStats batchMetadataStoreStats;
 
     protected AbstractBatchedMetadataStore(MetadataStoreConfig conf) {
         super(conf.getMetadataStoreName());
@@ -74,6 +76,8 @@ protected AbstractBatchedMetadataStore(MetadataStoreConfig conf) {
         // update synchronizer and register sync listener
         synchronizer = conf.getSynchronizer();
         registerSyncLister(Optional.ofNullable(synchronizer));
+        this.batchMetadataStoreStats =
+                new BatchMetadataStoreStats(metadataStoreName, executor);
     }
 
     @Override
@@ -87,13 +91,14 @@ public void close() throws Exception {
             scheduledTask.cancel(true);
         }
         super.close();
+        this.batchMetadataStoreStats.close();
     }
 
     private void flush() {
         while (!readOps.isEmpty()) {
             List ops = new ArrayList<>();
             readOps.drain(ops::add, maxOperations);
-            batchOperation(ops);
+            internalBatchOperation(ops);
         }
 
         while (!writeOps.isEmpty()) {
@@ -114,7 +119,7 @@ private void flush() {
                 batchSize += op.size();
                 ops.add(writeOps.poll());
             }
-            batchOperation(ops);
+            internalBatchOperation(ops);
         }
 
         flushInProgress.set(false);
@@ -158,16 +163,26 @@ private void enqueue(MessagePassingQueue queue, MetadataOp op) {
         if (enabled) {
             if (!queue.offer(op)) {
                 // Execute individually if we're failing to enqueue
-                batchOperation(Collections.singletonList(op));
+                internalBatchOperation(Collections.singletonList(op));
                 return;
             }
             if (queue.size() > maxOperations && flushInProgress.compareAndSet(false, true)) {
                 executor.execute(this::flush);
             }
         } else {
-            batchOperation(Collections.singletonList(op));
+            internalBatchOperation(Collections.singletonList(op));
         }
     }
 
+    private void internalBatchOperation(List ops) {
+        long now = System.currentTimeMillis();
+        for (MetadataOp op : ops) {
+            this.batchMetadataStoreStats.recordOpWaiting(now - op.created());
+        }
+        this.batchOperation(ops);
+        this.batchMetadataStoreStats.recordOpsInBatch(ops.size());
+        this.batchMetadataStoreStats.recordBatchExecuteTime(System.currentTimeMillis() - now);
+    }
+
     protected abstract void batchOperation(List ops);
 }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/MetadataOp.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/MetadataOp.java
index 6c78c587aedd9..abf60f7b7245c 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/MetadataOp.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/MetadataOp.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -34,6 +34,8 @@ enum Type {
 
     int size();
 
+    long created();
+
     default OpGet asGet() {
         return (OpGet) this;
     }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpDelete.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpDelete.java
index 6a039c302eb32..f773d40fe08bd 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpDelete.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpDelete.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,6 +28,7 @@
 public class OpDelete implements MetadataOp {
     private final String path;
     private final Optional optExpectedVersion;
+    public final long created = System.currentTimeMillis();
 
     private final CompletableFuture future = new CompletableFuture<>();
 
@@ -40,4 +41,9 @@ public Type getType() {
     public int size() {
         return path.length();
     }
+
+    @Override
+    public long created() {
+        return this.created;
+    }
 }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGet.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGet.java
index 5d9c6e3536a1b..8c684b9d661fa 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGet.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,6 +29,7 @@
 public class OpGet implements MetadataOp {
 
     private final String path;
+    public final long created = System.currentTimeMillis();
     private final CompletableFuture> future = new CompletableFuture<>();
 
     @Override
@@ -40,4 +41,9 @@ public Type getType() {
     public int size() {
         return path.length();
     }
+
+    @Override
+    public long created() {
+        return this.created;
+    }
 }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGetChildren.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGetChildren.java
index 00220f4ba4895..777c8f7d0a337 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGetChildren.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpGetChildren.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,6 +28,7 @@
 public class OpGetChildren implements MetadataOp {
 
     private final String path;
+    public final long created = System.currentTimeMillis();
     private final CompletableFuture> future = new CompletableFuture<>();
 
     @Override
@@ -39,4 +40,9 @@ public Type getType() {
     public int size() {
         return path.length();
     }
+
+    @Override
+    public long created() {
+        return this.created;
+    }
 }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpPut.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpPut.java
index cb3832ecfc4ac..dc29fea955930 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpPut.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/OpPut.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -34,6 +34,7 @@ public class OpPut implements MetadataOp {
     private final Optional optExpectedVersion;
     private final EnumSet options;
 
+    public final long created = System.currentTimeMillis();
     private final CompletableFuture future = new CompletableFuture<>();
 
     public boolean isEphemeral() {
@@ -49,4 +50,9 @@ public Type getType() {
     public int size() {
         return path.length() + (data != null ? data.length : 0);
     }
+
+    @Override
+    public long created() {
+        return this.created;
+    }
 }
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/package-info.java
index 2abc069ee047b..f87f31f974768 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/batching/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/package-info.java
index f74f25d3c32ab..20bb0a2804097 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/BatchMetadataStoreStats.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/BatchMetadataStoreStats.java
new file mode 100644
index 0000000000000..f87155b9259be
--- /dev/null
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/BatchMetadataStoreStats.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.metadata.impl.stats;
+
+import io.prometheus.client.Gauge;
+import io.prometheus.client.Histogram;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public final class BatchMetadataStoreStats implements AutoCloseable {
+    private static final double[] BUCKETS = new double[]{1, 5, 10, 20, 50, 100, 200, 500, 1000};
+    private static final String NAME = "name";
+
+    private static final Gauge EXECUTOR_QUEUE_SIZE = Gauge
+            .build("pulsar_batch_metadata_store_executor_queue_size", "-")
+            .labelNames(NAME)
+            .register();
+    private static final Histogram OPS_WAITING = Histogram
+            .build("pulsar_batch_metadata_store_queue_wait_time", "-")
+            .unit("ms")
+            .labelNames(NAME)
+            .buckets(BUCKETS)
+            .register();
+    private static final Histogram BATCH_EXECUTE_TIME = Histogram
+            .build("pulsar_batch_metadata_store_batch_execute_time", "-")
+            .unit("ms")
+            .labelNames(NAME)
+            .buckets(BUCKETS)
+            .register();
+    private static final Histogram OPS_PER_BATCH = Histogram
+            .build("pulsar_batch_metadata_store_batch_size", "-")
+            .labelNames(NAME)
+            .buckets(BUCKETS)
+            .register();
+
+    private final AtomicBoolean closed = new AtomicBoolean(false);
+    private final ThreadPoolExecutor executor;
+    private final String metadataStoreName;
+
+    private final Histogram.Child batchOpsWaitingChild;
+    private final Histogram.Child batchExecuteTimeChild;
+    private final Histogram.Child opsPerBatchChild;
+
+    public BatchMetadataStoreStats(String metadataStoreName, ExecutorService executor) {
+        if (executor instanceof ThreadPoolExecutor tx) {
+            this.executor = tx;
+        } else {
+            this.executor = null;
+        }
+        this.metadataStoreName = metadataStoreName;
+
+        EXECUTOR_QUEUE_SIZE.setChild(new Gauge.Child() {
+            @Override
+            public double get() {
+                return BatchMetadataStoreStats.this.executor == null ? 0 :
+                        BatchMetadataStoreStats.this.executor.getQueue().size();
+            }
+        }, metadataStoreName);
+
+        this.batchOpsWaitingChild = OPS_WAITING.labels(metadataStoreName);
+        this.batchExecuteTimeChild = BATCH_EXECUTE_TIME.labels(metadataStoreName);
+        this.opsPerBatchChild = OPS_PER_BATCH.labels(metadataStoreName);
+
+    }
+
+    public void recordOpWaiting(long millis) {
+        this.batchOpsWaitingChild.observe(millis);
+    }
+
+    public void recordBatchExecuteTime(long millis) {
+        this.batchExecuteTimeChild.observe(millis);
+    }
+
+    public void recordOpsInBatch(int ops) {
+        this.opsPerBatchChild.observe(ops);
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (closed.compareAndSet(false, true)) {
+            EXECUTOR_QUEUE_SIZE.remove(this.metadataStoreName);
+            OPS_WAITING.remove(this.metadataStoreName);
+            BATCH_EXECUTE_TIME.remove(this.metadataStoreName);
+            OPS_PER_BATCH.remove(metadataStoreName);
+        }
+    }
+}
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/MetadataStoreStats.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/MetadataStoreStats.java
index 2351ba1a59105..45024a68383bd 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/MetadataStoreStats.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/MetadataStoreStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/package-info.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/package-info.java
index 15ca0d1c58263..3815f7ea214c3 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/package-info.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BacklogQuotaCompatibilityTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BacklogQuotaCompatibilityTest.java
index b93ba24e84417..02b88361357eb 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BacklogQuotaCompatibilityTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BacklogQuotaCompatibilityTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
index 6a15e1e8cc23e..57a4e388572fa 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java
index 2ce855a5dea0e..e642bb4fea7ac 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/CounterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LeaderElectionTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LeaderElectionTest.java
index 97587b1520e75..c187d20ed2d40 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LeaderElectionTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LeaderElectionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LockManagerTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LockManagerTest.java
index 1a4e4e7e9df10..be0b0448e9f36 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LockManagerTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LockManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataBenchmark.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataBenchmark.java
index 5766aa46d84a9..227c0e2c9dc35 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataBenchmark.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataBenchmark.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataCacheTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataCacheTest.java
index 43af3ad757ee4..b3a670dc43d14 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataCacheTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreBatchingTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreBatchingTest.java
index 8f159e6a91ec7..6653e74ae6a0c 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreBatchingTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreBatchingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreExtendedTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreExtendedTest.java
index 14cd5947b186b..17a7e0f39196a 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreExtendedTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreExtendedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
index b8a091fef2549..ece23583c4d46 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -500,4 +501,32 @@ public void testConcurrentDelete(String provider, Supplier urlSupplier)
         assertTrue(f1.isCompletedExceptionally() && !f2.isCompletedExceptionally() ||
                 ! f1.isCompletedExceptionally() && f2.isCompletedExceptionally());
     }
+
+    @Test(dataProvider = "impl")
+    public void testGetChildren(String provider, Supplier urlSupplier) throws Exception {
+        @Cleanup
+        MetadataStore store = MetadataStoreFactory.create(urlSupplier.get(), MetadataStoreConfig.builder().build());
+
+        store.put("/a/a-1", "value1".getBytes(StandardCharsets.UTF_8), Optional.empty()).join();
+        store.put("/a/a-2", "value1".getBytes(StandardCharsets.UTF_8), Optional.empty()).join();
+        store.put("/b/c/b/1", "value1".getBytes(StandardCharsets.UTF_8), Optional.empty()).join();
+
+        List subPaths = store.getChildren("/").get();
+        Set expectedSet = "ZooKeeper".equals(provider) ? Set.of("a", "b", "zookeeper") : Set.of("a", "b");
+        for (String subPath : subPaths) {
+            assertTrue(expectedSet.contains(subPath));
+        }
+
+        List subPaths2 = store.getChildren("/a").get();
+        Set expectedSet2 = Set.of("a-1", "a-2");
+        for (String subPath : subPaths2) {
+            assertTrue(expectedSet2.contains(subPath));
+        }
+
+        List subPaths3 = store.getChildren("/b").get();
+        Set expectedSet3 = Set.of("c");
+        for (String subPath : subPaths3) {
+            assertTrue(expectedSet3.contains(subPath));
+        }
+    }
 }
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java
index 9f311341092a6..726f5ae312d19 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/TestZKServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/ZKSessionTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/ZKSessionTest.java
index 126383c3afeb1..1757a6b991c0f 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/ZKSessionTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/ZKSessionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/EndToEndTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/EndToEndTest.java
index a7113d82bcb69..047bd2a7fd10d 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/EndToEndTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/EndToEndTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerManagerIteratorTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerManagerIteratorTest.java
index 0f9f957840460..b64cc964a999c 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerManagerIteratorTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerManagerIteratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerUnderreplicationManagerTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerUnderreplicationManagerTest.java
index 661eb13ac2835..0dd40c4779406 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerUnderreplicationManagerTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/LedgerUnderreplicationManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManagerTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManagerTest.java
index 6428296bd23db..700ed8365501c 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManagerTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLayoutManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManagerTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManagerTest.java
index 8e4e9c4362c0e..b5232f49bf44a 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManagerTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerAuditorManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGeneratorTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGeneratorTest.java
index c67daec93bbff..09bb85b140c6b 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGeneratorTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarLedgerIdGeneratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataDriverBaseStaticTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataDriverBaseStaticTest.java
index 736a73347f927..4ed2c4be7f4f2 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataDriverBaseStaticTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarMetadataDriverBaseStaticTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java
index 35db268461731..d2a21a2249df3 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,9 +22,13 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.expectThrows;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -33,15 +37,18 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.conf.AbstractConfiguration;
 import org.apache.bookkeeper.discover.BookieServiceInfo;
 import org.apache.bookkeeper.discover.RegistrationClient;
 import org.apache.bookkeeper.discover.RegistrationManager;
 import org.apache.bookkeeper.net.BookieId;
 import org.apache.bookkeeper.net.BookieSocketAddress;
+import org.apache.bookkeeper.versioning.Version;
 import org.apache.bookkeeper.versioning.Versioned;
 import org.apache.pulsar.metadata.BaseMetadataStoreTest;
 import org.apache.pulsar.metadata.api.MetadataStoreConfig;
@@ -130,8 +137,12 @@ public void testGetBookieServiceInfo(String provider, Supplier urlSuppli
         @Cleanup
         RegistrationClient rc = new PulsarRegistrationClient(store, ledgersRoot);
 
-        List addresses = new ArrayList<>(prepareNBookies(10));
-        List bookieServiceInfos = new ArrayList<>();
+        List addresses = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            addresses.add(BookieId.parse("BOOKIE-" + i));
+        }
+        Map bookieServiceInfos = new HashMap<>();
+        Set readOnlyBookies = new HashSet<>();
         int port = 223;
         for (BookieId address : addresses) {
             BookieServiceInfo info = new BookieServiceInfo();
@@ -143,21 +154,113 @@ public void testGetBookieServiceInfo(String provider, Supplier urlSuppli
             endpoint.setPort(port++);
             endpoint.setProtocol("bookie-rpc");
             info.setEndpoints(Arrays.asList(endpoint));
-            bookieServiceInfos.add(info);
+            bookieServiceInfos.put(address, info);
             // some readonly, some writable
             boolean readOnly = port % 2 == 0;
+            if (readOnly) {
+                readOnlyBookies.add(address);
+            }
             rm.registerBookie(address, readOnly, info);
+            // write the cookie
+            rm.writeCookie(address, new Versioned<>(new byte[0], Version.NEW));
         }
 
         // trigger loading the BookieServiceInfo in the local cache
-        rc.getAllBookies().join();
+        getAndVerifyAllBookies(rc, addresses);
 
-        int i = 0;
+        Awaitility.await().untilAsserted(() -> {
         for (BookieId address : addresses) {
             BookieServiceInfo bookieServiceInfo = rc.getBookieServiceInfo(address).get().getValue();
-            compareBookieServiceInfo(bookieServiceInfo, bookieServiceInfos.get(i++));
+            compareBookieServiceInfo(bookieServiceInfo, bookieServiceInfos.get(address));
+        }});
+
+        // shutdown the bookies (but keep the cookie)
+        for (BookieId address : addresses) {
+            rm.unregisterBookie(address, readOnlyBookies.contains(address));
+            readOnlyBookies.remove(address);
+        }
+
+        // getAllBookies should find all the bookies in any case (it reads the cookies)
+        getAndVerifyAllBookies(rc, addresses);
+
+        // getBookieServiceInfo should fail with BKBookieHandleNotAvailableException
+        Awaitility.await().untilAsserted(() -> {
+        for (BookieId address : addresses) {
+            assertTrue(
+                expectThrows(ExecutionException.class, () -> {
+                    rc.getBookieServiceInfo(address).get();
+            }).getCause() instanceof BKException.BKBookieHandleNotAvailableException);
+        }});
+
+
+        // restart the bookies, all writable
+        // we 'register' the bookie, but do not write the cookie again
+        for (BookieId address : addresses) {
+            rm.registerBookie(address, false, bookieServiceInfos.get(address));
+        }
+
+        getAndVerifyAllBookies(rc, addresses);
+
+        // verify that infos are available again
+        Awaitility.await()
+                .ignoreExceptionsMatching(e -> e.getCause() instanceof BKException.BKBookieHandleNotAvailableException)
+                .untilAsserted(() -> {
+                    for (BookieId address : addresses) {
+                        BookieServiceInfo bookieServiceInfo = rc.getBookieServiceInfo(address).get().getValue();
+                        compareBookieServiceInfo(bookieServiceInfo, bookieServiceInfos.get(address));
+                    }
+                });
+
+        // update the infos
+        port = 111;
+        for (BookieId address : addresses) {
+            BookieServiceInfo info = new BookieServiceInfo();
+            BookieServiceInfo.Endpoint endpoint = new BookieServiceInfo.Endpoint();
+            endpoint.setAuth(Collections.emptyList());
+            endpoint.setExtensions(Collections.emptyList());
+            endpoint.setId("id");
+            endpoint.setHost("localhost");
+            endpoint.setPort(port++);
+            endpoint.setProtocol("bookie-rpc");
+            info.setEndpoints(Arrays.asList(endpoint));
+            bookieServiceInfos.put(address, info);
+            // some readonly, some writable
+            boolean readOnly = port % 2 == 0;
+
+            // remove the previous info from the metadata service
+            rm.unregisterBookie(address, readOnlyBookies.contains(address));
+
+            rm.registerBookie(address, readOnly, info);
+
+            if (readOnly) {
+                readOnlyBookies.add(address);
+            }
         }
 
+        // verify that the client tracked the changes
+        Awaitility
+                .await()
+                .ignoreExceptionsMatching(e -> e.getCause() instanceof BKException.BKBookieHandleNotAvailableException)
+                .untilAsserted(() -> {
+            // verify that infos are updated
+            for (BookieId address : addresses) {
+                BookieServiceInfo bookieServiceInfo = rc.getBookieServiceInfo(address).get().getValue();
+                compareBookieServiceInfo(bookieServiceInfo, bookieServiceInfos.get(address));
+            }
+        });
+
+    }
+
+    private static void getAndVerifyAllBookies(RegistrationClient rc, List addresses)
+            throws InterruptedException, ExecutionException {
+        Set all = rc.getAllBookies().get().getValue();
+        assertEquals(all.size(), addresses.size());
+        for (BookieId id : all) {
+            assertTrue(addresses.contains(id));
+        }
+        for (BookieId id : addresses) {
+            assertTrue(all.contains(id));
+        }
     }
 
     private void compareBookieServiceInfo(BookieServiceInfo a, BookieServiceInfo b) {
@@ -194,8 +297,7 @@ public void testGetAllBookies(String provider, Supplier urlSupplier) thr
         List children = new ArrayList<>();
         for (BookieId address : addresses) {
             children.add(address.toString());
-            boolean isReadOnly = children.size() % 2 == 0;
-            rm.registerBookie(address, isReadOnly, new BookieServiceInfo());
+            rm.writeCookie(address, new Versioned<>(new byte[0], Version.NEW));
         }
 
         Versioned> result = result(rc.getAllBookies());
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManagerTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManagerTest.java
index 9765f4d6bfdb9..1a677914f8fa1 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManagerTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
index fd1b8ac455217..f1a1b5626acce 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStoreTest.java
index 1df9507603355..3fabe9647eb34 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStoreTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,6 +24,7 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
+import com.google.common.collect.Sets;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.HashSet;
@@ -44,7 +45,6 @@
 import org.apache.pulsar.metadata.api.Stat;
 import org.apache.pulsar.metadata.api.extended.CreateOption;
 import org.awaitility.Awaitility;
-import org.testcontainers.shaded.com.google.common.collect.Sets;
 import org.testng.annotations.Test;
 
 import lombok.Cleanup;
@@ -86,7 +86,7 @@ public void testNotifyEvent() throws Exception {
             assertEquals((long) event2.getExpectedVersion(), exptectedVersion);
             assertEquals(event2.getType(), NotificationType.Modified);
         }
-        
+
         // (3) delete node
         sync.notifiedEvents.remove(path);
         store1.delete(path, Optional.of(exptectedVersion)).join();
@@ -176,7 +176,7 @@ public void testSyncListener() throws Exception {
         store1.put(path, value1, Optional.empty()).join();
 
         assertTrue(store1.exists(path).join());
-        
+
         Stat stats = store1.get(path).get().get().getStat();
         MetadataEvent event = new MetadataEvent(path, value2, EMPTY_SET, stats.getVersion(),
                 stats.getModificationTimestamp() + 1, sync.clusterName, NotificationType.Modified);
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataEventSynchronizerTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataEventSynchronizerTest.java
index df5f900015770..3b07e0b3c2bd6 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataEventSynchronizerTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/MetadataEventSynchronizerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStoreTest.java
index 07dbdcd0c09c7..7700fb3654d7e 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStoreTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.metadata.impl;
 
 import java.nio.charset.StandardCharsets;
diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java
index dbb29e416d741..8315e159336c0 100644
--- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java
+++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageConfiguration.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageConfiguration.java
index 1d6758b248a8b..f099edd4bd983 100644
--- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageConfiguration.java
+++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageProvider.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageProvider.java
index e23ecaa703501..2578f5987f229 100644
--- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageProvider.java
+++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStream.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStream.java
index 3575ad5f8acd9..450e9ac5f1010 100644
--- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStream.java
+++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStream.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStream.java
index 7329aa96d8e7c..222987aa49d43 100644
--- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStream.java
+++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/package-info.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/package-info.java
index d82dba7fa1ad0..8d01ef49c0329 100644
--- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/package-info.java
+++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Packages management storage implementation with bookkeeper.
  */
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
index 104fcbe3f3485..ffca82f82a897 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStreamTest.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStreamTest.java
index a4b43ff381826..d13b7b27a7293 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStreamTest.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLInputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStreamTest.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStreamTest.java
index b7b1c35cba3da..63fcf5e46ebe1 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStreamTest.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/DLOutputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/BookKeeperClusterTestCase.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/BookKeeperClusterTestCase.java
index 327562c77de4c..40c2041d4e6c4 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/BookKeeperClusterTestCase.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/BookKeeperClusterTestCase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java
index 2a0518079f68c..052d643ba7192 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/PortManager.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/PortManager.java
index daed597993b3c..40dcfa536a421 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/PortManager.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/PortManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
index 17129435e8c3e..559cc54d8b696 100644
--- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
+++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/ZooKeeperUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.packages.management.storage.bookkeeper.bookkeeper.test;
 
+import static org.testng.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.bookkeeper.test.ZooKeeperCluster;
 import org.apache.bookkeeper.util.IOUtils;
 import org.apache.bookkeeper.zookeeper.ZooKeeperClient;
@@ -34,7 +33,6 @@
 import org.apache.zookeeper.server.NIOServerCnxnFactory;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.test.ClientBase;
-import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -136,7 +134,7 @@ public void stopCluster() throws Exception {
 
         if (this.serverFactory != null) {
             this.serverFactory.shutdown();
-            Assert.assertTrue("waiting for server down", ClientBase.waitForServerDown(this.getZooKeeperConnectString(), (long)ClientBase.CONNECTION_TIMEOUT));
+            assertTrue(ClientBase.waitForServerDown(this.getZooKeeperConnectString(), (long)ClientBase.CONNECTION_TIMEOUT),"waiting for server down");
         }
 
         if (this.zks != null) {
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesManagement.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesManagement.java
index ce484525da325..32eeeddd3602c 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesManagement.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesManagement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorage.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorage.java
index 6cebe6c6370e7..22f8592387947 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorage.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageConfiguration.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageConfiguration.java
index 5c346a0d05c42..639a030f1758a 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageConfiguration.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageProvider.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageProvider.java
index 7d01d09ff62af..2ff19d12bb1c9 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageProvider.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/PackagesStorageProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadataUtil.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadataUtil.java
index 523bdfe27b93f..27b37d06b1df5 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadataUtil.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageMetadataUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageName.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageName.java
index 831b44bbe4209..73cbe4186f61f 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageName.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/PackageName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java
index 12302ebdf53f5..66faf846ec752 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/common/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Packages management general classes.
  */
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/DefaultPackagesStorageConfiguration.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/DefaultPackagesStorageConfiguration.java
index d3c5d7494b370..26ad5fa766732 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/DefaultPackagesStorageConfiguration.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/DefaultPackagesStorageConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImpl.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImpl.java
index 792a1ecf10665..449d1268f3fd5 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImpl.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -84,20 +84,20 @@ public CompletableFuture updateMeta(PackageName packageName, PackageMetada
                     future.completeExceptionally(throwable);
                     return;
                 }
-                try (ByteArrayInputStream inputStream = new ByteArrayInputStream(PackageMetadataUtil.toBytes(metadata))) {
+                try (ByteArrayInputStream in = new ByteArrayInputStream(PackageMetadataUtil.toBytes(metadata))) {
                     storage.deleteAsync(metadataPath)
-                        .thenCompose(aVoid -> storage.writeAsync(metadataPath, inputStream))
+                        .thenCompose(aVoid -> storage.writeAsync(metadataPath, in))
                         .whenComplete((aVoid, t) -> {
                             if (t != null) {
                                 future.completeExceptionally(new PackagesManagementException(
-                                    String.format("Update package '%s' metadata failed", packageName.toString()), t));
+                                    String.format("Update package '%s' metadata failed", packageName), t));
                             } else {
                                 future.complete(null);
                             }
                         });
                 } catch (IOException e) {
                     future.completeExceptionally(new PackagesManagementException(
-                        String.format("Read package '%s' metadata failed", packageName.toString()), e));
+                        String.format("Read package '%s' metadata failed", packageName), e));
                 }
             });
         return future;
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/package-info.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/package-info.java
index e32095143bd26..030565bc2d2cd 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/package-info.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Packages management service implementation.
  */
diff --git a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/package-info.java b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/package-info.java
index 994824e221678..03449c9f35148 100644
--- a/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/package-info.java
+++ b/pulsar-package-management/core/src/main/java/org/apache/pulsar/packages/management/core/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Packages management provides an easier way to manage the packages.
  * We abstract the storage so we can store the packages anywhere. And we can store the
diff --git a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorage.java b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorage.java
index 8af3195db1cfe..1a4b8010d51bd 100644
--- a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorage.java
+++ b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorageProvider.java b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorageProvider.java
index eb8ce1847ae35..4ca657342fdb7 100644
--- a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorageProvider.java
+++ b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorageProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageMetadataSerdeTest.java b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageMetadataSerdeTest.java
index fd74a81e663f0..01aa9d2fbdd48 100644
--- a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageMetadataSerdeTest.java
+++ b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageMetadataSerdeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageNameTest.java b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageNameTest.java
index 8d9faabafe38f..cece1093f8da5 100644
--- a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageNameTest.java
+++ b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/common/PackageNameTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImplTest.java b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImplTest.java
index aba86501372f6..cabf6de5021b5 100644
--- a/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImplTest.java
+++ b/pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/impl/PackagesManagementImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorage.java b/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorage.java
index 74d77fe35722b..47d825ea928f4 100644
--- a/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorage.java
+++ b/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageProvider.java b/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageProvider.java
index 74b46e287024a..d22459b03963c 100644
--- a/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageProvider.java
+++ b/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/package-info.java b/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/package-info.java
index 1186e2bf08757..bd40590f35228 100644
--- a/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/package-info.java
+++ b/pulsar-package-management/filesystem-storage/src/main/java/org/apache/pulsar/packages/management/storage/filesystem/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 /**
  * Packages management storage implementation with filesystem.
  */
diff --git a/pulsar-package-management/filesystem-storage/src/test/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageTest.java b/pulsar-package-management/filesystem-storage/src/test/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageTest.java
index 0b254ede5f4b5..ca738a3b517f7 100644
--- a/pulsar-package-management/filesystem-storage/src/test/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageTest.java
+++ b/pulsar-package-management/filesystem-storage/src/test/java/org/apache/pulsar/packages/management/storage/filesystem/FileSystemPackagesStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index a870dbecded92..0fcc2c5c7aa8a 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -180,11 +180,6 @@
       ipaddress
       ${seancfoley.ipaddress.version}
     
-    
-      org.awaitility
-      awaitility
-      test
-    
   
   
     
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ExtensionsDefinitions.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ExtensionsDefinitions.java
index 2cdbad64f1cfe..eb4377182daca 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ExtensionsDefinitions.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ExtensionsDefinitions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtension.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtension.java
index 928a4b4189a2a..249caeeab63ba 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtension.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtension.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionDefinition.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionDefinition.java
index 65560260c2478..84dcbb6a0fcb1 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionDefinition.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionDefinition.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionMetadata.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionMetadata.java
index 935a393370308..f39fc07e44322 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionMetadata.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoader.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoader.java
index 922c3391d9295..4d3204b2a172a 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoader.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensions.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensions.java
index 14dae3ac02c7c..75059fc0d2551 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensions.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsUtils.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsUtils.java
index 2acf3da1c44d1..f04f86f0d3e14 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsUtils.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/package-info.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/package-info.java
index 7ef16895e8b88..91f28d0db7165 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/package-info.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/extensions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java
index 82ea0daeb4ff9..e978f7c1ad5b1 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java
index b781c7c3298a2..9464884c8bdee 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerDiscoveryProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerProxyValidator.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerProxyValidator.java
index ab44e163bad92..f521f56da30a3 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerProxyValidator.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/BrokerProxyValidator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.proxy.server;
 
 import inet.ipaddr.IPAddress;
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/DirectProxyHandler.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/DirectProxyHandler.java
index 3994cf9034a8a..d51f17b4731fa 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/DirectProxyHandler.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/DirectProxyHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.proxy.server;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/LookupProxyHandler.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/LookupProxyHandler.java
index 472de4327f900..5101978c3e2dc 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/LookupProxyHandler.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/LookupProxyHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ParserProxyHandler.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ParserProxyHandler.java
index adab5679a006a..22957c9599f18 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ParserProxyHandler.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ParserProxyHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.proxy.server;
 
 import io.netty.buffer.ByteBuf;
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyClientCnx.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyClientCnx.java
index 283b835fff54f..6f41af6234206 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyClientCnx.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyClientCnx.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
index 9938a1fe30721..6162398b75a11 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConnection.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConnection.java
index b63ca3aa549a2..531f9f67eb49f 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConnection.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConnection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyReadTimeoutHandler.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyReadTimeoutHandler.java
index f0cf2a2a41cd7..df650a0ca16c1 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyReadTimeoutHandler.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyReadTimeoutHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
index cc1e4cbc8801f..db061fe9c593d 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
index 5b9f0b6d94d7a..923072a43299d 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -36,6 +36,7 @@
 import java.util.Collections;
 import java.util.Date;
 import lombok.Getter;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.util.datetime.FixedDateFormat;
 import org.apache.pulsar.broker.PulsarServerException;
 import org.apache.pulsar.broker.ServiceConfiguration;
@@ -241,6 +242,8 @@ public void close() {
             }
         } catch (Exception e) {
             log.warn("server couldn't stop gracefully {}", e.getMessage(), e);
+        } finally {
+            LogManager.shutdown();
         }
     }
 
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ServiceChannelInitializer.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ServiceChannelInitializer.java
index 32c50400473ec..7e7ba31b79fe3 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ServiceChannelInitializer.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ServiceChannelInitializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/TargetAddressDeniedException.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/TargetAddressDeniedException.java
index e62525fbca175..271643c6ae4ef 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/TargetAddressDeniedException.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/TargetAddressDeniedException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.proxy.server;
 
 class TargetAddressDeniedException extends RuntimeException {
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/WebServer.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/WebServer.java
index 193d0c7c93ff3..70799aa48f259 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/WebServer.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/WebServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/package-info.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/package-info.java
index 07a8290a5320c..ef53ccff64897 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/package-info.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ConnectionStats.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ConnectionStats.java
index 9f462abf3facb..1b36b2f4e738f 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ConnectionStats.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ConnectionStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ProxyStats.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ProxyStats.java
index d0213899046c8..27e61c90e9e26 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ProxyStats.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/ProxyStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/RestException.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/RestException.java
index 7ba8d99615df7..db2b301d4dc46 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/RestException.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/RestException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/TopicStats.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/TopicStats.java
index 1c808a873f35d..008dbac7ab405 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/TopicStats.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/TopicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/package-info.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/package-info.java
index 2eb5cf88c7e02..0144623ff0610 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/package-info.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/CmdGenerateDocumentation.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/CmdGenerateDocumentation.java
index fd9da218d9c45..a1c7e30a25ed6 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/CmdGenerateDocumentation.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/CmdGenerateDocumentation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/package-info.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/package-info.java
index eddea63243cf0..1501a16f55813 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/package-info.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/MockProxyExtension.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/MockProxyExtension.java
index 94dd3b55e2c62..7ea875dd6b73b 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/MockProxyExtension.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/MockProxyExtension.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionUtilsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionUtilsTest.java
index 7f87a9d4649be..e2809ff77ed4f 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionUtilsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoaderTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoaderTest.java
index 57882a6a4b33b..fcf6c95785ab1 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoaderTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionWithClassLoaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsTest.java
index 00fb3be50c3ac..66a279d909f96 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/ProxyExtensionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSeparateThreadPoolTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSeparateThreadPoolTest.java
index 2c2281f9eb898..d07ac212c23bb 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSeparateThreadPoolTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSeparateThreadPoolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSharedThreadPoolTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSharedThreadPoolTest.java
index 35fb7289b5025..7ee2ee5992ad3 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSharedThreadPoolTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionSharedThreadPoolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionTestBase.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionTestBase.java
index c779acb6ebe90..79662097c3b2f 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionTestBase.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/extensions/SimpleProxyExtensionTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerTest.java
index 4dceb926707ef..becebe0059e56 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java
index a4a3f01284ed4..7abee46aea61d 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AuthedAdminProxyHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/BrokerProxyValidatorTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/BrokerProxyValidatorTest.java
index fba3c36e26616..731bc2e006de1 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/BrokerProxyValidatorTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/BrokerProxyValidatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.proxy.server;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -24,13 +23,13 @@
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import com.google.common.net.InetAddresses;
 import io.netty.resolver.AddressResolver;
 import io.netty.util.concurrent.EventExecutor;
 import io.netty.util.concurrent.SucceededFuture;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.ExecutionException;
-import org.apache.curator.shaded.com.google.common.net.InetAddresses;
 import org.testng.annotations.Test;
 
 public class BrokerProxyValidatorTest {
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/FunctionWorkerRoutingTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/FunctionWorkerRoutingTest.java
index b5d89cce6647a..db5e9e12bd2db 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/FunctionWorkerRoutingTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/FunctionWorkerRoutingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/InvalidProxyConfigForAuthorizationTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/InvalidProxyConfigForAuthorizationTest.java
index da9d18f74adf0..c29bfaa964812 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/InvalidProxyConfigForAuthorizationTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/InvalidProxyConfigForAuthorizationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAdditionalServletTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAdditionalServletTest.java
index ecc21823e3339..17cd3c33e799d 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAdditionalServletTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAdditionalServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticatedProducerConsumerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticatedProducerConsumerTest.java
index 622cc7dc35f59..904883c18540d 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticatedProducerConsumerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticatedProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticationTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticationTest.java
index 9ebe0ab65c820..eea5c26e66728 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticationTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyAuthenticationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConfigurationTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConfigurationTest.java
index f66ab2e99ccd5..7a2e122c10852 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConfigurationTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionTest.java
index 8c07e4b42d797..1abba6d6d8c7f 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionThrottlingTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionThrottlingTest.java
index 9b18e44ffb142..336f11ae19da6 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionThrottlingTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionThrottlingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyDisableZeroCopyTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyDisableZeroCopyTest.java
index e21fbfc626697..3aa71413d540b 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyDisableZeroCopyTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyDisableZeroCopyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyEnableHAProxyProtocolTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyEnableHAProxyProtocolTest.java
index 25eda8ddf08b6..8b3092c6f5170 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyEnableHAProxyProtocolTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyEnableHAProxyProtocolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyForwardAuthDataTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyForwardAuthDataTest.java
index aa8475565155b..99af3b1cf6abe 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyForwardAuthDataTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyForwardAuthDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyIsAHttpProxyTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyIsAHttpProxyTest.java
index fe6b4b867f0a3..d3a58ad453c2d 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyIsAHttpProxyTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyIsAHttpProxyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java
index 0feb60d8153b5..88e7b269d6eeb 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java
index 95c30cf768ff1..5feef74e3b94b 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyKeyStoreTlsTestWithoutAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyLookupThrottlingTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyLookupThrottlingTest.java
index 6b2dd3221f50f..4861117ef6ff5 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyLookupThrottlingTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyLookupThrottlingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyMutualTlsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyMutualTlsTest.java
index 99ffac495cb12..ad237c2539700 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyMutualTlsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyMutualTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java
index 79b398dc2b4bf..82cd702aa7f0a 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyPrometheusMetricsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyPrometheusMetricsTest.java
index aca474ea544b9..2581e5ae6dc05 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyPrometheusMetricsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyPrometheusMetricsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRefreshAuthTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRefreshAuthTest.java
index 9ccb067adbf10..d14105b0b43c2 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRefreshAuthTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRefreshAuthTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -158,9 +158,8 @@ public void testAuthDataRefresh(boolean forwardAuthData) throws Exception {
             return AuthTokenUtils.createToken(SECRET_KEY, "client", Optional.of(calendar.getTime()));
         });
 
-        pulsarClient = PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
-                .authentication(authenticationToken)
-                .build();
+        replacePulsarClient(PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
+                .authentication(authenticationToken));
 
         String topic = "persistent://my-tenant/my-ns/my-topic1";
         @Cleanup
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRolesEnforcementTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRolesEnforcementTest.java
index 39446af99a577..2c8c382b6a5ef 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRolesEnforcementTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyRolesEnforcementTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,9 +19,7 @@
 package org.apache.pulsar.proxy.server;
 
 import static org.mockito.Mockito.spy;
-
 import com.google.common.collect.Sets;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -29,9 +27,7 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
-
 import javax.naming.AuthenticationException;
-
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
 import org.apache.pulsar.broker.authentication.AuthenticationProvider;
@@ -194,15 +190,16 @@ public void testIncorrectRoles() throws Exception {
         admin.namespaces().grantPermissionOnNamespace(namespaceName, "client",
                 Sets.newHashSet(AuthAction.consume, AuthAction.produce));
 
-        // Step 2: Try to use proxy Client as a normal Client - expect exception
-        PulsarClient proxyClient = createPulsarClient(pulsar.getBrokerServiceUrl(), proxyAuthParams);
         boolean exceptionOccurred = false;
-        try {
-            proxyClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
-        } catch (Exception ex) {
-            exceptionOccurred = true;
+        // Step 2: Try to use proxy Client as a normal Client - expect exception
+        try (PulsarClient proxyClient = createPulsarClient(pulsar.getBrokerServiceUrl(), proxyAuthParams)) {
+            try {
+                proxyClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
+            } catch (Exception ex) {
+                exceptionOccurred = true;
+            }
+            Assert.assertTrue(exceptionOccurred);
         }
-        Assert.assertTrue(exceptionOccurred);
 
         // Step 3: Run Pulsar Proxy and pass proxy params as client params - expect exception
         ProxyConfiguration proxyConfig = new ProxyConfiguration();
@@ -219,26 +216,29 @@ public void testIncorrectRoles() throws Exception {
         Set providers = new HashSet<>();
         providers.add(BasicAuthenticationProvider.class.getName());
         proxyConfig.setAuthenticationProviders(providers);
-        ProxyService proxyService = new ProxyService(proxyConfig,
-                                                     new AuthenticationService(
-                                                             PulsarConfigurationLoader.convertFrom(proxyConfig)));
-        proxyService.start();
-
-        proxyClient = createPulsarClient(proxyService.getServiceUrl(), proxyAuthParams);
-        exceptionOccurred = false;
-        try {
-            proxyClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
-        } catch (Exception ex) {
-            exceptionOccurred = true;
-        }
-
-        Assert.assertTrue(exceptionOccurred);
-
-        // Step 4: Pass correct client params
-        proxyClient = createPulsarClient(proxyService.getServiceUrl(), clientAuthParams);
-        proxyClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
-        proxyClient.close();
-        proxyService.close();
+
+        try (ProxyService proxyService = new ProxyService(proxyConfig,
+                new AuthenticationService(
+                        PulsarConfigurationLoader.convertFrom(proxyConfig)))) {
+            proxyService.start();
+
+
+            try (PulsarClient proxyClient = createPulsarClient(proxyService.getServiceUrl(), proxyAuthParams)) {
+                exceptionOccurred = false;
+                try {
+                    proxyClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
+                } catch (Exception ex) {
+                    exceptionOccurred = true;
+                }
+
+                Assert.assertTrue(exceptionOccurred);
+            }
+
+            // Step 4: Pass correct client params
+            try (PulsarClient proxyClient = createPulsarClient(proxyService.getServiceUrl(), clientAuthParams)) {
+                proxyClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
+            }
+        }
     }
 
     private void createAdminClient() throws PulsarClientException {
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterDisableZeroCopyTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterDisableZeroCopyTest.java
index 909955ec8d01f..0c9fa5c7ac322 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterDisableZeroCopyTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterDisableZeroCopyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterTest.java
index c2c4a4a3351c9..d963681de67c0 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceTlsStarterTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceTlsStarterTest.java
index 742cfbb6581ee..6c8384db6caf9 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceTlsStarterTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceTlsStarterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
index c7b84097ba87f..7c5ce25475c1b 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyStatsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
index 728dfb2047858..43f79cfb23aff 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java
index 43e42356d1873..e1cf62aafa8a3 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java
index 991dbdccb5e80..d5b70dfa03756 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTestWithAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationNegTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationNegTest.java
index 0fad961ba2110..3466662e3c319 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationNegTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationNegTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java
index bb5b61633c976..6d5381bdcd5c6 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithJwtAuthorizationTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithJwtAuthorizationTest.java
index 206b90a6909ba..1fbd4b13f79fd 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithJwtAuthorizationTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithJwtAuthorizationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -32,6 +32,7 @@
 import javax.crypto.SecretKey;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.core.Response;
+import lombok.Cleanup;
 import org.apache.pulsar.broker.authentication.AuthenticationProviderToken;
 import org.apache.pulsar.broker.authentication.AuthenticationService;
 import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
@@ -146,6 +147,7 @@ public void testProxyAuthorization() throws Exception {
 
         startProxy();
         createAdminClient();
+        @Cleanup
         PulsarClient proxyClient = createPulsarClient(proxyService.getServiceUrl(), PulsarClient.builder());
 
         String namespaceName = "my-property/proxy-authorization/my-ns";
@@ -226,6 +228,7 @@ public void testUpdatePartitionNumAndReconnect() throws Exception {
 
         startProxy();
         createAdminClient();
+        @Cleanup
         PulsarClient proxyClient = createPulsarClient(proxyService.getServiceUrl(), PulsarClient.builder());
 
         String clusterName = "proxy-authorization";
@@ -341,6 +344,7 @@ public void testProxyAuthorizationWithPrefixSubscriptionAuthMode() throws Except
 
         startProxy();
         createAdminClient();
+        @Cleanup
         PulsarClient proxyClient = createPulsarClient(proxyService.getServiceUrl(), PulsarClient.builder());
 
         String namespaceName = "my-property/proxy-authorization/my-ns";
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithoutServiceDiscoveryTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithoutServiceDiscoveryTest.java
index 1ccc5ca5d31ec..6a61decfcc693 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithoutServiceDiscoveryTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithoutServiceDiscoveryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java
index 9f0eb0998cc4a..5b7cb88f98280 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/SuperUserAuthedAdminProxyHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java
index 727fd2f5244ad..d5cdbc5bb3c51 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/UnauthedAdminProxyHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/util/CmdTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/util/CmdTest.java
index be05e6bfa4092..59e1a43310d67 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/util/CmdTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/util/CmdTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/pom.xml b/pulsar-sql/pom.xml
index b546b7c6b532d..3f8f3b5e044fd 100644
--- a/pulsar-sql/pom.xml
+++ b/pulsar-sql/pom.xml
@@ -63,6 +63,23 @@
                 ${okio.version}
             
 
+            
+            
+                org.jline
+                jline-reader
+                ${jline3.version}
+            
+            
+                org.jline
+                jline-terminal
+                ${jline3.version}
+            
+            
+                org.jline
+                jline-terminal-jna
+                ${jline3.version}
+            
+
             
             
                 org.slf4j
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 18c6420f0c00b..a1e949f59091d 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -209,7 +209,7 @@ The Apache Software License, Version 2.0
   * Jackson
     - jackson-annotations-2.13.4.jar
     - jackson-core-2.13.4.jar
-    - jackson-databind-2.13.4.jar
+    - jackson-databind-2.13.4.2.jar
     - jackson-dataformat-smile-2.13.4.jar
     - jackson-datatype-guava-2.13.4.jar
     - jackson-datatype-jdk8-2.13.4.jar
@@ -256,6 +256,9 @@ The Apache Software License, Version 2.0
     - netty-transport-native-unix-common-4.1.77.Final.jar
     - netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar
     - netty-codec-http2-4.1.77.Final.jar
+    - netty-incubator-transport-classes-io_uring-0.0.15.Final.jar
+    - netty-incubator-transport-native-io_uring-0.0.15.Final-linux-x86_64.jar
+    - netty-incubator-transport-native-io_uring-0.0.15.Final-linux-aarch_64.jar
  * GRPC
     - grpc-api-1.45.1.jar
     - grpc-context-1.45.1.jar
@@ -363,7 +366,7 @@ The Apache Software License, Version 2.0
     - avro-1.10.2.jar
     - avro-protobuf-1.10.2.jar
   * Caffeine
-    - caffeine-2.9.1.jar
+    - caffeine-3.1.2.jar
   * Javax
     - javax.inject-1.jar
     - javax.servlet-api-3.1.0.jar
@@ -418,18 +421,18 @@ The Apache Software License, Version 2.0
     - async-http-client-2.12.1.jar
     - async-http-client-netty-utils-2.12.1.jar
   * Apache Bookkeeper
-    - bookkeeper-common-4.15.1.jar
-    - bookkeeper-common-allocator-4.15.1.jar
-    - bookkeeper-proto-4.15.1.jar
-    - bookkeeper-server-4.15.1.jar
-    - bookkeeper-stats-api-4.15.1.jar
-    - bookkeeper-tools-framework-4.15.1.jar
-    - circe-checksum-4.15.1.jar
-    - codahale-metrics-provider-4.15.1.jar
-    - cpu-affinity-4.15.1.jar
-    - http-server-4.15.1.jar
-    - prometheus-metrics-provider-4.15.1.jar
-    - codahale-metrics-provider-4.15.1.jar
+    - bookkeeper-common-4.15.3.jar
+    - bookkeeper-common-allocator-4.15.3.jar
+    - bookkeeper-proto-4.15.3.jar
+    - bookkeeper-server-4.15.3.jar
+    - bookkeeper-stats-api-4.15.3.jar
+    - bookkeeper-tools-framework-4.15.3.jar
+    - circe-checksum-4.15.3.jar
+    - codahale-metrics-provider-4.15.3.jar
+    - cpu-affinity-4.15.3.jar
+    - http-server-4.15.3.jar
+    - prometheus-metrics-provider-4.15.3.jar
+    - codahale-metrics-provider-4.15.3.jar
   * Apache Commons
     - commons-cli-1.5.0.jar
     - commons-codec-1.15.jar
@@ -492,9 +495,9 @@ BSD License
     - asm-tree-6.2.1.jar
     - asm-util-6.2.1.jar
  * JLine
-   - jline-reader-3.17.1.jar
-   - jline-terminal-3.17.1.jar
-   - jline-terminal-jna-3.17.1.jar
+   - jline-reader-3.21.0.jar
+   - jline-terminal-3.21.0.jar
+   - jline-terminal-jna-3.21.0.jar
 
 MIT License
  * PCollections
diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index fcb66defeb804..2555d7b12985b 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -329,7 +329,7 @@
       
         com.mycila
         license-maven-plugin
-        4.0.rc2
+        ${license-maven-plugin.version}
         
           
             
@@ -337,7 +337,7 @@
             
           
           
-            JAVADOC_STYLE
+            SLASHSTAR_STYLE
           
         
       
diff --git a/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/ClassLayout.java b/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/ClassLayout.java
index e795ab1043ea4..2d0ed3b7b98b4 100644
--- a/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/ClassLayout.java
+++ b/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/ClassLayout.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/package-info.java b/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/package-info.java
index a7e5efd01a52c..a1b31fc8e2253 100644
--- a/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/package-info.java
+++ b/pulsar-sql/presto-distribution/src/main/java/org/openjdk/jol/info/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-distribution/src/main/resources/conf/catalog/pulsar.properties b/pulsar-sql/presto-distribution/src/main/resources/conf/catalog/pulsar.properties
index 8cbea0e136488..f15cd2657e0b5 100644
--- a/pulsar-sql/presto-distribution/src/main/resources/conf/catalog/pulsar.properties
+++ b/pulsar-sql/presto-distribution/src/main/resources/conf/catalog/pulsar.properties
@@ -26,8 +26,8 @@ pulsar.broker-service-url=http://localhost:8080
 pulsar.web-service-url=http://localhost:8080
 # the url of Pulsar broker binary service
 pulsar.broker-binary-service-url=pulsar://localhost:6650
-# URI of Zookeeper cluster
-pulsar.zookeeper-uri=127.0.0.1:2181
+# the url of metadata store
+pulsar.metadata-url=zk:127.0.0.1:2181
 # minimum number of entries to read at a single time
 pulsar.max-entry-read-batch-size=100
 # default number of splits to use per query
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarAuth.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarAuth.java
index b51ea48900bae..3307faf9c2186 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarAuth.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import lombok.Cleanup;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
@@ -98,6 +99,7 @@ public void checkTopicAuth(ConnectorSession session, String topic) {
                             topic));
         }
         try {
+            @Cleanup
             PulsarClient client = PulsarClient.builder()
                     .serviceUrl(pulsarConnectorConfig.getBrokerBinaryServiceUrl())
                     .authentication(authMethod, authParams)
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java
index 0da9377b5ffba..979d62e430284 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
index b50db5bdc8b75..e545f5d129ee1 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnector.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnector.java
index 12536f91a0471..f696afedf04a6 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnector.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java
index 852ed7f18e867..20b00b59e5ab8 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -46,6 +46,7 @@
 import org.apache.pulsar.common.protocol.Commands;
 import org.apache.pulsar.metadata.api.MetadataStoreConfig;
 import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
+import org.apache.pulsar.metadata.bookkeeper.PulsarMetadataClientDriver;
 
 /**
  * Implementation of a cache for the Pulsar connector.
@@ -73,7 +74,7 @@ public class PulsarConnectorCache {
 
 
     private PulsarConnectorCache(PulsarConnectorConfig pulsarConnectorConfig) throws Exception {
-        this.metadataStore = MetadataStoreExtended.create(pulsarConnectorConfig.getZookeeperUri(),
+        this.metadataStore = MetadataStoreExtended.create(pulsarConnectorConfig.getMetadataUrl(),
                 MetadataStoreConfig.builder().metadataStoreName(MetadataStoreConfig.METADATA_STORE).build());
         this.managedLedgerFactory = initManagedLedgerFactory(pulsarConnectorConfig);
         this.statsProvider = PulsarConnectorUtils.createInstance(pulsarConnectorConfig.getStatsProvider(),
@@ -109,10 +110,10 @@ public static PulsarConnectorCache getConnectorCache(PulsarConnectorConfig pulsa
 
     private ManagedLedgerFactory initManagedLedgerFactory(PulsarConnectorConfig pulsarConnectorConfig)
         throws Exception {
+        PulsarMetadataClientDriver.init();
+
         ClientConfiguration bkClientConfiguration = new ClientConfiguration()
-            .setZkServers(pulsarConnectorConfig.getZookeeperUri())
-            .setMetadataServiceUri("zk://" + pulsarConnectorConfig.getZookeeperUri()
-                .replace(",", ";") + "/ledgers")
+            .setMetadataServiceUri("metadata-store:" + pulsarConnectorConfig.getMetadataUrl())
             .setClientTcpNoDelay(false)
             .setUseV2WireProtocol(pulsarConnectorConfig.getBookkeeperUseV2Protocol())
             .setExplictLacInterval(pulsarConnectorConfig.getBookkeeperExplicitInterval())
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorConfig.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorConfig.java
index 2bd2570d54d34..f6907e3cba37d 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorConfig.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -42,10 +42,12 @@
  */
 public class PulsarConnectorConfig implements AutoCloseable {
 
+    private boolean hasMetadataUrl = false;
+
     private String brokerServiceUrl = "http://localhost:8080";
     private String brokerBinaryServiceUrl = "pulsar://localhost:6650/";
     private String webServiceUrl = ""; //leave empty
-    private String zookeeperUri = "localhost:2181";
+    private String metadataUrl = "zk:localhost:2181";
     private int entryReadBatchSize = 100;
     private int targetNumSplits = 2;
     private int maxSplitMessageQueueSize = 10000;
@@ -134,14 +136,37 @@ public int getMaxMessageSize() {
         return this.maxMessageSize;
     }
 
+    /**
+     * @deprecated use {@link #getMetadataUrl()}
+     */
+    @Deprecated
     @NotNull
     public String getZookeeperUri() {
-        return this.zookeeperUri;
+        return getMetadataUrl();
     }
 
+    /**
+     * @deprecated use {@link #setMetadataUrl(String)}
+     */
+    @Deprecated
     @Config("pulsar.zookeeper-uri")
     public PulsarConnectorConfig setZookeeperUri(String zookeeperUri) {
-        this.zookeeperUri = zookeeperUri;
+        if (hasMetadataUrl) {
+            return this;
+        }
+        this.metadataUrl = zookeeperUri;
+        return this;
+    }
+
+    @NotNull
+    public String getMetadataUrl() {
+        return this.metadataUrl;
+    }
+
+    @Config("pulsar.metadata-url")
+    public PulsarConnectorConfig setMetadataUrl(String metadataUrl) {
+        this.hasMetadataUrl = true;
+        this.metadataUrl = metadataUrl;
         return this;
     }
 
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorFactory.java
index ffeac71ce78b4..fb80b30de04e5 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorId.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorId.java
index 633bccbdf38ed..c74b8f650f3eb 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorId.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorId.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorMetricsTracker.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorMetricsTracker.java
index ba0ff70427107..b586063cc3c9a 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorMetricsTracker.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorMetricsTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorModule.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorModule.java
index 1274b9175cfc4..ea0799ef7a695 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorModule.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorModule.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorUtils.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorUtils.java
index 03a3a58b080a7..8401306462fbc 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorUtils.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarDispatchingRowDecoderFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarDispatchingRowDecoderFactory.java
index 8434a3c4d8ee1..2899b013b3cfe 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarDispatchingRowDecoderFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarDispatchingRowDecoderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarFieldValueProviders.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarFieldValueProviders.java
index 38f479c1e6d13..b4a1409a86acf 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarFieldValueProviders.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarFieldValueProviders.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarHandleResolver.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarHandleResolver.java
index b7eddad28890d..1f2f0d9455627 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarHandleResolver.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarHandleResolver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java
index 981dc3280e743..a0812085f04e1 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java
index f494b63e13937..24ff2b295e9fa 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPlugin.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPlugin.java
index 63a9072727597..7936423f71d0b 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPlugin.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java
index b4391daf15d1a..d5b1992f98a41 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSet.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSet.java
index 45fb8df3c301a..5d44c07ea7544 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSet.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSetProvider.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSetProvider.java
index 080589741932f..b3de23f9fe158 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSetProvider.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordSetProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoder.java
index a1de68d97b606..d45c5ab07875e 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoderFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoderFactory.java
index 0a799f447e803..04cc61261d4d0 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoderFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRowDecoderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java
index 56d9d02da4fa6..1967ec5e436b6 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
index 2f623bfdf1c8d..464e70b18dddd 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSqlSchemaInfoProvider.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSqlSchemaInfoProvider.java
index 684ac5d2c7472..d8f7db96b83d7 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSqlSchemaInfoProvider.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSqlSchemaInfoProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableHandle.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableHandle.java
index a7938c57d43b5..167496faedfcf 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableHandle.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableHandle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableLayoutHandle.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableLayoutHandle.java
index 95c03c0ee82a8..015c6a65ee05b 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableLayoutHandle.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTableLayoutHandle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTopicDescription.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTopicDescription.java
index ca300e9451d1d..8a2558e104cce 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTopicDescription.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTopicDescription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTransactionHandle.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTransactionHandle.java
index 34b6f759c9ac7..c1e3236da4c06 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTransactionHandle.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarTransactionHandle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroColumnDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroColumnDecoder.java
index 561946dc4a1b2..4616a60379971 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroColumnDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroColumnDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoder.java
index d52402a6e85de..97d0bb3377227 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoderFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoderFactory.java
index f8c5b8b53510e..3072bf9441b2c 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoderFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/PulsarAvroRowDecoderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/package-info.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/package-info.java
index 57bf297819fa7..44dd00fc9f50a 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/package-info.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/avro/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonFieldDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonFieldDecoder.java
index 8040429561597..c09dd43e24143 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonFieldDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonFieldDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoder.java
index ba0e405361294..9e8e059ea3a75 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoderFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoderFactory.java
index 5a832eb85d8b8..5dd06fa939621 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoderFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/PulsarJsonRowDecoderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/package-info.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/package-info.java
index a8d8b67aa037f..a5b5e9cfc0d6e 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/package-info.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/json/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoder.java
index 71ed9c71e5c66..6a6e495e030bd 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoderFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoderFactory.java
index e551b9122798c..d6c8b3ca99e51 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoderFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/PulsarPrimitiveRowDecoderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/package-info.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/package-info.java
index 7ceecfbb28adb..9eccb9571b5e9 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/package-info.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/primitive/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeColumnDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeColumnDecoder.java
index 755341644e952..d0174974e1628 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeColumnDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeColumnDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoder.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoder.java
index 6b8235586a559..dcdf3e54c46f6 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoderFactory.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoderFactory.java
index daecd5dd66929..e16c42142677e 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoderFactory.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/PulsarProtobufNativeRowDecoderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/package-info.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/package-info.java
index 9b97fc75f520c..b49610dd8c903 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/package-info.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/decoder/protobufnative/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/package-info.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/package-info.java
index 7c6649e921756..3f11037fcf649 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/package-info.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/CacheSizeAllocator.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/CacheSizeAllocator.java
index 30bccd9b8522b..387076cc6d7f7 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/CacheSizeAllocator.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/CacheSizeAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NoStrictCacheSizeAllocator.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NoStrictCacheSizeAllocator.java
index 5159e73620892..01fdb0886ebea 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NoStrictCacheSizeAllocator.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NoStrictCacheSizeAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NullCacheSizeAllocator.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NullCacheSizeAllocator.java
index dedf1a8246e25..4f218950f3564 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NullCacheSizeAllocator.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/NullCacheSizeAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/package-info.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/package-info.java
index b3e685918d067..d163340416364 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/package-info.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestCacheSizeAllocator.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestCacheSizeAllocator.java
index 35809450dcc6f..716cd2cf9d663 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestCacheSizeAllocator.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestCacheSizeAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestNoStrictCacheSizeAllocator.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestNoStrictCacheSizeAllocator.java
index ed3fc1e4c8846..7f29e5d251191 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestNoStrictCacheSizeAllocator.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestNoStrictCacheSizeAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarAuth.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarAuth.java
index b2c7d2c258464..4233c5cfdfae9 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarAuth.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
index 3668921138a3a..61f6edd38530c 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnectorConfig.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnectorConfig.java
index 00b09a6e38655..4f9dcf03979f7 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnectorConfig.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnectorConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarMetadata.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarMetadata.java
index dfdee9360b4cb..0db8c3231b337 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarMetadata.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarMetadata.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarRecordCursor.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarRecordCursor.java
index 1aeb00d7469f0..7eaa2da498f45 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarRecordCursor.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarRecordCursor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
index 0a7c76f632f2c..86b2ee56c85fe 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -426,6 +426,7 @@ public void pulsarSplitJsonCodecTest() throws JsonProcessingException, Unsupport
                 5000,
                 2000,
                 1000L,
+                1000L,
                 5000L,
                 OffloadedReadPriority.BOOKKEEPER_FIRST
         );
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestReadChunkedMessages.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestReadChunkedMessages.java
index 7f4b9d365c701..1e959e9b83059 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestReadChunkedMessages.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestReadChunkedMessages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/AbstractDecoderTester.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/AbstractDecoderTester.java
index eac59ffcd81d9..6ed07fd1dde5f 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/AbstractDecoderTester.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/AbstractDecoderTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestMessage.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestMessage.java
index da6d92e5158ac..4561282c67196 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestMessage.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestMessage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestUtil.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestUtil.java
index 22a8f56cd28dc..84d93e780346a 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestUtil.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/DecoderTestUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/AvroDecoderTestUtil.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/AvroDecoderTestUtil.java
index 398957f574695..a32a8d47dfc46 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/AvroDecoderTestUtil.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/AvroDecoderTestUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/TestAvroDecoder.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/TestAvroDecoder.java
index cb153236ed61b..79ca0f5a65075 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/TestAvroDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/avro/TestAvroDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/JsonDecoderTestUtil.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/JsonDecoderTestUtil.java
index c5395f2142261..301a2eb882f40 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/JsonDecoderTestUtil.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/JsonDecoderTestUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/TestJsonDecoder.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/TestJsonDecoder.java
index 2a60260557a9f..4afad9b318fc5 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/TestJsonDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/json/TestJsonDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/PrimitiveDecoderTestUtil.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/PrimitiveDecoderTestUtil.java
index 81a480a3b84ef..0824b84ec3a19 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/PrimitiveDecoderTestUtil.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/PrimitiveDecoderTestUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/TestPrimitiveDecoder.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/TestPrimitiveDecoder.java
index 54b11cebeb284..7c18877a9c608 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/TestPrimitiveDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/TestPrimitiveDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/ProtobufNativeDecoderTestUtil.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/ProtobufNativeDecoderTestUtil.java
index 191dad14c6198..d908d30bc4728 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/ProtobufNativeDecoderTestUtil.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/ProtobufNativeDecoderTestUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestMsg.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestMsg.java
index 401ded5bd85cc..d1d8a5ca7e598 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestMsg.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestMsg.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestProtobufNativeDecoder.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestProtobufNativeDecoder.java
index 69acc6e6564f0..9b2cb32de0aa3 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestProtobufNativeDecoder.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/decoder/protobufnative/TestProtobufNativeDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
index 36d933a84f8e8..c42e876f1fe5e 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/SimpleTestProducerSocket.java b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/SimpleTestProducerSocket.java
index c7df80a132a84..0dadf33378704 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/SimpleTestProducerSocket.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/SimpleTestProducerSocket.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/package-info.java b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/package-info.java
index 194e5a8ed64f3..73a993b50e661 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/package-info.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
index bb970dcf3173e..47eb2a6c4b112 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
index 975faccc0064b..ff1800e7ae79d 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -103,9 +103,6 @@ private static String generateDocument(String module, JCommander parentCmd) {
                 .append("$ pulsar-perf ").append(module).append(" [options]")
                 .append("\n```");
         sb.append("\n\n");
-        for (String s : cmd.getCommands().keySet()) {
-            sb.append("* `").append(s).append("`\n");
-        }
         sb.append("|Flag|Description|Default|\n");
         sb.append("|---|---|---|\n");
         List options = cmd.getParameters();
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
index e76166dbe47b0..6823d35db4d44 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/IMessageFormatter.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/IMessageFormatter.java
index e80ae50484c27..f1459d9a19b04 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/IMessageFormatter.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/IMessageFormatter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
index 04f1be4e3823c..c521c54c5b93a 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
index 91ea6e320c6da..81f5329051b18 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
index ab30e7dd4ec0c..997d5a31f2e43 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerfClientUtils.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerfClientUtils.java
index a3552d314309c..e40e9610bf42f 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerfClientUtils.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerfClientUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
index ad8668020d6f8..5f8551b99094e 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
index 7f3a93b8ba66f..28c3a68e70dde 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
index 464a521f6445b..3ff78909a687f 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -49,6 +49,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
@@ -392,7 +393,6 @@ public static void main(String[] args) throws Exception {
                     msgRatePerThread,
                     payloadByteList,
                     payloadBytes,
-                    random,
                     doneLatch
                 );
             });
@@ -529,7 +529,6 @@ private static void runProducer(int producerId,
                                     int msgRate,
                                     List payloadByteList,
                                     byte[] payloadBytes,
-                                    Random random,
                                     CountDownLatch doneLatch) {
         PulsarClient client = null;
         try {
@@ -626,9 +625,10 @@ private static void runProducer(int producerId,
                     if (arguments.payloadFilename != null) {
                         if (messageFormatter != null) {
                             payloadData = messageFormatter.formatMessage(arguments.producerName, totalSent,
-                                    payloadByteList.get(random.nextInt(payloadByteList.size())));
+                                    payloadByteList.get(ThreadLocalRandom.current().nextInt(payloadByteList.size())));
                         } else {
-                            payloadData = payloadByteList.get(random.nextInt(payloadByteList.size()));
+                            payloadData = payloadByteList.get(
+                                    ThreadLocalRandom.current().nextInt(payloadByteList.size()));
                         }
                     } else {
                         payloadData = payloadBytes;
@@ -656,7 +656,7 @@ private static void runProducer(int producerId,
                     }
                     //generate msg key
                     if (msgKeyMode == MessageKeyGenerationMode.random) {
-                        messageBuilder.key(String.valueOf(random.nextInt()));
+                        messageBuilder.key(String.valueOf(ThreadLocalRandom.current().nextInt()));
                     } else if (msgKeyMode == MessageKeyGenerationMode.autoIncrement) {
                         messageBuilder.key(String.valueOf(totalSent));
                     }
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
index be42bbf8a0594..cc2d6315eeb1a 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -29,6 +29,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.LongAdder;
@@ -144,16 +146,7 @@ public static void main(String[] args) throws Exception {
         log.info("Starting Pulsar performance reader with config: {}", w.writeValueAsString(arguments));
 
         final RateLimiter limiter = arguments.rate > 0 ? RateLimiter.create(arguments.rate) : null;
-        long startTime = System.nanoTime();
-        long testEndTime = startTime + (long) (arguments.testTime * 1e9);
         ReaderListener listener = (reader, msg) -> {
-            if (arguments.testTime > 0) {
-                if (System.nanoTime() > testEndTime) {
-                    log.info("------------- DONE (reached the maximum duration: [{} seconds] of consumption) "
-                            + "--------------", arguments.testTime);
-                    PerfClientUtils.exit(0);
-                }
-            }
             messagesReceived.increment();
             bytesReceived.add(msg.getData().length);
 
@@ -215,6 +208,20 @@ public static void main(String[] args) throws Exception {
             printAggregatedStats();
         }));
 
+        if (arguments.testTime > 0) {
+            TimerTask timoutTask = new TimerTask() {
+                @Override
+                public void run() {
+                    log.info("------------- DONE (reached the maximum duration: [{} seconds] of consumption) "
+                            + "--------------", arguments.testTime);
+                    PerfClientUtils.exit(0);
+                }
+            };
+            Timer timer = new Timer();
+            timer.schedule(timoutTask, arguments.testTime * 1000);
+        }
+
+
         long oldTime = System.nanoTime();
         Histogram reportHistogram = null;
 
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
index 9617bea94a7fa..e5672194a2498 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -25,6 +25,7 @@
 import com.beust.jcommander.Parameters;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.google.common.util.concurrent.RateLimiter;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -47,7 +48,6 @@
 import org.HdrHistogram.Histogram;
 import org.HdrHistogram.HistogramLogWriter;
 import org.HdrHistogram.Recorder;
-import org.apache.curator.shaded.com.google.common.util.concurrent.RateLimiter;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminBuilder;
 import org.apache.pulsar.client.admin.PulsarAdminException;
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PositiveNumberParameterValidator.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PositiveNumberParameterValidator.java
index 523d9c16f5ee3..7e8fe2181cd6f 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PositiveNumberParameterValidator.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PositiveNumberParameterValidator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/package-info.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/package-info.java
index 961b1d9d61b67..d4a7e3d87220e 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/package-info.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/FixedColumnLengthTableMaker.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/FixedColumnLengthTableMaker.java
index 96665b8d334fb..02692fedfa049 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/FixedColumnLengthTableMaker.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/FixedColumnLengthTableMaker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/PaddingDecimalFormat.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/PaddingDecimalFormat.java
index 46e84fcbe9757..f985dac3c3e62 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/PaddingDecimalFormat.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/PaddingDecimalFormat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/package-info.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/package-info.java
index 04d7dcf1bbf68..7b963df24882e 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/package-info.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/utils/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/proxy/socket/client/PerformanceClientTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/proxy/socket/client/PerformanceClientTest.java
index 135bb7bb55bef..f623662e0e946 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/proxy/socket/client/PerformanceClientTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/proxy/socket/client/PerformanceClientTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/GenerateDocumentionTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/GenerateDocumentionTest.java
index 3f086ad5ab46f..936275bcd41cd 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/GenerateDocumentionTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/GenerateDocumentionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/Oauth2PerformanceTransactionTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/Oauth2PerformanceTransactionTest.java
index 0ef9dc2c8389c..05c9b069aca87 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/Oauth2PerformanceTransactionTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/Oauth2PerformanceTransactionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerfClientUtilsTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerfClientUtilsTest.java
index 9d3a838f614aa..3a8bba1bccb90 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerfClientUtilsTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerfClientUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
index 3071f92f9ccce..8bb56cb12c3bb 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceProducerTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceProducerTest.java
index 7bd6cbb25796c..e343b1d8cbc64 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceProducerTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceProducerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceTransactionTest.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceTransactionTest.java
index 0afd69ed4021c..2ccdf62ff0ebd 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceTransactionTest.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceTransactionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,7 @@
 import com.google.common.collect.Sets;
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
+import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
@@ -100,6 +101,7 @@ public void testTxnPerf() throws Exception {
         String args = String.format(argString, testConsumeTopic, testProduceTopic,
                 pulsar.getBrokerServiceUrl(), testSub, new URL(pulsar.getWebServiceAddress()));
 
+        @Cleanup
         PulsarClient pulsarClient = PulsarClient.builder()
                 .enableTransaction(true)
                 .serviceUrl(pulsar.getBrokerServiceUrl())
@@ -163,7 +165,7 @@ public void testTxnPerf() throws Exception {
 
     @Test
     public void testProduceTxnMessage() throws InterruptedException, PulsarClientException {
-        String argString = "%s -r 10 -u %s -m %d -txn";
+        String argString = "%s -r 50 -u %s -m %d -txn";
         String topic = testTopic + UUID.randomUUID();
         int totalMessage = 100;
         String args = String.format(argString, topic, pulsar.getBrokerServiceUrl(), totalMessage);
@@ -174,7 +176,6 @@ public void testProduceTxnMessage() throws InterruptedException, PulsarClientExc
                 .subscribe();
         Thread thread = new Thread(() -> {
             try {
-                log.info("");
                 PerformanceProducer.main(args.split(" "));
             } catch (Exception e) {
                 e.printStackTrace();
@@ -182,6 +183,13 @@ public void testProduceTxnMessage() throws InterruptedException, PulsarClientExc
         });
         thread.start();
         thread.join();
+
+        Awaitility.await().untilAsserted(() -> {
+            admin.transactions().getCoordinatorStats().forEach((integer, transactionCoordinatorStats) -> {
+                Assert.assertEquals(transactionCoordinatorStats.ongoingTxnSize, 0);
+            });
+        });
+
         Consumer consumer = pulsarClient.newConsumer().subscriptionName("subName").topic(topic)
                 .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
                 .subscriptionType(SubscriptionType.Exclusive)
@@ -198,7 +206,7 @@ public void testProduceTxnMessage() throws InterruptedException, PulsarClientExc
 
     @Test
     public void testConsumeTxnMessage() throws Exception {
-        String argString = "%s -r 10 -u %s -txn -ss %s -st %s -sp %s -ntxn %d -tto 5";
+        String argString = "%s -r 50 -u %s -txn -ss %s -st %s -sp %s -ntxn %d -tto 5";
         String subName = "sub";
         String topic = testTopic + UUID.randomUUID();
         String args = String.format(argString, topic, pulsar.getBrokerServiceUrl(), subName,
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
index 89bb0251567b7..574317cd3ae67 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/TransactionConflictException.java b/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/TransactionConflictException.java
index 9b9a564a9f110..333c6fbdab2e1 100644
--- a/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/TransactionConflictException.java
+++ b/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/TransactionConflictException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/package-info.java b/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/package-info.java
index 70fff2c58a914..c01186b3fcb6c 100644
--- a/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/package-info.java
+++ b/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/common/exception/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/impl/common/package-info.java b/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/impl/common/package-info.java
index caa4ce9afa29c..d8fa72c0a8ce1 100644
--- a/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/impl/common/package-info.java
+++ b/pulsar-transaction/common/src/main/java/org/apache/pulsar/transaction/impl/common/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionCoordinatorID.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionCoordinatorID.java
index 542feb6386df8..c02bd9bf9634e 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionCoordinatorID.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionCoordinatorID.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLog.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLog.java
index 8ec4873211458..f172fbe431ace 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLog.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLog.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLogReplayCallback.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLogReplayCallback.java
index 6bb76ab28ec46..3625e4b9bfeff 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLogReplayCallback.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionLogReplayCallback.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStore.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStore.java
index bbffe80120fac..7f8280f5226b3 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStore.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProvider.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProvider.java
index f67d2f3c90a83..7145ea1214f95 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProvider.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreState.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreState.java
index 8947413191cf6..913f412d9b8b0 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreState.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreState.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionRecoverTracker.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionRecoverTracker.java
index 8d3dfb918c1d2..ee1fe65bd04f9 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionRecoverTracker.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionRecoverTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionSubscription.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionSubscription.java
index 38d946fd54d7a..f1fb8b6853221 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionSubscription.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
index 7a75ab1219dcc..5e84b002f3316 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTrackerFactory.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTrackerFactory.java
index 8f121dd85fd27..de7dd1a3926af 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTrackerFactory.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTrackerFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TxnMeta.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TxnMeta.java
index 4d6d83dfb0ff5..104ae0ff1df0d 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TxnMeta.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TxnMeta.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/CoordinatorException.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/CoordinatorException.java
index 954d891a188ac..2b15b957858fc 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/CoordinatorException.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/CoordinatorException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/package-info.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/package-info.java
index 7ed25d46f1105..4ca3e808f0043 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/package-info.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/exceptions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/DisabledTxnLogBufferedWriterMetricsStats.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/DisabledTxnLogBufferedWriterMetricsStats.java
index 5a6238a95e491..733441233862c 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/DisabledTxnLogBufferedWriterMetricsStats.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/DisabledTxnLogBufferedWriterMetricsStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStore.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStore.java
index ba90c06b27d79..a62df1df8c6aa 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStore.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStoreProvider.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStoreProvider.java
index 661e9b4ec9e01..f3f5a3e432904 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStoreProvider.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/InMemTransactionMetadataStoreProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImpl.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImpl.java
index 67c0b54504bf0..f2e1f60663d28 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImpl.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStore.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStore.java
index 65e9a654a78ea..fbb14fa86f3de 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStore.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStore.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStoreProvider.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStoreProvider.java
index 6eb6402c0eee5..eb12a3dfb77e4 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStoreProvider.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionMetadataStoreProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionSequenceIdGenerator.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionSequenceIdGenerator.java
index 505e1f05d12a1..204555a1cfc67 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionSequenceIdGenerator.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionSequenceIdGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TransactionMetadataStoreStats.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TransactionMetadataStoreStats.java
index 9a89dc6a419c5..8b8be92ae1691 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TransactionMetadataStoreStats.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TransactionMetadataStoreStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImpl.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImpl.java
index 5a813941076cb..2e897167aaf0a 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImpl.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriter.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriter.java
index 2346ebb3a8024..a87c040031f9a 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriter.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -26,16 +26,14 @@
 import io.netty.util.Timer;
 import io.netty.util.TimerTask;
 import java.util.ArrayList;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.bookkeeper.common.util.OrderedExecutor;
 import org.apache.bookkeeper.mledger.AsyncCallbacks;
 import org.apache.bookkeeper.mledger.ManagedLedger;
 import org.apache.bookkeeper.mledger.ManagedLedgerException;
@@ -83,7 +81,7 @@ public class TxnLogBufferedWriter {
     private final Timer timer;
 
     /** All write operation will be executed on single thread. **/
-    private final ExecutorService singleThreadExecutorForWrite;
+    private final Executor singleThreadExecutorForWrite;
 
     /** The serializer for the object which called by {@link #asyncAddData}. **/
     private final DataSerializer dataSerializer;
@@ -140,7 +138,7 @@ public class TxnLogBufferedWriter {
      *                    when disabled.
      * @param timer Used for periodic flush.
      */
-    public TxnLogBufferedWriter(ManagedLedger managedLedger, OrderedExecutor orderedExecutor, Timer timer,
+    public TxnLogBufferedWriter(ManagedLedger managedLedger, Executor executor, Timer timer,
                                 DataSerializer dataSerializer,
                                 int batchedWriteMaxRecords, int batchedWriteMaxSize, int batchedWriteMaxDelayInMillis,
                                 boolean batchEnabled, TxnLogBufferedWriterMetricsStats metrics){
@@ -157,8 +155,7 @@ public TxnLogBufferedWriter(ManagedLedger managedLedger, OrderedExecutor ordered
         }
         this.batchEnabled = batchEnabled && batchedWriteMaxRecords > 1;
         this.managedLedger = managedLedger;
-        this.singleThreadExecutorForWrite = orderedExecutor.chooseThread(
-                managedLedger.getName() == null ? UUID.randomUUID().toString() : managedLedger.getName());
+        this.singleThreadExecutorForWrite = executor;
         this.dataSerializer = dataSerializer;
         this.batchedWriteMaxRecords = batchedWriteMaxRecords;
         this.batchedWriteMaxSize = batchedWriteMaxSize;
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterConfig.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterConfig.java
index a056fd1bb9cc8..ec00e9c8debbb 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterConfig.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterMetricsStats.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterMetricsStats.java
index 6eafe79638c4a..f46cda895156b 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterMetricsStats.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterMetricsStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -103,7 +103,7 @@ public TxnLogBufferedWriterMetricsStats(String metricsPrefix, String[] labelName
         this.labelValues = labelValues.clone();
 
         String recordsPerBatchMetricName =
-                String.format("%s_bufferedwriter_batch_record_count", metricsPrefix);
+                String.format("%s_bufferedwriter_batch_records", metricsPrefix);
         recordsPerBatchMetric = new Histogram.Builder()
                         .name(recordsPerBatchMetricName)
                         .labelNames(this.labelNames)
@@ -122,7 +122,7 @@ public TxnLogBufferedWriterMetricsStats(String metricsPrefix, String[] labelName
         batchSizeBytesHistogram = batchSizeBytesMetric.labels(this.labelValues);
 
         String oldestRecordInBatchDelayTimeSecondsMetricName =
-                String.format("%s_bufferedwriter_batch_oldest_record_delay_time_second", metricsPrefix);
+                String.format("%s_bufferedwriter_batch_oldest_record_delay_seconds", metricsPrefix);
         oldestRecordInBatchDelayTimeSecondsMetric = new Histogram.Builder()
                         .name(oldestRecordInBatchDelayTimeSecondsMetricName)
                         .labelNames(this.labelNames)
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnMetaImpl.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnMetaImpl.java
index a3d62b1e05d1e..8e0c793b5887c 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnMetaImpl.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/TxnMetaImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/package-info.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/package-info.java
index 59ce99bcf8fbe..bd9b575605381 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/package-info.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/package-info.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/package-info.java
index 4416ff9d451ef..e09eb996e8749 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/package-info.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/TransactionUtil.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/TransactionUtil.java
index 81641b1735999..26ac46700a1e7 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/TransactionUtil.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/TransactionUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/package-info.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/package-info.java
index 4501e50da5b33..4127f06a7f625 100644
--- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/package-info.java
+++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
index 1d5d9708a275f..2f806f0a47428 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -196,9 +196,8 @@ public void testRecoverSequenceId(boolean isUseManagedLedgerProperties) throws E
             stateUpdater.setAccessible(true);
             stateUpdater.set(managedLedger, ManagedLedgerImpl.State.LedgerOpened);
             managedLedger.rollCurrentLedgerIfFull();
-            Awaitility.await().until(() -> {
-                return !managedLedger.ledgerExists(position.getLedgerId());
-            });
+            //There is new ledger been created
+            Awaitility.await().until(() -> managedLedger.getLedgersInfo().ceilingEntry(position.getLedgerId()) != null);
         }
         mlTransactionLog.closeAsync().get(2, TimeUnit.SECONDS);
         mlTransactionLog = new MLTransactionLogImpl(transactionCoordinatorID, factory,
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProviderTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProviderTest.java
index 66bda86fb7b3f..c7f9cd21ac808 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProviderTest.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TransactionMetadataStoreProviderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TxnStatusTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TxnStatusTest.java
index 6719244c3119f..3f7911a66b53d 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TxnStatusTest.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/TxnStatusTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImplTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImplTest.java
index 235e8b42514c8..4790b063e70f4 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImplTest.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/MLTransactionLogImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImplTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImplTest.java
index 1d0bef2c97d2b..0905fdad72d40 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImplTest.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnBatchedPositionImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterTest.java
index 5f254eb45b70d..3c6b2e382e311 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterTest.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/impl/TxnLogBufferedWriterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -34,8 +34,9 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -52,6 +53,7 @@
 import org.apache.bookkeeper.mledger.ManagedLedger;
 import org.apache.bookkeeper.mledger.ManagedLedgerException;
 import org.apache.bookkeeper.mledger.Position;
+import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl;
 import org.apache.bookkeeper.mledger.impl.PositionImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.pulsar.metadata.api.MetadataStoreException;
@@ -176,8 +178,6 @@ public void testMainProcess(int batchedWriteMaxRecords, int batchedWriteMaxSize,
             bkc.failAfter(1, BKException.Code.NotEnoughBookiesException);
             metadataStore.setAlwaysFail(new MetadataStoreException.BadVersionException(""));
         }
-        OrderedExecutor orderedExecutor =  OrderedExecutor.newBuilder()
-                .numThreads(5).name("txn-threads").build();
         HashedWheelTimer transactionTimer = new HashedWheelTimer(new DefaultThreadFactory("transaction-timer"),
                 1, TimeUnit.MILLISECONDS);
         JsonDataSerializer dataSerializer = new JsonDataSerializer(eachDataBytesLen);
@@ -188,12 +188,12 @@ public void testMainProcess(int batchedWriteMaxRecords, int batchedWriteMaxSize,
          */
         // Create TxLogBufferedWriter.
         TxnLogBufferedWriter txnLogBufferedWriter =  new TxnLogBufferedWriter(
-                    managedLedger, orderedExecutor, transactionTimer,
+                    managedLedger, ((ManagedLedgerImpl) managedLedger).getExecutor(), transactionTimer,
                     dataSerializer, batchedWriteMaxRecords, batchedWriteMaxSize,
                     batchedWriteMaxDelayInMillis, batchEnabled, DISABLED_BUFFERED_WRITER_METRICS);
         // Store the param-context, param-position, param-exception of callback function and complete-count for verify.
         List contextArrayOfCallback = Collections.synchronizedList(new ArrayList<>());
-        List exceptionArrayOfCallback = Collections.synchronizedList(new ArrayList<>());
+        Map exceptionArrayOfCallback = new ConcurrentHashMap<>();
         Map> positionsOfCallback = Collections.synchronizedMap(new LinkedHashMap<>());
         AtomicBoolean anyFlushCompleted = new AtomicBoolean();
         TxnLogBufferedWriter.AddDataCallback callback = new TxnLogBufferedWriter.AddDataCallback(){
@@ -215,7 +215,7 @@ public void addFailed(ManagedLedgerException exception, Object ctx) {
                     return;
                 }
                 contextArrayOfCallback.add((int)ctx);
-                exceptionArrayOfCallback.add(exception);
+                exceptionArrayOfCallback.put((int)ctx, exception);
             }
         };
         // Write many times.
@@ -252,8 +252,14 @@ public void addFailed(ManagedLedgerException exception, Object ctx) {
             Collections.sort(contextArrayOfCallback);
         }
         assertEquals(contextArrayOfCallback.size(), writeCmdExecuteCount);
-        for (int ctxIndex = 0; ctxIndex < writeCmdExecuteCount; ctxIndex++){
-            assertEquals(contextArrayOfCallback.get(ctxIndex).intValue(), ctxIndex);
+        for (int ctxIndex = 0, successIndex = 0; ctxIndex < writeCmdExecuteCount; ctxIndex++){
+            // When calling `txnLogBufferedWriter.close`, all tasks in the queue will fail immediately, this makes the
+            // callback of failure task earlier.
+            if (exceptionArrayOfCallback.containsKey(ctxIndex)){
+                continue;
+            }
+            assertEquals(contextArrayOfCallback.get(successIndex).intValue(), ctxIndex);
+            successIndex++;
         }
         // if {@param bookieError} is true. verify the ex count.
         // if {@param bookieError} is false. verify the param-position count.
@@ -337,7 +343,6 @@ public void addFailed(ManagedLedgerException exception, Object ctx) {
             managedLedger.close();
         }
         transactionTimer.stop();
-        orderedExecutor.shutdown();
         /**
          * Assert all Byte Buf generated by DataSerializer has been released.
          *   1. Because ManagedLedger holds write cache, some data is not actually released until ManagedLedger is
@@ -375,6 +380,7 @@ public void testFlushThresholds() throws Exception{
         ManagedLedger managedLedger = Mockito.mock(ManagedLedger.class);
         Mockito.when(managedLedger.getName()).thenReturn(mlName);
         OrderedExecutor orderedExecutor =  OrderedExecutor.newBuilder().numThreads(5).name("txn-topic-threads").build();
+        Executor topicExecutor = orderedExecutor.chooseThread(managedLedger.getName());
         HashedWheelTimer transactionTimer = new HashedWheelTimer(new DefaultThreadFactory("transaction-timer"),
                 1, TimeUnit.MILLISECONDS);
         SumStrDataSerializer dataSerializer = new SumStrDataSerializer();
@@ -394,7 +400,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
             }
         }).when(managedLedger).asyncAddEntry(Mockito.any(ByteBuf.class), Mockito.any(), Mockito.any());
         // Test threshold: writeMaxDelayInMillis (use timer).
-        TxnLogBufferedWriter txnLogBufferedWriter1 = new TxnLogBufferedWriter<>(managedLedger, orderedExecutor,
+        TxnLogBufferedWriter txnLogBufferedWriter1 = new TxnLogBufferedWriter<>(managedLedger, topicExecutor,
                 transactionTimer, dataSerializer, 32, 1024 * 4,
                 100, true, DISABLED_BUFFERED_WRITER_METRICS);
         TxnLogBufferedWriter.AddDataCallback callback = Mockito.mock(TxnLogBufferedWriter.AddDataCallback.class);
@@ -407,7 +413,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
         txnLogBufferedWriter1.close().get();
 
         // Test threshold: batchedWriteMaxRecords.
-        TxnLogBufferedWriter txnLogBufferedWriter2 = new TxnLogBufferedWriter<>(managedLedger, orderedExecutor,
+        TxnLogBufferedWriter txnLogBufferedWriter2 = new TxnLogBufferedWriter<>(managedLedger, topicExecutor,
                 transactionTimer, dataSerializer, 32, 1024 * 4,
                 10000, true, DISABLED_BUFFERED_WRITER_METRICS);
         for (int i = 0; i < 32; i++){
@@ -418,7 +424,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
         txnLogBufferedWriter2.close();
 
         // Test threshold: batchedWriteMaxSize.
-        TxnLogBufferedWriter txnLogBufferedWriter3 = new TxnLogBufferedWriter<>(managedLedger, orderedExecutor,
+        TxnLogBufferedWriter txnLogBufferedWriter3 = new TxnLogBufferedWriter<>(managedLedger, topicExecutor,
                 transactionTimer, dataSerializer, 1024, 64 * 4,
                 10000, true, DISABLED_BUFFERED_WRITER_METRICS);
         for (int i = 0; i < 64; i++){
@@ -446,11 +452,9 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     @Test
     public void testPendingScheduleTriggerTaskCount() throws Exception {
         // Create components.
-        OrderedExecutor orderedExecutor =  Mockito.mock(OrderedExecutor.class);
         ArrayBlockingQueue workQueue = new ArrayBlockingQueue<>(65536 * 2);
         ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 5,
                 TimeUnit.SECONDS, workQueue);
-        Mockito.when(orderedExecutor.chooseThread(Mockito.anyString())).thenReturn(threadPoolExecutor);
         HashedWheelTimer transactionTimer = new HashedWheelTimer(new DefaultThreadFactory("transaction-timer"),
                 1, TimeUnit.MILLISECONDS);
         SumStrDataSerializer dataSerializer = new SumStrDataSerializer();
@@ -458,15 +462,14 @@ public void testPendingScheduleTriggerTaskCount() throws Exception {
         MockedManagedLedger mockedManagedLedger = mockManagedLedgerWithWriteCounter(mlName);
         // Start tests.
         TxnLogBufferedWriter txnLogBufferedWriter = new TxnLogBufferedWriter<>(mockedManagedLedger.managedLedger,
-                orderedExecutor, transactionTimer, dataSerializer, 2, 1024 * 4,
+                threadPoolExecutor, transactionTimer, dataSerializer, 2, 1024 * 4,
                 1, true, DISABLED_BUFFERED_WRITER_METRICS);
         TxnLogBufferedWriter.AddDataCallback callback = Mockito.mock(TxnLogBufferedWriter.AddDataCallback.class);
         // Append heavier tasks to the Ledger thread.
-        final ExecutorService executorService = orderedExecutor.chooseThread(mlName);
         AtomicInteger heavierTaskCounter = new AtomicInteger();
         Thread heavierTask = new Thread(() -> {
             while (true) {
-                executorService.execute(() -> {
+                threadPoolExecutor.execute(() -> {
                     try {
                         heavierTaskCounter.incrementAndGet();
                         Thread.sleep(19);
@@ -524,7 +527,7 @@ public void testPendingScheduleTriggerTaskCount() throws Exception {
         dataSerializer.cleanup();
         threadPoolExecutor.shutdown();
         transactionTimer.stop();
-        orderedExecutor.shutdown();
+        threadPoolExecutor.shutdown();
     }
 
     private static class JsonDataSerializer implements TxnLogBufferedWriter.DataSerializer{
@@ -924,7 +927,6 @@ private void releaseTxnLogBufferedWriterContext(TxnLogBufferedWriterContext cont
         context.txnLogBufferedWriter.close().get();
         context.metrics.close();
         context.timer.stop();
-        context.orderedExecutor.shutdown();
         CollectorRegistry.defaultRegistry.clear();
     }
 
@@ -933,7 +935,6 @@ private static class TxnLogBufferedWriterContext{
         TxnLogBufferedWriter txnLogBufferedWriter;
         MockedManagedLedger mockedManagedLedger;
         Timer timer;
-        OrderedExecutor orderedExecutor;
         TxnLogBufferedWriterMetricsStats metrics;
     }
 
@@ -964,11 +965,12 @@ private TxnLogBufferedWriterContext createTxnBufferedWriterContextWithMetrics(
         MockedManagedLedger mockedManagedLedger = mockManagedLedgerWithWriteCounter(mlName);
         // Create Txn Buffered Writer.
         TxnLogBufferedWriter txnLogBufferedWriter = new TxnLogBufferedWriter(
-                mockedManagedLedger.managedLedger, orderedExecutor, transactionTimer,
+                mockedManagedLedger.managedLedger,
+                orderedExecutor.chooseThread(mockedManagedLedger.managedLedger.getName()), transactionTimer,
                 dataSerializer, batchedWriteMaxRecords, batchedWriteMaxSize,
                 batchedWriteMaxDelayInMillis, true, metricsStats);
         return new TxnLogBufferedWriterContext(txnLogBufferedWriter, mockedManagedLedger, transactionTimer,
-                orderedExecutor, metricsStats);
+                metricsStats);
     }
 
     private void verifyTheCounterMetrics(int triggeredByRecordCount, int triggeredByMaxSize, int triggeredByMaxDelay,
@@ -990,17 +992,17 @@ private void verifyTheCounterMetrics(int triggeredByRecordCount, int triggeredBy
     private void verifyTheHistogramMetrics(int batchFlushCount, int totalRecordsCount, int totalSize){
         // Total flush count.
         assertEquals(
-                getHistogramCount(String.format("%s_bufferedwriter_batch_record_count", metricsPrefix)),
+                getHistogramCount(String.format("%s_bufferedwriter_batch_records", metricsPrefix)),
                 batchFlushCount);
         assertEquals(
                 getHistogramCount(String.format("%s_bufferedwriter_batch_size_bytes", metricsPrefix)),
                 batchFlushCount);
         assertEquals(
-                getHistogramCount(String.format("%s_bufferedwriter_batch_oldest_record_delay_time_second", metricsPrefix)),
+                getHistogramCount(String.format("%s_bufferedwriter_batch_oldest_record_delay_seconds", metricsPrefix)),
                 batchFlushCount);
         // Total records count.
         assertEquals(
-                getHistogramSum(String.format("%s_bufferedwriter_batch_record_count", metricsPrefix)),
+                getHistogramSum(String.format("%s_bufferedwriter_batch_records", metricsPrefix)),
                 totalRecordsCount);
         // Total data size.
         assertEquals(
diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/test/MockedBookKeeperTestCase.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/test/MockedBookKeeperTestCase.java
index 3c50a82daacb4..e0b10ca0280d2 100644
--- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/test/MockedBookKeeperTestCase.java
+++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/test/MockedBookKeeperTestCase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/AbstractWebSocketHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/AbstractWebSocketHandler.java
index 1bd0055bd1d80..4ff7ee6502abe 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/AbstractWebSocketHandler.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/AbstractWebSocketHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
index 7ecc047bb4a67..ae976efe44e69 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/CryptoKeyReaderFactory.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/CryptoKeyReaderFactory.java
index cad806c87881b..106f34fbcaea1 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/CryptoKeyReaderFactory.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/CryptoKeyReaderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/PingPongHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/PingPongHandler.java
index 1431241cc8a99..870630abc8889 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/PingPongHandler.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/PingPongHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java
index 760cb28b6329a..c2afb1d79d347 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ReaderHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ReaderHandler.java
index 3c1cd2a9137fa..f84c5b759d776 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ReaderHandler.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ReaderHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketConsumerServlet.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketConsumerServlet.java
index 2291456ef491a..8f718bc744d03 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketConsumerServlet.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketConsumerServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketError.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketError.java
index 84ecb5258bbd6..07d6959a3fe5e 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketError.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapper.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapper.java
index 38585ba6db5fa..19ce9a32363c1 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapper.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketPingPongServlet.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketPingPongServlet.java
index ca7644b854084..cc2d79ee541ba 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketPingPongServlet.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketPingPongServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketProducerServlet.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketProducerServlet.java
index 20a674d7ce6ff..c9d8861b76e7b 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketProducerServlet.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketProducerServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketReaderServlet.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketReaderServlet.java
index f038f50657b32..9d23d10c39581 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketReaderServlet.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketReaderServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
index 7e798eecfddf7..f43c36c051fe3 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketProxyStatsBase.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketProxyStatsBase.java
index e43cb5a1e08f1..682b64d51bf46 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketProxyStatsBase.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketProxyStatsBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketWebResource.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketWebResource.java
index b6a0f43a01aae..6515a01c477b9 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketWebResource.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketWebResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/package-info.java
index 1ca9ab8cf2a3b..14245c4d1e0e7 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/WebSocketProxyStatsV1.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/WebSocketProxyStatsV1.java
index 89a1cf7cb0937..66dc1d4942c29 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/WebSocketProxyStatsV1.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/WebSocketProxyStatsV1.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/package-info.java
index 98374f34c07e6..25b6612ce38e4 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v1/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/WebSocketProxyStatsV2.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/WebSocketProxyStatsV2.java
index 186fe11277b48..779b0ec4b150c 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/WebSocketProxyStatsV2.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/WebSocketProxyStatsV2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/package-info.java
index ab19c9fc6c6d8..83c464302330e 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/v2/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerCommand.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerCommand.java
index 88112a8dc53e3..9d4b653c54efe 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerCommand.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerCommand.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerMessage.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerMessage.java
index 172cb55674034..99ce86dbf1695 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerMessage.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ConsumerMessage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/EndOfTopicResponse.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/EndOfTopicResponse.java
index dbb85f8430489..de829e0ad99db 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/EndOfTopicResponse.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/EndOfTopicResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAck.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAck.java
index 27fd4a42c532b..1e62098ac2bc5 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAck.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAck.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAcks.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAcks.java
index bedf047958471..4b6236be773bc 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAcks.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerAcks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessage.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessage.java
index 5e9e0603a30ac..4831b905514f3 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessage.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessages.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessages.java
index 9833fbd67591b..a1247dc69f47c 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessages.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/ProducerMessages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/package-info.java
index 08ae9d6530e3e..c8ddcdbef28fc 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/package-info.java
index 9f11c369b0423..294c9a8a393a7 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/ProxyServer.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/ProxyServer.java
index 7c0ad6d813ad8..7aed43d056c67 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/ProxyServer.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/ProxyServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketProxyConfiguration.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketProxyConfiguration.java
index 8fb3ab7ed01cb..ca827e53c90f1 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketProxyConfiguration.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketProxyConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketServiceStarter.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketServiceStarter.java
index fc39337cf3bdf..fbcecc0642e34 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketServiceStarter.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/WebSocketServiceStarter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/package-info.java
index 123e8651d9853..dd719b7f3695c 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/service/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyStats.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyStats.java
index 7a7f9565c9748..eb1566ef7d412 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyStats.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyTopicStat.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyTopicStat.java
index 2cadda78f835a..96a1b43adde69 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyTopicStat.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/ProxyTopicStat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java
index 7cc472ffc5ee9..31d90de160492 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/package-info.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/package-info.java
index 36f10df5292ae..924c507808c63 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/package-info.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
index 29d8d64159c13..0e07dd0bc00b3 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/LookupProtocolTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/LookupProtocolTest.java
index 6b023f5ba4a8c..2174ad4764b47 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/LookupProtocolTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/LookupProtocolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/PingPongHandlerTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/PingPongHandlerTest.java
index 7d5cc800aa37f..662009f1aab1a 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/PingPongHandlerTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/PingPongHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ProducerHandlerTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ProducerHandlerTest.java
index 0e3e652a9da6a..b88a148d08ee2 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ProducerHandlerTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ProducerHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ReaderHandlerTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ReaderHandlerTest.java
index 7dfa8b6e3146b..002f15609cdb7 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ReaderHandlerTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/ReaderHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapperTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapperTest.java
index 4e23416b091b8..b11529bf2f176 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapperTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketHttpServletRequestWrapperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketProxyConfigurationTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketProxyConfigurationTest.java
index a61187e13804f..e3a303003b841 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketProxyConfigurationTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketProxyConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/admin/WebSocketWebResourceTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/admin/WebSocketWebResourceTest.java
index 6c8156ef79fe9..f1b6c87cc5ef4 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/admin/WebSocketWebResourceTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/admin/WebSocketWebResourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketProxyConfigurationTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketProxyConfigurationTest.java
index e730804d901c5..ebe4ebb723842 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketProxyConfigurationTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketProxyConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketServiceStarterTest.java b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketServiceStarterTest.java
index ffac67febf726..c898a07e22800 100644
--- a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketServiceStarterTest.java
+++ b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/service/WebSocketServiceStarterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/site2/README.md b/site2/README.md
index 7b1ec17dfea94..229403164a07a 100644
--- a/site2/README.md
+++ b/site2/README.md
@@ -1,38 +1,3 @@
-# Pulsar Documentation Contribution Overview 
-
-As you start your Pulsar journey, you might don’t understand something or make mistakes. Don’t worry and take it easy. The Pulsar community is a joint effort based on respect, openness, friendliness, discussions, and consensus. Everyone is encouraged to contribute and any help is appreciated!
-
-The **Pulsar Documentation Contribution Overview** provides a set of guides offering best-practice suggestions for contributing documentation to Pulsar. It provides detailed instructions on the contribution workflow and conventions. Please follow these guidelines to keep the documentation structure, style, and syntax consistent.
-
-## Before writing docs
-
-* [Pulsar Documentation Contribution Guide](./doc-guides/contribution.md)
-    * Doc structure and project organization
-    * Workflow of submitting various docs 
-
-## Writing docs
-  
-* [Pulsar Documentation Writing Syntax Guide](./doc-guides/syntax.md)
-
-* [Pulsar Documentation Writing Style Guide](https://docs.google.com/document/d/1lc5j4RtuLIzlEYCBo97AC8-U_3Erzs_lxpkDuseU0n4/edit#)
-  
-* [Pulsar Design Style Guide](https://docs.google.com/document/d/16Hp7Sc86MQtL0m8fc2w_TrcKXAuglwRwHmdmwfk00mI/edit#heading=h.b8ogodj5sj0)
-  
-* [Pulsar API Documentation Guide](https://docs.google.com/document/d/1-I1oQp1_HUaQopqilU-JdC-ksrLAgYNi93FZVnECwV8/edit#heading=h.wu6ygjne8e35)
-## Testing docs
-
-* [Pulsar Content Preview Guide](./doc-guides/preview.md)
-
-## Preparing to submit doc PRs
-
-* [Pulsar Pull Request Naming Convention Guide](./doc-guides/naming.md)
-  
-* [Pulsar Documentation Label Guide](./doc-guides/label.md)
-
-## References
-
-In addition, the following resources can help you craft and contribute to docs.
-
-* [Google Technical Writing Courses](https://developers.google.com/tech-writing/overview)
-
+# Pulsar Documentation Contribution Guide
 
+Read https://pulsar.apache.org/contribute/document-intro/ for more information.
diff --git a/site2/doc-guides/assets/contribution-1.png b/site2/doc-guides/assets/contribution-1.png
deleted file mode 100644
index 7363851e8bd9a..0000000000000
Binary files a/site2/doc-guides/assets/contribution-1.png and /dev/null differ
diff --git a/site2/doc-guides/assets/contribution-2.png b/site2/doc-guides/assets/contribution-2.png
deleted file mode 100644
index 998747a6ef5d3..0000000000000
Binary files a/site2/doc-guides/assets/contribution-2.png and /dev/null differ
diff --git a/site2/doc-guides/assets/contribution-3.png b/site2/doc-guides/assets/contribution-3.png
deleted file mode 100644
index bf4c5fc180e5f..0000000000000
Binary files a/site2/doc-guides/assets/contribution-3.png and /dev/null differ
diff --git a/site2/doc-guides/assets/naming-1.png b/site2/doc-guides/assets/naming-1.png
deleted file mode 100644
index 1e6bdc442077a..0000000000000
Binary files a/site2/doc-guides/assets/naming-1.png and /dev/null differ
diff --git a/site2/doc-guides/assets/preview-1.png b/site2/doc-guides/assets/preview-1.png
deleted file mode 100644
index 3c60383177f5c..0000000000000
Binary files a/site2/doc-guides/assets/preview-1.png and /dev/null differ
diff --git a/site2/doc-guides/assets/preview-2.png b/site2/doc-guides/assets/preview-2.png
deleted file mode 100644
index b291fc6c8252d..0000000000000
Binary files a/site2/doc-guides/assets/preview-2.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-1.png b/site2/doc-guides/assets/syntax-1.png
deleted file mode 100644
index 17dbb33b4fef9..0000000000000
Binary files a/site2/doc-guides/assets/syntax-1.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-10.png b/site2/doc-guides/assets/syntax-10.png
deleted file mode 100644
index e01122a5ca0be..0000000000000
Binary files a/site2/doc-guides/assets/syntax-10.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-11.png b/site2/doc-guides/assets/syntax-11.png
deleted file mode 100644
index d8ba64d99bdd4..0000000000000
Binary files a/site2/doc-guides/assets/syntax-11.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-12.png b/site2/doc-guides/assets/syntax-12.png
deleted file mode 100644
index d50bfb007167e..0000000000000
Binary files a/site2/doc-guides/assets/syntax-12.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-13.png b/site2/doc-guides/assets/syntax-13.png
deleted file mode 100644
index 56a8cdfd79a31..0000000000000
Binary files a/site2/doc-guides/assets/syntax-13.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-2.png b/site2/doc-guides/assets/syntax-2.png
deleted file mode 100644
index 7a2a11cd1cb28..0000000000000
Binary files a/site2/doc-guides/assets/syntax-2.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-3.png b/site2/doc-guides/assets/syntax-3.png
deleted file mode 100644
index b1026a6eb6d81..0000000000000
Binary files a/site2/doc-guides/assets/syntax-3.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-4.png b/site2/doc-guides/assets/syntax-4.png
deleted file mode 100644
index f13005e39c448..0000000000000
Binary files a/site2/doc-guides/assets/syntax-4.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-5.png b/site2/doc-guides/assets/syntax-5.png
deleted file mode 100644
index 19cdbfc261c6d..0000000000000
Binary files a/site2/doc-guides/assets/syntax-5.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-6.png b/site2/doc-guides/assets/syntax-6.png
deleted file mode 100644
index aec5e6bb13bf8..0000000000000
Binary files a/site2/doc-guides/assets/syntax-6.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-7.png b/site2/doc-guides/assets/syntax-7.png
deleted file mode 100644
index 15ad9b013abd5..0000000000000
Binary files a/site2/doc-guides/assets/syntax-7.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-8.png b/site2/doc-guides/assets/syntax-8.png
deleted file mode 100644
index 401222d3278ac..0000000000000
Binary files a/site2/doc-guides/assets/syntax-8.png and /dev/null differ
diff --git a/site2/doc-guides/assets/syntax-9.png b/site2/doc-guides/assets/syntax-9.png
deleted file mode 100644
index 6c38d48f8eb80..0000000000000
Binary files a/site2/doc-guides/assets/syntax-9.png and /dev/null differ
diff --git a/site2/doc-guides/contribution.md b/site2/doc-guides/contribution.md
deleted file mode 100644
index 14d5e8dcaec55..0000000000000
--- a/site2/doc-guides/contribution.md
+++ /dev/null
@@ -1,215 +0,0 @@
-# Pulsar Documentation Contribution Guide
-
-> 👩🏻‍🏫 **Summary**
-> 
-> This guide explains the organization of Pulsar documentation and website repos and the workflow of updating various Pulsar docs.
-
-
-**TOC**
-
-
-
-- [Pulsar Documentation Contribution Guide](#pulsar-documentation-contribution-guide)
-  - [Documentation and website repos](#documentation-and-website-repos)
-    - [Intro to doc and website repos](#intro-to-doc-and-website-repos)
-    - [Relationships between doc and website repos](#relationships-between-doc-and-website-repos)
-  - [Update versioned docs](#update-versioned-docs)
-  - [Update reference docs](#update-reference-docs)
-    - [Update Pulsar configuration docs](#update-pulsar-configuration-docs)
-    - [Update client configuration docs](#update-client-configuration-docs)
-    - [Update CLI tool docs](#update-cli-tool-docs)
-  - [Update client/function matrix](#update-clientfunction-matrix)
-  - [References](#references)
-
-
-
-## Documentation and website repos
-
-This chapter shows the organization of Pulsar documentation and website repos.
-
-### Intro to doc and website repos
-
-The Pulsar website consists of two parts:
-
-* **Documentation**
-
-  Pulsar documentation repo: [pulsar/site2](https://github.com/apache/pulsar/tree/master/site2)
-
-  ![alt_text](assets/contribution-1.png)
-  
-* **Website** 
-
-  Pulsar website repo: [pulsar-site](https://github.com/apache/pulsar-site)
-
-  ![alt_text](assets/contribution-2.png)
-
-### Relationships between doc and website repos
-
-Type|Repo|Description|PR example
-|---|---|---|---
-Documentation|[pulsar/site2](https://github.com/apache/pulsar/tree/master/site2)|All files related to Pulsar documentation (English) are stored in this repo.|[[feat][doc] add docs for shedding strategy](https://github.com/apache/pulsar/pull/13811)
-Website|[pulsar-site](https://github.com/apache/pulsar-site)|- All files related to the Pulsar website are stored in the **main** branch in this repo. 

     - The website is built and put in in the **asf-site-next** branch in this repo.|- [[feat][workflow] add links of doc contribution guides to Pulsar contribution page](https://github.com/apache/pulsar-site/pull/114) 

     - [[improve][website] add download links for previous versions](https://github.com/apache/pulsar-site/pull/108)
-
-Files in [pulsar/site2 (master branch)](https://github.com/apache/pulsar/tree/master/site2) are synced to [pulsar-site/website-next (main branch)](https://github.com/apache/pulsar-site/tree/main/site2/website-next) every 6 hours. You can check the sync status and progress at [pulsar-site Actions](https://github.com/apache/pulsar-site/actions/workflows/ci-pulsar-website-docs-sync.yaml).
-
-> **Summary**
->
-> * pulsar/site2/**website** = pulsar-site site2/**website-next** 
-> 
-> * pulsar/site2/**docs** = pulsar-site/site2/**website-next/docs**
-
-## Update versioned docs
-
-If you want to update versioned docs, go to [pulsar/site2/website/versioned_docs/](https://github.com/apache/pulsar/tree/master/site2/website/versioned_docs) to find your desired one.
-
->❗️**BREAKING CHANGE**
->
-> If you want to update docs for 2.8.x and later versions, follow the steps below.
-
-1. Update the correct doc set. 
-   
-   For example, [version-2.8.x](https://github.com/apache/pulsar/tree/master/site2/website/versioned_docs/version-2.8.x), [version-2.9.x](https://github.com/apache/pulsar/tree/master/site2/website/versioned_docs/version-2.9.x), or [version-2.10.x](https://github.com/apache/pulsar/tree/master/site2/website/versioned_docs/version-2.10.x).
-   
-   For why and how we make this change, see [PIP-190: Simplify documentation release and maintenance strategy](https://github.com/apache/pulsar/issues/16637).
-
-2. Add specific instructions.
-
-    For example, if you want to add docs for an improvement introduced in 2.8.2, you can add the following instructions.
-
-    ```
-    :::note
-
-    This  is available for 2.8.2 and later versions.
-
-    :::
-    ```
-
-## Update reference docs
-
-If you want to update [Pulsar configuration docs](https://pulsar.apache.org/reference/#/latest/), pay attention to the doc source files.
-
-- Some docs are generated from code **automatically**. If you want to update the docs, you need to update the source code files.
-
-- Some configuration docs are updated **manually** using .md files.
-
-### Update Pulsar configuration docs
-
-
-  
-   
-   
-   
-  
-  
-   
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-  
-
    Components
-   Update where…
-   Notes
-   
    Broker
-   org.apache.pulsar.broker.ServiceConfiguration
-   These components are internal. 
-
    
-These configuration docs are generated from code automatically.
-   
    Client
-   org.apache.pulsar.client.impl.conf.ClientConfigurationData
-   
    WebSocket
-   org.apache.pulsar.websocket.service.WebSocketProxyConfiguration
-   
    Proxy
-   org.apache.pulsar.proxy.server.ProxyConfiguration
-   
    Standalone
-   org.apache.pulsar.broker.ServiceConfiguration
-   
    BookKeeper
-   reference-configuration-bookkeeper.md
-   These components are external. 
-
    
-These configuration docs are updated manually.
-   
    Log4j
-   reference-configuration-log4j.md
-   
    Log4j shell
-   reference-configuration-log4j-shell.md
-   
    ZooKeeper
-   reference-configuration-zookeeper.md
-   
    
-
-### Update client configuration docs
-
-Pulsar Java configuration docs are generated from code automatically.
-
-Components|Update where…
-|---|---
-Client|org.apache.pulsar.client.impl.conf.ClientConfigurationData
-Producer|org.apache.pulsar.client.impl.conf.ProducerConfigurationData 
-Consumer|org.apache.pulsar.client.impl.conf.ConsumerConfigurationData
-Reader|org.apache.pulsar.client.impl.conf.ReaderConfigurationData 
-
-### Update CLI tool docs
-
-Components|Update where…
-|---|---
-pulsar-admin| [pulsar/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/](https://github.com/apache/pulsar/tree/master/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli)
-pulsar| Different commands are updated in different code files.
    Details see [pulsar/bin/pulsar](https://github.com/apache/pulsar/blob/master/bin/pulsar).
-pulsar-client|[pulsar/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/](https://github.com/apache/pulsar/tree/master/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli)
-pulsar-perf|- `websocket-producer`: [pulsar/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/](https://github.com/apache/pulsar/tree/master/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client)

     - Other commands: [pulsar/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/](https://github.com/apache/pulsar/tree/master/pulsar-testclient/src/main/java/org/apache/pulsar/testclient)
-pulsar-shell| reference-cli-pulsar-shell.md 
-pulsar-daemon|reference-cli-pulsar-daemon.md 

     (It's almost not updated and only contains 3 commands, so it's managed in `md` file rather than being generated automatically)
-bookkeeper|reference-cli-bookkeeper.md
-
-## Update client/function matrix
-
-[Pulsar Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914) outlines every feature supported by the Pulsar client and function. 
-
-> ❗️ **Note** 
->
-> - It’s public and everyone has access to edit it. Feel free to reach out to `liuyu@apache.org` if you have problems in editing.
->
-> - This matrix will be moved to the Pulsar website (instead of the spreadsheet) in the future. 
-
-If you want to update the Pulsar Feature Matrix, follow the steps below.
-
-1. Submit your code and doc PRs.
-
-2. Get your PR reviewed and merged. 
-
-3. In the [Pulsar Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914), check the box in the corresponding cell with the links of PRs and doc site.
-
-  ![alt_text](assets/contribution-3.png)
-
-## References
-
-For more guides on how to make contributions to Pulsar docs, see [Pulsar Documentation Contribution Overview](./../README.md).
\ No newline at end of file
diff --git a/site2/doc-guides/label.md b/site2/doc-guides/label.md
deleted file mode 100644
index 816c5aec8cfb9..0000000000000
--- a/site2/doc-guides/label.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Pulsar Documentation Label Guide
-
-> 👩🏻‍🏫 **Summary**
-> 
-> This guide instructs you on how to label your doc PR.
-
-When submitting an issue or PR, you must [provide doc label information](https://github.com/apache/pulsar/blob/master/.github/PULL_REQUEST_TEMPLATE.md#documentation) by **selecting the checkbox**, so that the Bot can label the PR correctly. 
-
-Label name|Usage
-|---|---
-`doc-required`|Use this label to indicate this issue or PR impacts documentation.

     **You have not updated the docs yet**. The docs will be submitted later. 
-`doc-not-needed`| The code changes in this PR do not impact documentation.
-`doc`|This PR contains changes that impact documentation, **no matter whether the changes are in markdown or code files**.
-`doc-complete`|Use this label to indicate the documentation updates are complete.
-`doc-label-missing`|The Bot applies this label when there is no doc label information in the PR if one of the following conditions is met:. 

     - You do not provide a doc label. 

     - You provide multiple doc labels. 

     - You delete backticks (``) in doc labels. 
    For example,
     [x] `doc-required` ✅ 
     [x] doc-required ❌ 

     - You add blanks in square brackets. 
    For example, 
     [x] `doc-required` ✅ 
    [ x ] `doc-required` ❌
-
-## References
-
-For more guides on how to make contributions to Pulsar docs, see [Pulsar Documentation Contribution Overview](./../README.md).
\ No newline at end of file
diff --git a/site2/doc-guides/naming.md b/site2/doc-guides/naming.md
deleted file mode 100644
index f46f7d3a02dfb..0000000000000
--- a/site2/doc-guides/naming.md
+++ /dev/null
@@ -1,211 +0,0 @@
-# Pulsar Pull Request Naming Convention Guide
-
-> 👩🏻‍🏫 **Summary**
-> 
-> This guide explains why you need good PR titles and how you do that with various self​-explanatory examples. 
-
-**TOC**
-
-
-
-- [Pulsar Pull Request Naming Convention Guide](#pulsar-pull-request-naming-convention-guide)
-  - [Why do PR titles matter?](#why-do-pr-titles-matter)
-  - [How to write good PR titles?](#how-to-write-good-pr-titles)
-    - [💡Quick examples](#💡quick-examples)
-    - [`type`](#type)
-    - [`scope`](#scope)
-      - [Pulsar](#pulsar)
-      - [Client](#client)
-    - [`Summary`](#summary)
-    - [Full examples](#full-examples)
-  - [References](#references)
-
-
-
-## Why do PR titles matter?
-
-Engineers and writers submit or review PRs almost every day. 
-
-A PR title is a summary of your changes. 
-
-* Vague, boring, and unclear PR titles decrease team efficiency and productivity. 
-  
-* PR titles should be engaging, easy to understand, and readable. 
-
-Good titles often bring many benefits, including but not limited to the following:
-
-* Speed up the review process. 
-
-    You can tell from the title what changes the PR introduces.
-
-* Facilitate understanding of PR changes. 
-  
-    * PR titles are shown on Pulsar release notes as items. Concise PR titles make your changes easier to understand.
-  
-    * Especially when you read commit logs in command-line tools, clear commit messages show PR changes quickly.
-  
-* Increase search efficiency. 
-
-    You can skim through hundreds of commits and locate desired information quickly.
-
-* Remind you to think about your PR.
-
-    If you can not write a PR title in a simple way (for example, [[type](#type)] [[scope](#scope)] [summary](#summary)), or you need to use several types / scopes, consider whether your PR contains **too many** changes across various scopes. If so, consider splitting this big PR into several small PRs. In this way, you might get your PRs reviewed faster.
-
-## How to write good PR titles?
-
-A PR title should be structured as follows: 
-
-![alt_text](assets/naming-1.png)
-
-
-> 💡 **Rule**
->
-> A good title = clear format ([type](#type) and [scope](#scope)) + self-explanatory [summary](#summary)
-
-
-### 💡Quick examples
-
-Here are some examples of unclear and good PR titles for your quick reference. Good PR titles are concise and self-explanatory since they tell you the changes in a clear and direct way. 
-
-For more examples with correct formats, see [Full examples](#full-examples).
-
-🙌 **Examples**
-
-Vague ❌|Clear ✅
-|---|---
-Producer getting producer busy is removing existing producer from list|[fix][broker] ​​Active producers with the same name are no longer removed from the topic map
-Forbid to read other topic's data in managedLedger layer|[improve][broker] Consumers are not allowed to read data on topics to which they are not subscribed 
-Fix kinesis sink backoff class not found|[improve][connector] xx connectors can now use the Kinesis Backoff class
-K8s Function Name Length Check Allows Invalid StatefulSet |[improve][function] Function name length cannot exceed 52 characters when using Kubernetes runtime 
-
-> 💡 **Steps**
->
-> How to write a good PR title?
-> 
-> 1. Select a [type](#type).
-> 
-> 2. Select a  [scope](#scope).
-> 
-> 3. Write a [summary](#summary).
-
-### `type`
-
-`type` is "what actions do you take". 
-
-It must be one of the following.
-
-type|Pulsar PR label|What actions do you take? 
-|---|---|---
-cleanup| [type/cleanup](https://github.com/apache/pulsar/labels/type%2Fcleanup)|Remove unused code or doc.
-improve|[type/improvement](https://github.com/apache/pulsar/labels/type%2Fimprovement)|Submit enhancements that are neither new features nor bug fixes.
-feat|[type/feature](https://github.com/apache/pulsar/labels/type%2Ffeature)|Submit new features.
-fix|[type/fix](https://github.com/apache/pulsar/labels/type%2Ffix)|Submit bug fixes.
-refactor|[type/refactor](https://github.com/apache/pulsar/labels/type%2Frefactor)|Restructure existing code while preserving its external behavior. 
-revert|To be created|Revert changes
-
->❗️ **Note**
->
-> - Choose correct labels for your PR so that your PR will automatically go to the correct chapter in release notes. If you do not specify a type label, the PR might go to the wrong place or not be included in the release notes at all. 
-> 
-> - For more information about release note automation for Pulsar and clients, see [PIP 112: Generate Release Notes Automatically](https://docs.google.com/document/d/1Ul2qIChDe8QDlDwJBICq1VviYZhdk1djKJJC5wXAGsI/edit).
-
-### `scope`
-
-`scope` is "where do you make changes".
-
-Pulsar and clients have separate release notes, so they have different scopes.
-
->❗️ **Note**
->
-> If your PR affects several scopes, do not choose several scope labels at the same time since different scopes go to different chapters in release notes. Instead, choose the most affected label (scope), or else your PR goes to several chapters in release notes, which causes redundancies. Choose only one label as much as possible.
-
-#### Pulsar
-
-`scope` and PR labels must be one of the following.
-
-scope |Pulsar PR label|Where do you make changes?
-|---|---|---
-admin|- scope/admin 
    - scope/topic-policy | - pulsar-admin 
     - REST API 
     - Java admin API
-broker | - scope/broker | It’s difficult to maintain an exhaustive list since many changes belong to brokers. 

     Here just lists some frequently updated areas, it includes but not limited to:
      - key_shared 
     - replication 
     - metadata 
     - compaction
-cli|- scope/tool| Pulsar CLI tools. 
     It includes: 
     - pulsar 
     - pulsar-client 
     - pulsar-daemon 
     - pulsar-perf 
     - bookkeeper
     - broker-tool
-io
    (connector)|- scope/connector 
     - scope/connect 
     - scope/kafka|Connector
-fn
    (function)| - scope/function|Function
-meta
    (metadata)|- scope/zookeepeer|Metadata
-monitor|- scope/metrics - scope/stats|Monitoring
-proxy| - scope/proxy| Proxy
-schema| - scope/schema 
     - scope/schemaregistry|Schema
-sec
    (security)| - scope/security 
     - scope/authentication 
     - scope/authorization|Security
-sql|- scope/sql|Pulsar SQL
-storage| - scope/bookkeeper storage|Managed ledge
-offload
    (tiered storage)|- scope/tieredstorage|Tiered storage
-txn| - scope/transaction
     - scope/transaction-coordinator|Transaction
-test|- scope/test|Code tests
-ci|- scope/ci|CI workflow changes or debugging
-build|- scope/build| - Dependency (Maven) 
     - Docker 
     - Build or release script
-misc|- scope/misc| Changes that do not belong to any scopes above.
-doc|- doc|Documentation
-site
    (website)|- website|Website
-
-#### Client
-
-The following changes are shown on the client release notes. 
-
-`scope` and PR label must be one of the following.
-
-scope | Pulsar PR label | Where do you make changes?
-|---|---|---
-client
    (Java client)|scope/client-java|Java client
-ws
    (WebSocket)|scope/client-websocket|[WebSocket API](https://pulsar.apache.org/docs/next/client-libraries-websocket/)
-
-### `Summary`
-
-`Summary` is a single line that best sums up the changes made in the commit. 
-
-Follow the best practice below.
-
-* Keep the summary concise and descriptive.
-  
-* Use the second person and present tense.  
-  
-* Write [complete sentences](https://www.grammarly.com/blog/sentence-fragment/#:~:text=What's%20a%20sentence%20fragment%3F,%2C%20a%20verb%2C%20or%20both.) rather than fragments.
-  
-* Capitalize the first letter. 
-  
-* No period at the end. ❌
-  
-* Do not include back quotes (``).
-  
-* Limit the length to 50 characters.
-  
-* If you cherry pick changes to branches, name your PR title the same as the original PR title and label your PR with cherry-pick related labels.
-  
-* Do not use [GitHub keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) followed by a #<issue-number>. This information should be provided in PR descriptions or commit messages rather than in PR titles. ❌
-
-### Full examples 
-
-As explained in the [How to write good PR titles](#how-to-write-good-pr-titles) chapter:
-
-> 💡 **Rule**
->
-> A good title = clear format ([type](#type) and [scope](#scope)) + self-explanatory [summary](#summary)
-
-Here are some format examples. For self-explanatory summary examples, see [Quick examples](#quick-examples).
-
-Changes|Unclear format ❌|Clear format ✅
----|---|---
-Submit breaking changes|[Breaking change] xxx|[feat][broker]! Support xx
-Submit PIP changes|[PIP-198] Support xx|[feat][broker] PIP-198: Support xx
-Cherry pick changes|[Branch-2.9] Fix xxx issue. | [fix][broker][branch-2.9] Fix xxx issue 
-Revert changes|Revert xxx| [revert][broker] Revert changes about xxx
-Add features| - Adding xx feature 
     - Support delete schema forcefully| - [feat][java client] Add xx feature 
     - [feat][schema] Support xx
-Fix bugs | [Issue 14633][pulsar-broker] Fixed xxx| [fix][broker] Fix xxx 
-Submit improvements|- Enhances xx 
     - Bump netty version to 4.1.75 | - [improve][sql] Improve xx performance 
     - [improve][build] Bump Netty version to 4.1.75 
-Update tests | reduce xx test flakiness | [improve][test] Reduce xxx flaky tests
-Update docs| - [Doc] add explanations for xxx 
     - 2.8.3 Release Notes 
     - Fix typos in xx | - [feat][doc] Add explanations for xxx 
     - [feat][doc] Add 2.8.3 release note 
     - [fix][doc] Fix typos in xx
-Update website | [Website] adjust xxx | [improve][site] Adjust xxx
-Update instructions/guidelines|Update xxx guideline|[improve][doc] Update xx guidelines
-
-## References
-
-For more guides on how to make contributions to Pulsar docs, see [Pulsar Documentation Contribution Overview](./../README.md).
\ No newline at end of file
diff --git a/site2/doc-guides/preview.md b/site2/doc-guides/preview.md
deleted file mode 100644
index ae4c561c6b0a6..0000000000000
--- a/site2/doc-guides/preview.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# Pulsar Content Preview Guide
-
-> 👩🏻‍🏫 **Summary**
-> 
-> This guide explains why and how to preview Pulsar content locally with detailed steps and various examples. 
-
-**TOC**
-
-
-
-- [Pulsar Content Preview Guide](#pulsar-content-preview-guide)
-  - [Why preview changes locally?](#why-preview-changes-locally)
-  - [How to preview changes locally?](#how-to-preview-changes-locally)
-    - [Prerequisites](#prerequisites)
-    - [Preview doc (markdown) changes](#preview-doc-markdown-changes)
-    - [Preview doc (Java API) changes](#preview-doc-java-api-changes)
-    - [Preview website changes](#preview-website-changes)
-    - [Stop preview](#stop-preview)
-    - [Maintenance info](#maintenance-info)
-  - [References](#references)
-
-
-
-## Why preview changes locally?
-
-It is **required** to preview your changes locally and attach the preview screenshots in your PR description. It brings many benefits, including but not limited to:
-
-* You can test your writings 
-
-    It’s a way to check whether you use the correct [Pulsar Documentation Writing Syntax](./syntax.md) and debug issues. You **must ensure** docs can be compiled and published correctly.
-
-* You can get your PR merged more quickly.
-
-    Reviewers know your changes clearly and can speed up the review process.
-
-## How to preview changes locally?
-
-Pulsar documentation is built using Docusaurus. To preview your changes as you edit the files, you can run a local development server that serves your website and reflect the latest changes.
-
-### Prerequisites
-
-To verify docs are built correctly before submitting a contribution, you should set up your local environment to build and display the docs locally.
-
-* Node >= 16.14
-  
-* Yarn >= 1.5
-  
-* Although you can use Linux, macOS, or Windows to build locally the Pulsar documentation, macOS is the preferred build environment as it offers the most complete support for documentation building.
-
-### Preview doc (markdown) changes
-
-Follow these steps to build the doc (markdown) preview on your local machine.
-
-1. Go to the correct repo.
-
-
-    ```
-    cd pulsar/site2/website
-    ```
-
-2. Run the following command to preview changes.
-
-* Preview **master** changes
-
-	If you update master docs, use the following command.
-
-    ```
-    sh start.sh
-    ```
-
-* Preview **historical** changes
-
-    If you update versioned docs, use the following command. 
-    
-    It may take a few more minutes to complete the process.
-
-    ```
-    sh start.sh  
-    ```
-
-    ![alt_text](assets/preview-1.png)
-
-3. By default, a browser window will open at [http://localhost:3000](http://localhost:3000) to show the changes.
-
-    ![alt_text](assets/preview-2.png)
-
-### Preview doc (Java API) changes
-
-Follow these steps to build the doc (Java API) preview on your local machine on the **master** branch.
-
-1. Go to the correct repo.
-
-    ```
-    cd pulsar/site2/tools
-    ```
-
-2. Run the following command to generate the `.html` files.
-
-    ```
-    sh javadoc-gen.sh
-    ```
-
-3. Open the target `.html` file to preview the updates.
-
-    For example, if you change the [ConsumerBuilder.java](http://pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java) for [Pulsar Java docs](https://pulsar.apache.org/api/client/2.11.0/org/apache/pulsar/client/api/ConsumerBuilder.html), you can navigate to the `generated-site/api/client/{version}/org/apache/pulsar/client/api/` directory and open the `ConsumerBuilder.html` file to preview the updates.
-
-### Preview website changes
-
-Pulsar website changes refer to all the changes made to the Pulsar website, including but not limited to the following pages:
-
-* [Release Notes page](https://pulsar.apache.org/release-notes/) ✅
-* [Ecosystem page](https://pulsar.apache.org/ecosystem) ✅
-* [Case studies page](https://pulsar.apache.org/case-studies) ✅
-* …
-* (except docs ❌)
-
-Follow these steps to build the website preview on your local machine.
-
-1. Go to the correct repo.
-
-    ```
-    cd pulsar-site/site2/website-next
-    ```
-
-2️. Run the following command to preview changes.
-
-   * Preview **master** changes
-
-      If you submit changes to master, use the following command.
-
-
-        ```
-        ./preview.sh 
-        ```
-
-   * Preview **historical** changes
-
-      ```
-      ./preview.sh   …
-      ```
-
-      > ❗️ **Note**
-      >
-      > * Use a space between ` `.
-      > 
-      > * If you want to preview multiple version changes, append `` with blanks. 
-      > 
-      > For example, `./preview.sh 2.9.1 2.9.2 2.9.3`.
-
-### Stop preview
-
-If you want to stop the preview, use one of the following methods.
-
-* Method 1: Switch to your command-line interface and press **Control+C**.
-  
-* Method 2: Switch to your browser and close the preview page.
-
-### Maintenance info
-
-* For the old Pulsar website, using ` yarn start` can preview all (master + historical) changes. However, to speed up the build process, for the new Pulsar website, using `./preview.sh `only preview master changes.
-
-## References
-
-For more guides on how to make contributions to Pulsar docs, see [Pulsar Documentation Contribution Overview](./../README.md).
\ No newline at end of file
diff --git a/site2/doc-guides/syntax.md b/site2/doc-guides/syntax.md
deleted file mode 100644
index 8c1cab39362c2..0000000000000
--- a/site2/doc-guides/syntax.md
+++ /dev/null
@@ -1,295 +0,0 @@
-# Pulsar Documentation Writing Syntax Guide
-
-> 👩🏻‍🏫 **Summary**
-> 
-> This guide explains how to write Pulsar documentation using the MDX-compatible markdown syntax.
-
-**TOC**
-
-
-
-- [Pulsar Documentation Writing Syntax Guide](#pulsar-documentation-writing-syntax-guide)
-  - [Background](#background)
-    - [Why use new markdown syntax?](#why-use-new-markdown-syntax)
-    - [How to test doc changes?](#how-to-test-doc-changes)
-  - [Syntax](#syntax)
-    - [Markdown](#markdown)
-    - [Tab](#tab)
-    - [Code blocks](#code-blocks)
-    - [Admonitions](#admonitions)
-    - [Assets](#assets)
-    - [Indentation & space](#indentation--space)
-    - [Metadata](#metadata)
-    - [Tables](#tables)
-    - [Links](#links)
-      - [Anchor links](#anchor-links)
-      - [Links to internal documentation](#links-to-internal-documentation)
-      - [Links to external documentation](#links-to-external-documentation)
-      - [Link to a specific line of code](#link-to-a-specific-line-of-code)
-    - [Authoritative sources](#authoritative-sources)
-    - [Escape](#escape)
-    - [Headings](#headings)
-  - [References](#references)
-
-
-
-## Background
-
-The Pulsar documentation uses [Markdown](https://www.markdownguide.org/basic-syntax/) as its markup language and [Docusaurus](https://docusaurus.io/) for generating the documentation and website.
-
-> 🔴 **BREAKING CHANGE**
->
-> From 2022/5/18, you need to use **Markdown syntax that is compatible with MDX**. Otherwise, your changes can not be recognized by MDX and rendered properly. In this case, your PR can not be merged. 
-
-### Why use new markdown syntax?
-
-The new Pulsar website is launched on 2022/5/11. It is upgraded to Docusaurus V2, which uses MDX as the parsing engine. MDX can do much more than just parsing standard Markdown syntax, like rendering React components inside your documents as well. However, **some previous documentation using Markdown syntax is incompatible with MDX**。 Consequently, you need to change the way you write. 
-
-### How to test doc changes?
-
-- You can play with the MDX format in **[MDX Playground](https://mdxjs.com/playground/)** . Write some MDX to find out what it turns into. You can see the rendered result, the generated code, and the intermediary ASTs. This can be helpful for debugging or exploring. 
-
-- For how to test doc changes locally, see [Pulsar Content Preview Guide](./preview.md).
-
-## Syntax
-
-> ❗️**Note**
-> 
-> This guide just highlights **some** important rules and frequently used syntax that is **different from the Markdown syntax used in the previous docs**. For the complete syntax guide, see [Docusaurus - Markdown Features](https://docusaurus.io/docs/next/markdown-features) and [MDX - Markdown](https://mdxjs.com/docs/what-is-mdx/#markdown).
-
-### Markdown 
-
-* **Use Markdown rather than HTML** as much as possible, or else MDX may not recognize it.
-
-    For example, when constructing complex tables, do not use HTML (``). 
-
-* Use **closing** tags.
-
-   `
  • ` and `

    ` are especially useful for constructing complex tables, such as _creating a list_ and _adding a blank line_.
-
-    🙌 **Examples**
-  
-    ```
-    
  • xxx ❌
-    
    xxx ❌
-    
  • xxx
    •  ✅
-    ```
-    
-    ![alt_text](assets/syntax-1.png)
-    
-    ```
-    
    xxx → wrap text in "next" line ✅
-    

    xxx → wrap text in "next next" line ✅ 
-    ```
-
-    ![alt_text](assets/syntax-2.png)
-
-* If you need to use HTML, use **React** syntax for HTML tags.
-
-    🙌 **Examples**
-
-    ```
-     ❌
-
-    deleted ✅
-    ```
-
-### Tab
-
-The image below shows the differences in writing multiple tabs before and after. For how to write multiple tabs, see [Tabs](https://docusaurus.io/docs/next/markdown-features/tabs).
-
-![alt_text](assets/syntax-3.png)
-
-### Code blocks
-
-For how to use syntax highlighting and supported languages, see [Syntax highlighting](https://docusaurus.io/docs/next/markdown-features/code-blocks#syntax-highlighting).
-
-### Admonitions
-
-The image below shows the differences to write admonitions before and after. 
-
-For how to write admonitions, see [Admonitions](https://docusaurus.io/docs/next/markdown-features/admonitions).
-
-![alt_text](assets/syntax-4.png)
-
-### Assets
-
-Add dash `/` before the asset path.
-
-🙌 **Examples**
-
-```
-![Page Linking](/assets/page-linking.png)
-```
-
-### Indentation & space
-
-* Use the same indentation for running texts and code blocks. 
-
-  🙌 **Examples**
-
-  ![alt_text](assets/syntax-5.png)
-
-
-* For the content block after an **ordered list**, indent the content block by only 3 spaces (not 4 spaces).
-  
-* For the content block after an **unordered list**, indent the content block by only 2 spaces. 
-
-  🙌 **Examples**
-
-  ![alt_text](assets/syntax-6.png)
-
-  > 💡 **Tip**
-  >
-  > You can set the **Tab Size** in VS Code settings.
-  > 
-  > ![alt_text](assets/syntax-7.png)
-
-* Insert **only an** empty line (not two empty lines or more) between code blocks and running texts. 
-
-  🙌 **Examples**
-
-  ![alt_text](assets/syntax-8.png)
-
-  ![alt_text](assets/syntax-9.png)
-
-  ![alt_text](assets/syntax-10.png)
-
-### Metadata
-
-If you create a new `.md` file, add quotes for the value of sidebar_label.
-
-🙌 **Examples**
-
-![alt_text](assets/syntax-11.png)
-
-### Tables
-
-To help tables be easier to maintain, consider adding additional spaces to the column widths to make them consistent.
-
-🙌 **Examples**
-
-```
-| App name | Description          | Requirements   |
-|:---------|:---------------------|:---------------|
-| App 1    | Description text 1.  | Requirements 1 |
-| App 2    | Description text 2.  | None           |
-```
-
-To format tables easily, you can install a plugin or extension in your editor as below:
-
-* Visual Studio Code: [Markdown Table Prettifier](https://marketplace.visualstudio.com/items?itemName=darkriszty.markdown-table-prettify)
-  
-* Sublime Text: [Markdown Table Formatter](https://packagecontrol.io/packages/Markdown%20Table%20Formatter)  
-  
-*  Atom: [Markdown Table Formatter](https://atom.io/packages/markdown-table-formatter) 
-
-### Links
-
-Use links instead of summarizing to help preserve a single source of truth in Pulsar documentation.
-
-#### Anchor links
-
-Headings generate anchor links when rendered. 
-
-🙌 **Examples**
-
-`## This is an example` generates the anchor `#this-is-an-example`.
-
-> ❗️ **Note**
->
-> * Avoid crosslinking docs to headings unless you need to link to a specific section of the document. This avoids breaking anchors in the future in case the heading is changed.
->
-> * If possible, avoid changing headings, because they’re not only linked internally. There are various links to Pulsar documentation on the internet, such as tutorials, presentations, StackOverflow posts, and other sources.
-
-#### Links to internal documentation
-
-Internal refers to documentation in the same Pulsar project. 
-
-General rules:
-
-* Use relative links rather than absolute URLs.
-  
-* Don’t prepend ./ or ../../ to links to files or directories.
-
-🙌 **Examples**
-
-Scenario| ✅| ❌
-|---|---|---
-Crosslink to other markdown file 

     (/path/xx/ is not needed)|`[Function overview](function-overview.md)`|- `[Function overview](functions-overview)` 

     - `[Function overview](https://pulsar.apache.org/docs/next/functions-overview/)` 

     - `[Function overview](../../function-overview.md)`
-Crosslink to other chapters in the same markdown file 

     (# and - are needed)|`[Install builtin connectors (optional)](#install-builtin-connectors-optional)`|N/A
-
-#### Links to external documentation
-
-When describing interactions with external software, it’s often helpful to include links to external documentation. When possible, make sure that you’re linking to an [authoritative source](#authoritative-sources). 
-
-For example, if you’re describing a feature in Microsoft’s Active Directory, include a link to official Microsoft documentation.
-
-#### Link to a specific line of code
-
-Use a **permalink **when linking to a specific line in a file to ensure users land on the line you’re referring to though lines of code change over time. 
-
-![alt_text](assets/syntax-12.png)
-
-### Authoritative sources
-
-When citing external information, use sources that are written by the people who created the item or product in question. These sources are the most likely to be accurate and remain up to date.
-
-🙌 **Examples**
-
-- Authoritative sources include the following ✅ 
-
-  * Official documentation for a product. 
-
-      For example, if you’re setting up an interface with the Google OAuth 2 authorization server, include a link to Google’s documentation.
-
-  * Official documentation for a project. 
-
-      For example, if you’re citing NodeJS functionality, refer directly to [NodeJS documentation](https://nodejs.org/en/docs/).
-
-  * Books from an authoritative publisher.
-
-- Authoritative sources do not include the following ❌ 
-
-  * Personal blog posts.
-    
-  * Documentation from a company that describes another company’s product.
-    
-  * Non-trustworthy articles.
-    
-  * Discussions on forums such as Stack Overflow.
-
-While many of these sources to avoid can help you learn skills and or features, they can become obsolete quickly. Nobody is obliged to maintain any of these sites. Therefore, we should avoid using them as reference literature.
-
-Non-authoritative sources are acceptable only if there is no equivalent authoritative source. Even then, focus on non-authoritative sources that are extensively cited or peer-reviewed.
-
-### Escape
-
-Use the following characters to escape special characters.
-
-🙌 **Examples**
-
-✅ | ❌
-|---|---
-`List` 

    This error shows up ![alt_text](assets/syntax-13.png)|List``

    Here is an [example PR](https://github.com/apache/pulsar/pull/15389/files#diff-472b2cb6fc28a0845d2f1d397dc4e6e7fa083dfe4f91d6f9dca88ad01d06a971).
-
-
-### Headings
-
-* Each documentation page begins with a **level 2** heading (##). This becomes the h1 element when the page is rendered to HTML. 
-  
-* Do not skip a level. For example: ## > ####.
-  
-* Leave one blank line before and after the heading.
-  
-* Do not use links as part of heading text.
-  
-* When you change the heading text, the anchor link changes. To avoid broken links:
-  
-    * Do not use step numbers in headings.
-  
-    * When possible, do not use words that might change in the future.
-
-## References
-
-For more guides on how to make contributions to Pulsar docs, see [Pulsar Documentation Contribution Overview](./../README.md).
\ No newline at end of file
diff --git a/site2/docs/about.md b/site2/docs/about.md
index f198373497800..6ef50e75471e2 100644
--- a/site2/docs/about.md
+++ b/site2/docs/about.md
@@ -27,10 +27,10 @@ Select one of the content blocks below to begin your Pulsar journey. If you ...
 
     
     
-    
+    
     
-    
-    
+    
+    
 
 
 ## Navigation
@@ -55,7 +55,7 @@ You’ll notice an Edit button at the bottom and top of each page. Click it to o
 
 :::tip
 
-For how to make contributions to documentation, see [Pulsar Documentation Contribution Guide](https://docs.google.com/document/d/11DTnNPpvcPrebLkMAFcDEIFlD8ARD-k6F-LXoIwdD9Y/edit#).
+For how to make contributions to documentation, see [Pulsar Documentation Contribution Guide](https://github.com/apache/pulsar/blob/master/site2/README.md).
 
 :::
 
diff --git a/site2/docs/admin-api-brokers.md b/site2/docs/admin-api-brokers.md
index 9d20b06a5c566..11253175f11ac 100644
--- a/site2/docs/admin-api-brokers.md
+++ b/site2/docs/admin-api-brokers.md
@@ -51,7 +51,12 @@ Fetch all available active brokers that are serving traffic with cluster name.
 
 ```shell
 pulsar-admin brokers list use
-broker1.use.org.com:8080
+```
+
+Example output:
+
+```
+localhost:8080
 ```
 
 
@@ -83,7 +88,14 @@ Fetch the information of the leader broker, for example, the service url.
 
 ```shell
 pulsar-admin brokers leader-broker
-BrokerInfo(serviceUrl=broker1.use.org.com:8080)
+```
+
+Example output:
+
+```json
+{
+  "serviceUrl" : "http://localhost:8080"
+}
 ```
 
 
@@ -117,15 +129,20 @@ It finds all namespaces which are owned and served by a given broker.
 
 ```shell
 pulsar-admin brokers namespaces use \
---url broker1.use.org.com:8080
+    --url localhost:8080
+```
 
-{
-  "my-property/use/my-ns/0x00000000_0xffffffff": {
-    "broker_assignment": "shared",
-    "is_controlled": false,
-    "is_active": true
-  }
-}
+Example output:
+
+```
+public/default/0x00000000_0x40000000    [broker_assignment=shared is_controlled=false is_active=true]
+public/default/0xc0000000_0xffffffff    [broker_assignment=shared is_controlled=false is_active=true]
+public/functions/0x40000000_0x80000000    [broker_assignment=shared is_controlled=false is_active=true]
+public/functions/0x00000000_0x40000000    [broker_assignment=shared is_controlled=false is_active=true]
+pulsar/standalone/localhost:8080/0x00000000_0xffffffff    [broker_assignment=shared is_controlled=false is_active=true]
+pulsar/localhost:8080/0x00000000_0xffffffff    [broker_assignment=shared is_controlled=false is_active=true]
+public/functions/0x80000000_0xc0000000    [broker_assignment=shared is_controlled=false is_active=true]
+public/default/0x80000000_0xc0000000    [broker_assignment=shared is_controlled=false is_active=true]
 ```
 
 
@@ -147,7 +164,7 @@ admin.brokers().getOwnedNamespaces(cluster,brokerUrl);
 
 ### Dynamic broker configuration
 
-One way to configure a Pulsar [broker](reference-terminology.md#broker) is to supply a [configuration](reference-configuration.md#broker) when the broker is [started up](reference-cli-tools.md#pulsar-broker).
+One way to configure a Pulsar [broker](reference-terminology.md#broker) is to supply a [configuration](reference-configuration.md#broker) when the broker is [started up](reference-cli-tools.md).
 
 But since all broker configuration in Pulsar is stored in ZooKeeper, configuration values can also be dynamically updated *while the broker is running*. When you update broker configuration dynamically, ZooKeeper will notify the broker of the change and the broker will then override any existing configuration values.
 
@@ -197,7 +214,19 @@ Fetch a list of all potentially updatable configuration parameters.
 
 ```shell
 pulsar-admin brokers list-dynamic-config
-brokerShutdownTimeoutMs
+```
+
+Example output:
+
+```
+forceDeleteNamespaceAllowed
+loadBalancerMemoryResourceWeight
+allowAutoTopicCreation
+brokerDeleteInactivePartitionedTopicMetadataEnabled
+managedLedgerInactiveLedgerRolloverTimeSeconds
+loadBalancerNamespaceBundleMaxMsgRate
+resourceUsageTransportPublishIntervalInSecs
+# omit...
 ```
 
 
@@ -229,7 +258,11 @@ Fetch a list of all parameters that have been dynamically updated.
 
 ```shell
 pulsar-admin brokers get-all-dynamic-config
-brokerShutdownTimeoutMs:100
+```
+Example output:
+
+```
+brokerShutdownTimeoutMs    100
 ```
 
 
diff --git a/site2/docs/admin-api-clusters.md b/site2/docs/admin-api-clusters.md
index 97faab5f20c25..ee1887baa2c28 100644
--- a/site2/docs/admin-api-clusters.md
+++ b/site2/docs/admin-api-clusters.md
@@ -53,8 +53,8 @@ You can provision a new cluster using the [`create`](/tools/pulsar-admin/) subco
 
 ```shell
 pulsar-admin clusters create cluster-1 \
---url http://my-cluster.org.com:8080 \
---broker-url pulsar://my-cluster.org.com:6650
+    --url http://my-cluster.org.com:8080 \
+    --broker-url pulsar://my-cluster.org.com:6650
 ```
 
 
@@ -96,8 +96,8 @@ You must initialize cluster metadata *before* starting up any [brokers](admin-ap
 >
 > Unlike most other admin functions in Pulsar, cluster metadata initialization cannot be performed via the admin REST API
 > or the admin Java client, as metadata initialization involves communicating with ZooKeeper directly.
-> Instead, you can use the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool, in particular
-> the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command.
+> Instead, you can use the [`pulsar`](reference-cli-tools.md) CLI tool, in particular
+> the [`initialize-cluster-metadata`](reference-cli-tools.md) command.
 
 Here's an example cluster metadata initialization command:
 
@@ -128,6 +128,10 @@ Use the [`get`](/tools/pulsar-admin/) subcommand and specify the name of the clu
 
 ```shell
 pulsar-admin clusters get cluster-1
+```
+Output:
+
+```json
 {
     "serviceUrl": "http://my-cluster.org.com:8080/",
     "serviceUrlTls": null,
@@ -168,8 +172,8 @@ Use the [`update`](/tools/pulsar-admin/) subcommand and specify new configuratio
 
 ```shell
 pulsar-admin clusters update cluster-1 \
---url http://my-cluster.org.com:4081 \
---broker-url pulsar://my-cluster.org.com:3350
+    --url http://my-cluster.org.com:4081 \
+    --broker-url pulsar://my-cluster.org.com:3350
 ```
 
 
@@ -242,10 +246,14 @@ Use the [`list`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin clusters list
+```
+
+Output:
+
+```
 cluster-1
 cluster-2
 ```
-
 
 
 
@@ -275,7 +283,7 @@ Peer clusters can be configured for a given cluster in a Pulsar [instance](refer
 
 Use the [`update-peer-clusters`](/tools/pulsar-admin/) subcommand and specify the list of peer-cluster names.
 
-```
+```shell
 pulsar-admin update-peer-clusters cluster-1 --peer-clusters cluster-2
 ```
 
diff --git a/site2/docs/admin-api-functions.md b/site2/docs/admin-api-functions.md
index 799fa0c54b603..703265cfade10 100644
--- a/site2/docs/admin-api-functions.md
+++ b/site2/docs/admin-api-functions.md
@@ -56,13 +56,13 @@ Use the [`create`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions create \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---inputs test-input-topic \
---output persistent://public/default/test-output-topic \
---classname org.apache.pulsar.functions.api.examples.ExclamationFunction \
---jar /examples/api-examples.jar
+    --tenant public \
+    --namespace default \
+    --name (the name of Pulsar Functions) \
+    --inputs test-input-topic \
+    --output persistent://public/default/test-output-topic \
+    --classname org.apache.pulsar.functions.api.examples.ExclamationFunction \
+    --jar /examples/api-examples.jar
 ```
 
 
@@ -110,11 +110,11 @@ Use the [`update`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions update \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---output persistent://public/default/update-output-topic \
-# other options
+    --tenant public \
+    --namespace default \
+    --name (the name of Pulsar Functions) \
+    --output persistent://public/default/update-output-topic \
+    # other options
 ```
 
 
@@ -157,10 +157,10 @@ Use the [`start`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions start \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---instance-id 1
+    --tenant public \
+    --namespace default \
+    --name (the name of Pulsar Functions) \
+    --instance-id 1
 ```
 
 
@@ -196,9 +196,9 @@ Use the [`start`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions start \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
+    --tenant public \
+    --namespace default \
+    --name (the name of Pulsar Functions) \
 ```
 
 
@@ -234,10 +234,10 @@ Use the [`stop`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions stop \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---instance-id 1
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--instance-id 1
 ```
 
 
@@ -273,9 +273,9 @@ Use the [`stop`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions stop \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions)
 ```
 
 
@@ -311,11 +311,10 @@ Use the [`restart`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions restart \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---instance-id 1
-
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--instance-id 1
 ```
 
 
@@ -351,9 +350,9 @@ Use the [`restart`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions restart \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions)
 ```
 
 
@@ -389,8 +388,8 @@ Use the [`list`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions list \
---tenant public \
---namespace default
+	--tenant public \
+	--namespace default
 ```
 
 
@@ -426,9 +425,9 @@ Use the [`delete`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions delete \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions)
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions)
 ```
 
 
@@ -464,9 +463,9 @@ Use the [`get`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions get \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions)
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions)
 ```
 
 
@@ -501,10 +500,10 @@ Use the [`status`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions status \
-  --tenant public \
-  --namespace default \
-  --name (the name of Pulsar Functions) \
-  --instance-id 1
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--instance-id 1
 ```
 
 
@@ -540,9 +539,9 @@ Use the [`status`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions status \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions)
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions)
 ```
 
 
@@ -578,10 +577,10 @@ Use the [`stats`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions stats \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---instance-id 1
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--instance-id 1
 ```
 
 
@@ -617,9 +616,9 @@ Use the [`stats`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions stats \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions)
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions)
 ```
 
 
@@ -655,12 +654,12 @@ Use the [`trigger`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions trigger \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---topic (the name of input topic) \
---trigger-value \"hello pulsar\"
-# or --trigger-file (the path of trigger file)
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--topic (the name of input topic) \
+	--trigger-value \"hello pulsar\"
+	# or --trigger-file (the path of trigger file)
 ```
 
 
@@ -696,10 +695,10 @@ Use the [`putstate`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions putstate \
-  --tenant public \
-  --namespace default \
-  --name (the name of Pulsar Functions) \
-  --state "{\"key\":\"pulsar\", \"stringValue\":\"hello pulsar\"}"
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--state "{\"key\":\"pulsar\", \"stringValue\":\"hello pulsar\"}"
 ```
 
 
@@ -737,10 +736,10 @@ Use the [`querystate`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin functions querystate \
---tenant public \
---namespace default \
---name (the name of Pulsar Functions) \
---key (the key of state)
+	--tenant public \
+	--namespace default \
+	--name (the name of Pulsar Functions) \
+	--key (the key of state)
 ```
 
 
diff --git a/site2/docs/admin-api-namespaces.md b/site2/docs/admin-api-namespaces.md
index 10b24ed115d73..e74117256d036 100644
--- a/site2/docs/admin-api-namespaces.md
+++ b/site2/docs/admin-api-namespaces.md
@@ -79,6 +79,11 @@ Use the [`policies`](/tools/pulsar-admin/) subcommand and specify the namespace:
 
 ```shell
 pulsar-admin namespaces policies test-tenant/test-namespace
+```
+
+Example output:
+
+```json
 {
   "auth_policies": {
     "namespace_auth": {},
@@ -133,8 +138,13 @@ Use the [`list`](/tools/pulsar-admin/) subcommand and specify the tenant:
 
 ```shell
 pulsar-admin namespaces list test-tenant
-test-tenant/ns1
-test-tenant/ns2
+```
+
+Example output:
+
+```
+test-tenant/namespace1
+test-tenant/namespace2
 ```
 
 
@@ -167,7 +177,7 @@ You can delete existing namespaces from a tenant.
 Use the [`delete`](/tools/pulsar-admin/) subcommand and specify the namespace:
 
 ```shell
-pulsar-admin namespaces delete test-tenant/ns1
+pulsar-admin namespaces delete test-tenant/namespace1
 ```
 
 
@@ -200,8 +210,7 @@ You can set replication clusters for a namespace to enable Pulsar to internally
 
 
 ```shell
-pulsar-admin namespaces set-clusters test-tenant/ns1 \
---clusters cl1
+pulsar-admin namespaces set-clusters test-tenant/namespace1 --clusters cl1
 ```
 
 
@@ -232,11 +241,13 @@ You can get the list of replication clusters for a given namespace.
 
 
 ```shell
-pulsar-admin namespaces get-clusters test-tenant/cl1/ns1
+pulsar-admin namespaces get-clusters test-tenant/cluster1/namespace1
 ```
 
-```shell
-cl2
+Example output:
+
+```
+cluster2
 ```
 
 
@@ -277,7 +288,10 @@ Backlog quota restriction can be taken care of by defining the restriction of ba
 
 
 ```shell
-pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --policy producer_request_hold test-tenant/ns1
+pulsar-admin namespaces set-backlog-quota --limit 10G \
+    --limitTime 36000 \
+    --policy producer_request_hold \
+    test-tenant/namespace1
 ```
 
 
@@ -308,16 +322,13 @@ You can get a configured backlog quota for a given namespace.
 
 
 ```shell
-pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
+pulsar-admin namespaces get-backlog-quotas test-tenant/namespace1
 ```
 
-```json
-{
-  "destination_storage": {
-    "limit": 10,
-    "policy": "producer_request_hold"
-  }
-}
+Example output:
+
+```
+destination_storage    BacklogQuotaImpl(limit=10737418240, limitSize=10737418240, limitTime=36000, policy=producer_request_hold)
 ```
 
 
@@ -348,7 +359,7 @@ You can remove backlog quota policies for a given namespace.
 
 
 ```shell
-pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
+pulsar-admin namespaces remove-backlog-quota test-tenant/namespace1
 ```
 
 
@@ -389,7 +400,10 @@ Persistence policies allow users to configure persistency-level for all topic me
 
 
 ```shell
-pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper-ensemble 3 --bookkeeper-write-quorum 2 --ml-mark-delete-max-rate 0 test-tenant/ns1
+pulsar-admin namespaces set-persistence \
+    --bookkeeper-ack-quorum 2 --bookkeeper-ensemble 3 \
+    --bookkeeper-write-quorum 2 --ml-mark-delete-max-rate 0 \
+    test-tenant/namespace1
 ```
 
 
@@ -420,9 +434,11 @@ You can get the configured persistence policies of a given namespace.
 
 
 ```shell
-pulsar-admin namespaces get-persistence test-tenant/ns1
+pulsar-admin namespaces get-persistence test-tenant/namespace1
 ```
 
+Example output:
+
 ```json
 {
   "bookkeeperEnsemble": 3,
@@ -462,7 +478,7 @@ A namespace bundle is a virtual group of topics that belong to the same namespac
 
 
 ```shell
-pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
+pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/namespace1
 ```
 
 
@@ -493,7 +509,7 @@ One namespace bundle can contain multiple topics but can be served by only one b
 
 
 ```shell
-pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenant/ns1
+pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenant/namespace1
 ```
 
 
@@ -526,7 +542,7 @@ You can configure the time to live (in seconds) duration for messages. In the ex
 
 
 ```shell
-pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
+pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/namespace1
 ```
 
 
@@ -557,8 +573,9 @@ When the message-ttl for a namespace is set, you can use the command below to ge
 
 
 ```shell
-pulsar-admin namespaces get-message-ttl test-tenant/ns1
+pulsar-admin namespaces get-message-ttl test-tenant/namespace1
 ```
+Example output:
 
 ```
 100
@@ -596,7 +613,7 @@ Remove a message TTL of the configured namespace.
 
 
 ```shell
-pulsar-admin namespaces remove-message-ttl test-tenant/ns1
+pulsar-admin namespaces remove-message-ttl test-tenant/namespace1
 ```
 
 
@@ -630,7 +647,7 @@ It clears all message backlogs for all the topics that belong to a specific name
 
 
 ```shell
-pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
+pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/namespace1
 ```
 
 
@@ -661,7 +678,10 @@ It clears all message backlogs for all the topics that belong to a specific Name
 
 
 ```shell
-pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub my-subscription test-tenant/ns1
+pulsar-admin namespaces clear-backlog \
+    --bundle 0x00000000_0xffffffff \
+    --sub my-subscription \
+    test-tenant/namespace1
 ```
 
 
@@ -696,7 +716,7 @@ Each namespace contains multiple topics and the retention size (storage size) of
 
 
 ```shell
-pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
+pulsar-admin namespaces set-retention --size 100M --time 10m test-tenant/namespace1
 ```
 
 
@@ -727,7 +747,7 @@ It shows the retention information of a given namespace.
 
 
 ```shell
-pulsar-admin namespaces get-retention test-tenant/ns1
+pulsar-admin namespaces get-retention test-tenant/namespace1
 ```
 
 ```json
@@ -776,10 +796,10 @@ disables the throttling.
 
 
 ```shell
-pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
---msg-dispatch-rate 1000 \
---byte-dispatch-rate 1048576 \
---dispatch-rate-period 1
+pulsar-admin namespaces set-dispatch-rate test-tenant/namespace1 \
+    --msg-dispatch-rate 1000 \
+    --byte-dispatch-rate 1048576 \
+    --dispatch-rate-period 1
 ```
 
 
@@ -810,13 +830,16 @@ It shows the configured message-rate for the namespace (topics under this namesp
 
 
 ```shell
-pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
+pulsar-admin namespaces get-dispatch-rate test-tenant/namespace1
 ```
 
+Example output:
+
 ```json
 {
-  "dispatchThrottlingRatePerTopicInMsg" : 1000,
-  "dispatchThrottlingRatePerTopicInByte" : 1048576,
+  "dispatchThrottlingRateInMsg" : 1000,
+  "dispatchThrottlingRateInByte" : 1048576,
+  "relativeToPublishRate" : false,
   "ratePeriodInSecond" : 1
 }
 ```
@@ -852,10 +875,10 @@ disables the throttling.
 
 
 ```shell
-pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
---msg-dispatch-rate 1000 \
---byte-dispatch-rate 1048576 \
---dispatch-rate-period 1
+pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/namespace1 \
+    --msg-dispatch-rate 1000 \
+    --byte-dispatch-rate 1048576 \
+    --dispatch-rate-period 1
 ```
 
 
@@ -886,13 +909,16 @@ It shows the configured message-rate for the namespace (topics under this namesp
 
 
 ```shell
-pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
+pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/namespace1
 ```
 
+Example output:
+
 ```json
 {
-  "dispatchThrottlingRatePerTopicInMsg" : 1000,
-  "dispatchThrottlingRatePerTopicInByte" : 1048576,
+  "dispatchThrottlingRateInMsg" : 1000,
+  "dispatchThrottlingRateInByte" : 1048576,
+  "relativeToPublishRate" : false,
   "ratePeriodInSecond" : 1
 }
 ```
@@ -927,10 +953,10 @@ It sets the message dispatch rate for all the replicators between replication cl
 
 
 ```shell
-pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
---msg-dispatch-rate 1000 \
---byte-dispatch-rate 1048576 \
---dispatch-rate-period 1
+pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/namespace1 \
+    --msg-dispatch-rate 1000 \
+    --byte-dispatch-rate 1048576 \
+    --dispatch-rate-period 1
 ```
 
 
@@ -961,7 +987,7 @@ It shows the configured message-rate for the namespace (topics under this namesp
 
 
 ```shell
-pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
+pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/namespace1
 ```
 
 ```json
@@ -1002,7 +1028,7 @@ It shows the configured `deduplicationSnapshotInterval` for a namespace (Each to
 
 
 ```shell
-pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
+pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/namespace1
 ```
 
 
@@ -1033,7 +1059,7 @@ Set the configured `deduplicationSnapshotInterval` for a namespace. Each topic u
 
 
 ```shell
-pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --interval 1000
+pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/namespace1 --interval 1000
 ```
 
 
@@ -1064,7 +1090,7 @@ Remove configured `deduplicationSnapshotInterval` of a namespace (Each topic und
 
 
 ```shell
-pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
+pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/namespace1
 ```
 
 
@@ -1135,9 +1161,11 @@ Entry filter helps with filtering message on server side.
 
 
 ```
-
-$ pulsar-admin namespaces set-entry-filters --desc "The description of the entry filter to be used for user help."  
---entry-filters-name "The class name for the entry filter." --entry-filters-dir "The directory for all the entry filter implementations." test-tenant/ns1
+pulsar-admin namespaces set-entry-filters \
+    --desc "The description of the entry filter to be used for user help." \
+    --entry-filters-name "The class name for the entry filter." \
+    --entry-filters-dir "The directory for all the entry filter implementations." \
+    test-tenant/namespace1
 ```
 
 
@@ -1150,9 +1178,7 @@ version=@pulsar:version_number@}
 
 
 ```java
-
 admin.namespaces().setEntryFilters(namespace, new EntryFilters("desc", "classes name", "class files localtion"))
-
 ```
 
 
@@ -1170,10 +1196,8 @@ You can get a configured entry filter for a given namespace.
   values={[{"label":"pulsar-admin","value":"pulsar-admin"},{"label":"REST API","value":"REST API"},{"label":"Java","value":"Java"}]}>
 
 
-```
-
-$ pulsar-admin namespaces get-entry-filters test-tenant/ns1
-
+```shell
+pulsar-admin namespaces get-entry-filters test-tenant/namespace1
 ```
 
 
@@ -1186,9 +1210,7 @@ version=@pulsar:version_number@}
 
 
 ```java
-
 admin.namespaces().getEntryFilters(namespace);
-
 ```
 
 
@@ -1206,10 +1228,8 @@ You can remove entry filters policies for a given namespace.
   values={[{"label":"pulsar-admin","value":"pulsar-admin"},{"label":"REST API","value":"REST API"},{"label":"Java","value":"Java"}]}>
 
 
-```
-
-$ pulsar-admin namespaces remove-entry-filters test-tenant/ns1
-
+```shell
+pulsar-admin namespaces remove-entry-filters test-tenant/namespace1
 ```
 
 
@@ -1222,9 +1242,7 @@ version=@pulsar:version_number@}
 
 
 ```java
-
 admin.namespaces().removeEntryFilters(namespace)
-
 ```
 
 
diff --git a/site2/docs/admin-api-packages.md b/site2/docs/admin-api-packages.md
index 73437f5cdf58f..c55ffcf546bbc 100644
--- a/site2/docs/admin-api-packages.md
+++ b/site2/docs/admin-api-packages.md
@@ -22,7 +22,7 @@ import TabItem from '@theme/TabItem';
 
 :::
 
-Package managers or package-management systems automatically manage packages in a consistent manner. These tools simplify the installation tasks, upgrade process, and deletion operations for users. A package is a minimal unit that a package manager deals with. In Pulsar, packages are organized at the tenant- and namespace-level to manage Pulsar Functions and Pulsar IO connectors (i.e., source and sink).
+Package managers or package-management systems automatically manage packages in a consistent manner. These tools simplify the installation tasks, upgrade process, and deletion operations for users. A package is a minimal unit that a package manager deals with. In Pulsar, packages are organized at the tenant-level and namespace-level to manage Pulsar Functions and Pulsar IO connectors (i.e., source and sink).
 
 ## What is a package?
 
diff --git a/site2/docs/admin-api-permissions.md b/site2/docs/admin-api-permissions.md
index d1b58ef67a0e6..b25d2f1c8fcfa 100644
--- a/site2/docs/admin-api-permissions.md
+++ b/site2/docs/admin-api-permissions.md
@@ -28,7 +28,7 @@ Pulsar allows you to grant namespace-level or topic-level permission to users.
 
 - If you grant topic-level permission to a user, then the user can access only the topic.
 
-The chapters below demonstrate how to grant namespace-level permissions to users. For how to grant topic-level permissions to users, see [manage topics](admin-api-topics.md/#grant-permission).
+The chapters below demonstrate how to grant namespace-level permissions to users. For how to grant topic-level permissions to users, see [manage topics](admin-api-topics.md#grant-permission).
 
 ## Grant permissions
 
@@ -43,9 +43,9 @@ You can grant permissions to specific roles for lists of operations such as `pro
 Use the [`grant-permission`](/tools/pulsar-admin/) subcommand and specify a namespace, actions using the `--actions` flag, and a role using the `--role` flag:
 
 ```shell
-pulsar-admin namespaces grant-permission test-tenant/ns1 \
---actions produce,consume \
---role admin10
+pulsar-admin namespaces grant-permission test-tenant/namespace1 \
+    --actions produce,consume \
+    --role admin10
 ```
 
 Wildcard authorization can be performed when `authorizationAllowWildcardsMatching` is set to `true` in `broker.conf`.
@@ -53,18 +53,17 @@ Wildcard authorization can be performed when `authorizationAllowWildcardsMatchin
 **Example**
 
 ```shell
-pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                      --actions produce,consume \
-                      --role 'my.role.*'
-
+pulsar-admin namespaces grant-permission test-tenant/namespace1 \
+      --actions produce,consume \
+      --role 'my.role.*'
 ```
 
 Then, roles `my.role.1`, `my.role.2`, `my.role.foo`, `my.role.bar`, etc. can produce and consume.  
 
 ```shell
-pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                      --actions produce,consume \
-                      --role '*.role.my'
+pulsar-admin namespaces grant-permission test-tenant/namespace1 \
+      --actions produce,consume \
+      --role '*.role.my'
 ```
 
 Then, roles `1.role.my`, `2.role.my`, `foo.role.my`, `bar.role.my`, etc. can produce and consume.
@@ -78,9 +77,9 @@ A wildcard matching works at **the beginning or end of the role name only**.
 **Example**
 
 ```shell
-pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                      --actions produce,consume \
-                      --role 'my.*.role'
+pulsar-admin namespaces grant-permission test-tenant/namespace1 \
+      --actions produce,consume \
+      --role 'my.*.role'
 ```
 
 In this case, only the role `my.*.role` has permissions.  
@@ -116,13 +115,13 @@ You can see which permissions have been granted to which roles in a namespace.
 Use the [`permissions`](/tools/pulsar-admin/) subcommand and specify a namespace:
 
 ```shell
-pulsar-admin namespaces permissions test-tenant/ns1
-{
-  "admin10": [
-    "produce",
-    "consume"
-  ]
-}
+pulsar-admin namespaces permissions test-tenant/namespace1
+```
+
+Example output:
+
+```
+my.role.*    [produce, consume]
 ```
 
 
@@ -155,8 +154,8 @@ You can revoke permissions from specific roles, which means that those roles wil
 Use the [`revoke-permission`](/tools/pulsar-admin/) subcommand and specify a namespace and a role using the `--role` flag:
 
 ```shell
-pulsar-admin namespaces revoke-permission test-tenant/ns1 \
---role admin10
+pulsar-admin namespaces revoke-permission test-tenant/namespace1 \
+      --role admin10
 ```
 
 
diff --git a/site2/docs/admin-api-schemas.md b/site2/docs/admin-api-schemas.md
index 8399a03b8723f..609135e1a44f7 100644
--- a/site2/docs/admin-api-schemas.md
+++ b/site2/docs/admin-api-schemas.md
@@ -1,6 +1,613 @@
 ---
 id: admin-api-schemas
-title: Managing Schemas
+title: Manage Schemas
 sidebar_label: "Schemas"
 ---
 
+
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
+
+:::tip
+
+This page only shows **some frequently used operations**.
+
+- For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more, see [Pulsar admin doc](/tools/pulsar-admin/)
+
+- For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
+
+- For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](/api/admin/).
+
+:::
+
+## Manage AutoUpdate strategy
+
+### Enable AutoUpdate
+
+To enable `AutoUpdate` on a namespace, you can use the `pulsar-admin` command.
+
+```bash
+bin/pulsar-admin namespaces set-is-allow-auto-update-schema --enable tenant/namespace
+```
+
+### Disable AutoUpdate 
+
+To disable `AutoUpdate` on a namespace, you can use the `pulsar-admin` command.
+
+```bash
+bin/pulsar-admin namespaces set-is-allow-auto-update-schema --disable tenant/namespace
+```
+
+Once the `AutoUpdate` is disabled, you can only register a new schema using the `pulsar-admin` command.
+
+### Adjust compatibility
+
+To adjust the schema compatibility level on a namespace, you can use the `pulsar-admin` command.
+
+```bash
+bin/pulsar-admin namespaces set-schema-compatibility-strategy --compatibility  tenant/namespace
+```
+
+## Schema validation
+
+### Enable schema validation
+
+To enable `schemaValidationEnforced` on a namespace, you can use the `pulsar-admin` command.
+
+```bash
+bin/pulsar-admin namespaces set-schema-validation-enforce --enable tenant/namespace
+```
+
+### Disable schema validation
+
+To disable `schemaValidationEnforced` on a namespace, you can use the `pulsar-admin` command.
+
+```bash
+bin/pulsar-admin namespaces set-schema-validation-enforce --disable tenant/namespace
+```
+
+## Schema manual management
+
+### Upload a schema
+
+To upload (register) a new schema for a topic, you can use one of the following methods.
+
+````mdx-code-block
+
+
+
+
+Use the `upload` subcommand.
+
+```bash
+pulsar-admin schemas upload --filename  
+```
+
+The `schema-definition-file` is in JSON format. 
+
+```json
+{
+    "type": "",
+    "schema": "",
+    "properties": {} // the properties associated with the schema
+}
+```
+
+The `schema-definition-file` includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `type`  |   The schema type. | 
+|  `schema`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a **primitive** schema, this field should be blank. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. | 
+
+Here are examples of the `schema-definition-file` for a JSON schema.
+
+**Example 1**
+
+```json
+{
+    "type": "JSON",
+    "schema": "{\"type\":\"record\",\"name\":\"User\",\"namespace\":\"com.foo\",\"fields\":[{\"name\":\"file1\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"file2\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"file3\",\"type\":[\"string\",\"null\"],\"default\":\"dfdf\"}]}",
+    "properties": {}
+}
+```
+
+**Example 2**
+
+```json
+{
+    "type": "STRING",
+    "schema": "",
+    "properties": {
+        "key1": "value1"
+    }
+}
+```
+
+    
+
+
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
+
+The post payload is in JSON format.
+
+```json
+{
+    "type": "",
+    "schema": "",
+    "properties": {} // the properties associated with the schema
+}
+```
+
+The post payload includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `type`  |   The schema type. | 
+|  `schema`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a **primitive** schema, this field should be blank. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. |
+
+    
+
+
+```java
+void createSchema(String topic, PostSchemaPayload schemaPayload)
+```
+
+The `PostSchemaPayload` includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `type`  |   The schema type. | 
+|  `schema`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a **primitive** schema, this field should be blank. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. | 
+
+Here is an example of `PostSchemaPayload`:
+
+```java
+PulsarAdmin admin = …;
+
+PostSchemaPayload payload = new PostSchemaPayload();
+payload.setType("INT8");
+payload.setSchema("");
+
+admin.createSchema("my-tenant/my-ns/my-topic", payload);
+```
+
+    
+
+    
+````
+
+### Get a schema (latest)
+
+To get the latest schema for a topic, you can use one of the following methods. 
+
+````mdx-code-block
+
+
+
+
+Use the `get` subcommand.
+
+```bash
+pulsar-admin schemas get 
+```
+
+Example output:
+
+```json
+{
+    "version": 0,
+    "type": "String",
+    "timestamp": 0,
+    "data": "string",
+    "properties": {
+        "property1": "string",
+        "property2": "string"
+    }
+}
+```
+
+
+
+
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
+
+Here is an example of a response, which is returned in JSON format.
+
+```json
+{
+    "version": "",
+    "type": "",
+    "timestamp": "",
+    "data": "",
+    "properties": {} // the properties associated with the schema
+}
+```
+
+The response includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `version`  |   The schema version, which is a long number. | 
+|  `type`  |   The schema type. | 
+|  `timestamp`  |   The timestamp of creating this version of schema. | 
+|  `data`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a **primitive** schema, this field should be blank. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. |
+
+    
+
+
+```java
+SchemaInfo createSchema(String topic)
+```
+
+The `SchemaInfo` includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `name`  |   The schema name. | 
+|  `type`  |   The schema type. | 
+|  `schema`  |   A byte array of the schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a **primitive** schema, this byte array should be empty. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition converted to a byte array. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. | 
+
+Here is an example of `SchemaInfo`:
+
+```java
+PulsarAdmin admin = …;
+
+SchemaInfo si = admin.getSchema("my-tenant/my-ns/my-topic");
+```
+
+    
+
+    
+````
+
+### Get a schema (specific)
+
+To get a specific version of a schema, you can use one of the following methods.
+
+````mdx-code-block
+
+
+
+
+Use the `get` subcommand.
+
+```bash
+pulsar-admin schemas get  --version=
+```
+
+
+
+
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
+
+Here is an example of a response, which is returned in JSON format.
+
+```json
+{
+    "version": "",
+    "type": "",
+    "timestamp": "",
+    "data": "",
+    "properties": {} // the properties associated with the schema
+}
+```
+
+The response includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `version`  |   The schema version, which is a long number. | 
+|  `type`  |   The schema type. | 
+|  `timestamp`  |   The timestamp of creating this version of schema. | 
+|  `data`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a **primitive** schema, this field should be blank. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. |
+
+    
+
+
+```java
+SchemaInfo createSchema(String topic, long version)
+```
+
+The `SchemaInfo` includes the following fields:
+
+| Field |  Description | 
+| --- | --- |
+|  `name`  |  The schema name. | 
+|  `type`  |  The schema type. | 
+|  `schema`  |   A byte array of the schema definition data, which is encoded in UTF 8. 
  • If the schema is a **primitive** schema, this byte array should be empty. 
  • If the schema is a **struct** schema, this field should be a JSON string of the Avro schema definition converted to a byte array. 
    •  | 
+|  `properties`  |  The additional properties associated with the schema. | 
+
+Here is an example of `SchemaInfo`:
+
+```java
+PulsarAdmin admin = …;
+
+SchemaInfo si = admin.getSchema("my-tenant/my-ns/my-topic", 1L);
+```
+
+    
+
+    
+````
+
+### Extract a schema
+
+To provide a schema via a topic, you can use the following method.
+
+````mdx-code-block
+
+
+
+
+Use the `extract` subcommand.
+
+```bash
+pulsar-admin schemas extract --classname  --jar  --type 
+```
+
+
+
+
+````
+
+### Delete a schema
+
+To delete a schema for a topic, you can use one of the following methods.
+
+:::note
+
+In any case, the **delete** action deletes **all versions** of a schema registered for a topic.
+
+:::
+
+````mdx-code-block
+
+
+
+
+Use the `delete` subcommand.
+
+```bash
+pulsar-admin schemas delete 
+```
+
+
+
+
+Send a `DELETE` request to a schema endpoint: {@inject: endpoint|DELETE|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/deleteSchema?version=@pulsar:version_number@} 
+
+Here is an example of a response, which is returned in JSON format.
+
+```json
+{
+    "version": "",
+}
+```
+
+The response includes the following field:
+
+Field | Description |
+---|---|
+`version` | The schema version, which is a long number. |
+
+
+
+
+```java
+void deleteSchema(String topic)
+```
+
+Here is an example of deleting a schema.
+
+```java
+PulsarAdmin admin = …;
+
+admin.deleteSchema("my-tenant/my-ns/my-topic");
+```
+
+
+
+
+````
+
+## Set schema compatibility check strategy 
+
+You can set [schema compatibility check strategy](schema-evolution-compatibility.md#schema-compatibility-check-strategy) at the topic, namespace or broker level. 
+
+The schema compatibility check strategy set at different levels has priority: topic level > namespace level > broker level. 
+
+- If you set the strategy at both topic and namespace levels, it uses the topic-level strategy. 
+
+- If you set the strategy at both namespace and broker levels, it uses the namespace-level strategy.
+
+- If you do not set the strategy at any level, it uses the `FULL` strategy. For all available values, see [here](schema-evolution-compatibility.md#schema-compatibility-check-strategy).
+
+
+### Topic level
+
+To set a schema compatibility check strategy at the topic level, use one of the following methods.
+
+````mdx-code-block
+
+
+
+
+Use the [`pulsar-admin topicPolicies set-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
+
+```shell
+pulsar-admin topicPolicies set-schema-compatibility-strategy  
+```
+
+
+
+
+Send a `PUT` request to this endpoint: {@inject: endpoint|PUT|/admin/v2/topics/:tenant/:namespace/:topic|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
+
+
+
+
+```java
+void setSchemaCompatibilityStrategy(String topic, SchemaCompatibilityStrategy strategy)
+```
+
+Here is an example of setting a schema compatibility check strategy at the topic level.
+
+```java
+PulsarAdmin admin = …;
+
+admin.topicPolicies().setSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic", SchemaCompatibilityStrategy.ALWAYS_INCOMPATIBLE);
+```
+
+
+
+
+````
+
+To get the topic-level schema compatibility check strategy, use one of the following methods.
+
+````mdx-code-block
+
+
+
+
+Use the [`pulsar-admin topicPolicies get-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
+
+```shell
+pulsar-admin topicPolicies get-schema-compatibility-strategy 
+```
+
+
+
+
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
+
+
+
+
+```java
+SchemaCompatibilityStrategy getSchemaCompatibilityStrategy(String topic, boolean applied)
+```
+
+Here is an example of getting the topic-level schema compatibility check strategy.
+
+```java
+PulsarAdmin admin = …;
+
+// get the current applied schema compatibility strategy
+admin.topicPolicies().getSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic", true);
+
+// only get the schema compatibility strategy from topic policies
+admin.topicPolicies().getSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic", false);
+```
+
+
+
+
+````
+
+To remove the topic-level schema compatibility check strategy, use one of the following methods.
+
+````mdx-code-block
+
+
+
+
+Use the [`pulsar-admin topicPolicies remove-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
+
+```shell
+pulsar-admin topicPolicies remove-schema-compatibility-strategy 
+```
+
+
+
+
+Send a `DELETE` request to this endpoint: {@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
+
+
+
+
+```java
+void removeSchemaCompatibilityStrategy(String topic)
+```
+
+Here is an example of removing the topic-level schema compatibility check strategy.
+
+```java
+PulsarAdmin admin = …;
+
+admin.removeSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic");
+```
+
+
+
+
+````
+
+### Namespace level
+
+You can set schema compatibility check strategy at namespace level using one of the following methods.
+
+````mdx-code-block
+
+
+
+
+Use the [`pulsar-admin namespaces set-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
+
+```shell
+pulsar-admin namespaces set-schema-compatibility-strategy options
+```
+
+
+
+
+Send a `PUT` request to this endpoint: {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
+
+
+
+
+Use the [`setSchemaCompatibilityStrategy`](/api/admin/) method.
+
+```java
+admin.namespaces().setSchemaCompatibilityStrategy("test", SchemaCompatibilityStrategy.FULL);
+```
+
+
+
+
+````
+
+### Broker level
+
+You can set schema compatibility check strategy at broker level by setting `schemaCompatibilityStrategy` in `conf/broker.conf` or `conf/standalone.conf` file.
+
+```conf
+schemaCompatibilityStrategy=ALWAYS_INCOMPATIBLE
+```
\ No newline at end of file
diff --git a/site2/docs/admin-api-tenants.md b/site2/docs/admin-api-tenants.md
index e6a1b09437eed..49679662f8e5e 100644
--- a/site2/docs/admin-api-tenants.md
+++ b/site2/docs/admin-api-tenants.md
@@ -43,6 +43,11 @@ Use the [`list`](/tools/pulsar-admin/) subcommand.
 
 ```shell
 pulsar-admin tenants list
+```
+
+Output:
+
+```
 my-tenant-1
 my-tenant-2
 ```
@@ -86,12 +91,14 @@ as a comma-separated list. Here are some examples:
 
 ```shell
 pulsar-admin tenants create my-tenant \
---admin-roles role1,role2,role3 \
---allowed-clusters cluster1
+    --admin-roles role1,role2,role3 \
+    --allowed-clusters cluster1
+```
 
+```shell
 pulsar-admin tenants create my-tenant \
--r role1
--c cluster1
+    -r role1 \
+    -c cluster1
 ```
 
     
@@ -125,6 +132,9 @@ Use the [`get`](/tools/pulsar-admin/) subcommand and specify the name of the ten
 
 ```shell
 pulsar-admin tenants get my-tenant
+```
+
+```json
 {
   "adminRoles": [
     "admin1",
@@ -200,7 +210,9 @@ You can update a tenant's configuration.
 Use the [`update`](/tools/pulsar-admin/) subcommand.
 
 ```shell
-pulsar-admin tenants update my-tenant
+pulsar-admin tenants update my-tenant \
+    --admin-roles role1,role2 \
+    --allowed-clusters cluster1,cluster2
 ```
 
     
diff --git a/site2/docs/admin-api-topics.md b/site2/docs/admin-api-topics.md
index bf23ed7f52013..a46d93be310cc 100644
--- a/site2/docs/admin-api-topics.md
+++ b/site2/docs/admin-api-topics.md
@@ -55,8 +55,7 @@ You can get the list of topics under a given namespace in the following ways.
 
 
 ```shell
-pulsar-admin topics list \
-my-tenant/my-namespace
+pulsar-admin topics list my-tenant/my-namespace
 ```
 
 
@@ -89,8 +88,9 @@ You can grant permissions on a client role to perform specific actions on a give
 
 ```shell
 pulsar-admin topics grant-permission \
---actions produce,consume --role application1 \
-persistent://test-tenant/ns1/tp1 \
+    --actions produce,consume \
+    --role application1 \
+    persistent://test-tenant/ns1/tp1
 ```
 
     
@@ -124,15 +124,13 @@ You can fetch permission in the following ways.
 
 
 ```shell
-pulsar-admin topics permissions \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics permissions persistent://test-tenant/ns1/tp1 
+```
 
-{
-    "application1": [
-        "consume",
-        "produce"
-    ]
-}
+Example output:
+
+```
+application1    [consume, produce]
 ```
 
 
@@ -165,15 +163,8 @@ You can revoke permissions granted on a client role in the following ways.
 
 ```shell
 pulsar-admin topics revoke-permission \
---role application1 \
-persistent://test-tenant/ns1/tp1 \
-
-{
-  "application1": [
-    "consume",
-    "produce"
-  ]
-}
+    --role application1 \
+    persistent://test-tenant/ns1/tp1 
 ```
 
     
@@ -206,8 +197,7 @@ You can delete a topic in the following ways. You cannot delete a topic if any a
 
 
 ```shell
-pulsar-admin topics delete \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics delete persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -239,8 +229,7 @@ You can unload a topic in the following ways.
 
 
 ```shell
-pulsar-admin topics unload \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics unload persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -263,209 +252,7 @@ admin.topics().unload(topic);
 
 ### Get stats
 
-You can check the following statistics of a given non-partitioned topic.
-
-  -   **msgRateIn**: The sum of all local and replication publishers' publish rates (msg/s).
-
-  -   **msgThroughputIn**: The sum of all local and replication publishers' publish rates (bytes/s).
-
-  -   **msgRateOut**: The sum of all local and replication consumers' dispatch rates(msg/s).
-
-  -   **msgThroughputOut**: The sum of all local and replication consumers' dispatch rates (bytes/s).
-
-  -   **averageMsgSize**: The average size (in bytes) of messages published within the last interval.
-
-  -   **storageSize**: The sum of the ledgers' storage size for this topic. The space used to store the messages for the topic.
-
-  -   **earliestMsgPublishTimeInBacklogs**: The publish time of the earliest message in the backlog (ms).
-
-  -   **bytesInCounter**: Total bytes published to the topic.
-
-  -   **msgInCounter**: Total messages published to the topic.
-
-  -   **bytesOutCounter**: Total bytes delivered to consumers.
-
-  -   **msgOutCounter**: Total messages delivered to consumers.
-
-  -   **msgChunkPublished**: Topic has chunked message published on it.
-
-  -   **backlogSize**: Estimated total unconsumed or backlog size (in bytes).
-
-  -   **offloadedStorageSize**: Space that is used to store the offloaded messages for the topic (in bytes).
-  
-  -   **waitingPublishers**: The number of publishers waiting in a queue in exclusive access mode.
-  
-  -   **deduplicationStatus**: The status of message deduplication for the topic.
-  
-  -   **topicEpoch**: The topic epoch or empty if not set.
-
-  -   **filteredEntriesCount**: The count of skipped entries for the topic.
-
-  -   **nonContiguousDeletedMessagesRanges**: The number of non-contiguous deleted messages ranges.
-
-  -   **nonContiguousDeletedMessagesRangesSerializedSize**: The serialized size of non-contiguous deleted messages ranges.  
-
-  -   **ownerBroker**: The broker that owns this topic.
-
-  -   **publishers**: The list of all local publishers on the topic. The list ranges from zero to thousands.
-
-      -   **accessMode**: The type of access to the topic that the producer requires.
-
-      -   **msgRateIn**: The total rate of messages (msg/s) published by this publisher.
-
-      -   **msgThroughputIn**: The total throughput (bytes/s) of the messages published by this publisher.
-
-      -   **averageMsgSize**: The average message size in bytes from this publisher within the last interval.
-
-      -   **chunkedMessageRate**: The total rate of chunked messages published by this publisher.
-
-      -   **producerId**: The internal identifier for this producer on this topic.
-
-      -   **producerName**: The internal identifier for this producer, generated by the client library.
-
-      -   **address**: The IP address and source port for the connection of this producer.
-
-      -   **connectedSince**: The timestamp when this producer is created or reconnected last time.
-
-      -   **clientVersion**: The client library version of this producer.
-
-      -   **metadata**: Metadata (key/value strings) associated with this publisher.
-
-  -   **subscriptions**: The list of all local subscriptions to the topic.
-
-      -   **my-subscription**: The name of this subscription. It is defined by the client.
-
-          -   **msgRateOut**: The total rate of messages (msg/s) delivered on this subscription.
-
-          -   **msgThroughputOut**: The total throughput (bytes/s) delivered on this subscription.
-
-          -   **msgBacklog**: The number of messages in the subscription backlog.
-
-          -   **type**: The subscription type.
-
-          -   **msgRateExpired**: The rate at which messages were discarded instead of dispatched from this subscription due to TTL.
-          
-          -   **lastExpireTimestamp**: The timestamp of the last message expire execution.
-          
-          -   **lastConsumedFlowTimestamp**: The timestamp of the last flow command received.
-
-          -   **lastConsumedTimestamp**: The latest timestamp of all the consumed timestamps of the consumers.
-          
-          -   **lastAckedTimestamp**: The latest timestamp of all the acknowledged timestamps of the consumers.
-
-          -   **bytesOutCounter**: Total bytes delivered to a consumer.
-
-          -   **msgOutCounter**: Total messages delivered to a consumer.
-
-          -   **msgRateRedeliver**: Total rate of messages redelivered on this subscription (msg/s).
-
-          -   **chunkedMessageRate**: Chunked message dispatch rate.
-
-          -   **backlogSize**: Size of backlog for this subscription (in bytes).
-          
-          -   **earliestMsgPublishTimeInBacklog**: The publish time of the earliest message in the backlog for the subscription (ms).
-
-          -   **msgBacklogNoDelayed**: Number of messages in the subscription backlog that do not contain the delay messages.
-
-          -   **blockedSubscriptionOnUnackedMsgs**: Flag to verify if a subscription is blocked due to reaching the threshold of unacked messages.
-
-          -   **msgDelayed**: Number of delayed messages currently being tracked.
-
-          -   **unackedMessages**: Number of unacknowledged messages for the subscription, where an unacknowledged message is one that has been sent to a consumer but not yet acknowledged. This field is only meaningful when using a subscription that tracks individual message acknowledgment.
-
-          -   **activeConsumerName**: The name of the consumer that is active for single active consumer subscriptions. For example, failover or exclusive. 
-
-          -   **totalMsgExpired**: Total messages expired on this subscription. 
-
-          -   **lastMarkDeleteAdvancedTimestamp**: Last MarkDelete position advanced timestamp.
-
-          -   **durable**: Whether the subscription is durable or ephemeral (for example, from a reader).
-
-          -   **replicated**: Mark that the subscription state is kept in sync across different regions.
-
-          -   **allowOutOfOrderDelivery**: Whether out-of-order delivery is allowed on the Key_Shared subscription.
-
-          -   **keySharedMode**: Whether the Key_Shared subscription mode is AUTO_SPLIT or STICKY.
-
-          -   **consumersAfterMarkDeletePosition**: This is for Key_Shared subscription to get the recentJoinedConsumers in the Key_Shared subscription.
-
-          -   **nonContiguousDeletedMessagesRanges**: The number of non-contiguous deleted messages ranges.
-
-          -   **nonContiguousDeletedMessagesRangesSerializedSize**: The serialized size of non-contiguous deleted messages ranges.
-              
-          -   **filterProcessedMsgCount**: The number of messages processed by `EntryFilter`.
-              
-          -   **filterAcceptedMsgCount**: The number of messages accepted by `EntryFilter`.
-              
-          -   **filterRejectedMsgCount**: The number of messages rejected by `EntryFilter`.
-              
-          -   **filterRescheduledMsgCount**: The number of messages rescheduled by `EntryFilter`.
-
-          -   **consumers**: The list of connected consumers for this subscription.
-
-                -   **msgRateOut**: The total rate of messages (msg/s) delivered to the consumer.
-
-                -   **msgThroughputOut**: The total throughput (bytes/s) delivered to the consumer.
-
-                -   **consumerName**: The internal identifier for this consumer, generated by the client library.
-
-                -   **availablePermits**: The number of messages that the consumer has space for in the client library's listening queue. `0` means the client library's queue is full and `receive()` isn't being called. A non-zero value means this consumer is ready for dispatched messages.
-
-                -   **unackedMessages**: The number of unacknowledged messages for the consumer, where an unacknowledged message has been sent to the consumer but not yet acknowledged. This field is only meaningful when using a subscription that tracks individual message acknowledgment.
-
-                -   **blockedConsumerOnUnackedMsgs**: The flag used to verify if the consumer is blocked due to reaching the threshold of the unacknowledged messages.
-                
-                -   **lastConsumedTimestamp**: The timestamp when the consumer reads a message the last time.
-
-                -   **lastAckedTimestamp**: The timestamp when the consumer acknowledges a message the last time.
-
-                -   **address**: The IP address and source port for the connection of this consumer.
-
-                -   **connectedSince**: The timestamp when this consumer is created or reconnected last time.
-
-                -   **clientVersion**: The client library version of this consumer.
-
-                -   **bytesOutCounter**: Total bytes delivered to a consumer.
-
-                -   **msgOutCounter**: Total messages delivered to a consumer.
-
-                -   **msgRateRedeliver**: Total rate of messages redelivered by this consumer (msg/s).
-
-                -   **chunkedMessageRate**: The total rate of chunked messages delivered to this consumer.
-
-                -   **avgMessagesPerEntry**: Number of average messages per entry for the consumer consumed.
-
-                -   **readPositionWhenJoining**: The read position of the cursor when the consumer joins.
-
-                -   **keyHashRanges**: Hash ranges assigned to this consumer if is Key_Shared sub mode.
-
-                -   **metadata**: Metadata (key/value strings) associated with this consumer.
-
-  -   **replication**: This section gives the stats for cross-colo replication of this topic
-
-      -   **msgRateIn**: The total rate (msg/s) of messages received from the remote cluster. 
-
-      -   **msgThroughputIn**: The total throughput (bytes/s) received from the remote cluster.
-
-      -   **msgRateOut**: The total rate of messages (msg/s) delivered to the replication-subscriber.
-
-      -   **msgThroughputOut**: The total throughput (bytes/s) delivered to the replication-subscriber.
-
-      -   **msgRateExpired**: The total rate of messages (msg/s) expired.
-
-      -   **replicationBacklog**: The number of messages pending to be replicated to remote cluster.
-
-      -   **connected**: Whether the outbound replicator is connected.
-
-      -   **replicationDelayInSeconds**: How long the oldest message has been waiting to be sent through the connection, if connected is `true`.
-
-      -   **inboundConnection**: The IP and port of the broker in the remote cluster's publisher connection to this broker.
-
-      -   **inboundConnectedSince**: The TCP connection being used to publish messages to the remote cluster. If there are no local publishers connected, this connection is automatically closed after a minute.
-
-      -   **outboundConnection**: The address of the outbound replication connection.
-
-      -   **outboundConnectedSince**: The timestamp of establishing an outbound connection.
+For the detailed statistics of a topic, see [Pulsar statistics](administration-stats.md#topic-stats).
 
 The following is an example of a topic status.
 
@@ -572,8 +359,7 @@ To get the status of a topic, you can use the following ways.
 
 
 ```shell
-pulsar-admin topics stats \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics stats persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -596,87 +382,9 @@ admin.topics().getStats(topic);
 
 ### Get internal stats
 
-You can get the detailed statistics of a topic.
-
-  -   **entriesAddedCounter**: Messages published since this broker loaded this topic.
-
-  -   **numberOfEntries**: The total number of messages being tracked.
-
-  -   **totalSize**: The total storage size in bytes of all messages.
-
-  -   **currentLedgerEntries**: The count of messages written to the ledger that is currently open for writing.
-
-  -   **currentLedgerSize**: The size in bytes of messages written to the ledger that is currently open for writing.
-
-  -   **lastLedgerCreatedTimestamp**: The time when the last ledger is created.
-
-  -   **lastLedgerCreationFailureTimestamp:** The time when the last ledger failed.
-
-  -   **waitingCursorsCount**: The number of cursors that are "caught up" and waiting for a new message to be published.
-
-  -   **pendingAddEntriesCount**: The number of messages that complete (asynchronous) write requests.
-
-  -   **lastConfirmedEntry**: The `ledgerid:entryid` of the last message that is written successfully. If the `entryid` is `-1`, then the ledger is open, yet no entries are written.
-
-  -   **state**: The state of this ledger for writing. The state `LedgerOpened` means that a ledger is open for saving published messages.
-
-  -   **ledgers**: The ordered list of all ledgers for this topic holding messages.
-
-      -   **ledgerId**: The ID of this ledger.
-
-      -   **entries**: The total number of entries that belong to this ledger.
-
-      -   **size**: The size of messages written to this ledger (in bytes).
-
-      -   **offloaded**: Whether this ledger is offloaded.
-      
-      -   **metadata**: The ledger metadata.
+For the detailed internal statistics inside a topic, see [Pulsar statistics](administration-stats.md#topic-internal-stats).
 
-  -   **schemaLedgers**: The ordered list of all ledgers for this topic schema.
-  
-      -   **ledgerId**: The ID of this ledger.
-  
-      -   **entries**: The total number of entries that belong to this ledger.
-  
-      -   **size**: The size of messages written to this ledger (in bytes).
-  
-      -   **offloaded**: Whether this ledger is offloaded.
-      
-      -   **metadata**: The ledger metadata.
-
-  -   **compactedLedger**: The ledgers holding un-acked messages after topic compaction.
- 
-      -   **ledgerId**: The ID of this ledger.
-     
-      -   **entries**: The total number of entries that belong to this ledger.
-     
-      -   **size**: The size of messages written to this ledger (in bytes).
-     
-      -   **offloaded**: Whether this ledger is offloaded. The value is `false` for the compacted topic ledger.
-      
-  -   **cursors**: The list of all cursors on this topic. Each subscription in the topic stats has a cursor.
-
-      -   **markDeletePosition**: All messages before the markDeletePosition are acknowledged by the subscriber.
-
-      -   **readPosition**: The latest position of subscriber for reading messages.
-
-      -   **waitingReadOp**: This is true when the subscription has read the latest message published to the topic and is waiting for new messages to be published.
-
-      -   **pendingReadOps**: The counter for how many outstanding read requests to the BookKeepers in progress.
-
-      -   **messagesConsumedCounter**: The number of messages this cursor has acknowledged since this broker loaded this topic.
-
-      -   **cursorLedger**: The ledger being used to persistently store the current markDeletePosition.
-
-      -   **cursorLedgerLastEntry**: The last `entryid` used to persistently store the current markDeletePosition.
-
-      -   **individuallyDeletedMessages**: If acknowledges are being done out of order, the ranges of messages acknowledged between the markDeletePosition and the read-position shows.
-
-      -   **lastLedgerSwitchTimestamp**: The last time the cursor ledger is rolled over.
-
-      -   **state**: The state of the cursor ledger: `Open` means you have a cursor ledger for saving updates of the markDeletePosition.
-
-The following is an example of the detailed statistics of a topic.
+The following is an example of the internal statistics of a topic.
 
 ```json
 {
@@ -747,8 +455,7 @@ To get the internal status of a topic, you can use the following ways.
 
 
 ```shell
-pulsar-admin topics stats-internal \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics stats-internal persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -781,12 +488,21 @@ You can peek a number of messages for a specific subscription of a given topic i
 
 ```shell
 pulsar-admin topics peek-messages \
---count 10 --subscription my-subscription \
-persistent://test-tenant/ns1/tp1 \
+    --count 10 --subscription my-subscription \
+    persistent://test-tenant/ns1/tp1
+```
 
-Message ID: 315674752:0
-Properties:  {  "X-Pulsar-publish-time" : "2015-07-13 17:40:28.451"  }
-msg-payload
+Example output:
+
+```
+Message ID: 77:2
+Publish time: 1668674963028
+Event time: 0
+         +-------------------------------------------------+
+         |  0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f |
++--------+-------------------------------------------------+----------------+
+|00000000| 68 65 6c 6c 6f 2d 31                            |hello-1         |
++--------+-------------------------------------------------+----------------+
 ```
 
 
@@ -820,9 +536,8 @@ You can fetch the message with the given ledger ID and entry ID in the following
 
 
 ```shell
-./bin/pulsar-admin topics get-message-by-id \
-persistent://public/default/my-topic \
--l 10 -e 0
+pulsar-admin topics get-message-by-id \
+    -l 10 -e 0 persistent://public/default/my-topic
 ```
 
 
@@ -856,9 +571,8 @@ You can examine a specific message on a topic by position relative to the earlie
 
 
 ```shell
-./bin/pulsar-admin topics examine-messages \
-persistent://public/default/my-topic \
--i latest -m 1
+pulsar-admin topics examine-messages \
+    -i latest -m 1 persistent://public/default/my-topic
 ```
 
 
@@ -890,9 +604,9 @@ You can get message ID published at or just after the given datetime.
 
 
 ```shell
-./bin/pulsar-admin topics get-message-id \
-persistent://public/default/my-topic \
--d 2021-06-28T19:01:17Z
+pulsar-admin topics get-message-id \
+    persistent://public/default/my-topic \
+    -d 2021-06-28T19:01:17Z
 ```
 
 
@@ -927,8 +641,8 @@ You can skip a number of messages for a specific subscription of a given topic i
 
 ```shell
 pulsar-admin topics skip \
---count 10 --subscription my-subscription \
-persistent://test-tenant/ns1/tp1 \
+    --count 10 --subscription my-subscription \
+    persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -962,9 +676,9 @@ You can skip all the old messages for a specific subscription of a given topic.
 
 
 ```shell
-pulsar-admin topics skip-all \
---subscription my-subscription \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics clear-backlog \
+    --subscription my-subscription \
+    persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -998,8 +712,8 @@ You can reset a subscription cursor position back to the position which is recor
 
 ```shell
 pulsar-admin topics reset-cursor \
---subscription my-subscription --time 10 \
-persistent://test-tenant/ns1/tp1 \
+    --subscription my-subscription --time 10 \
+    persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -1035,9 +749,12 @@ You can locate the owner broker of the given topic in the following ways.
 
 
 ```shell
-pulsar-admin topics lookup \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics lookup persistent://test-tenant/ns1/tp1
+```
+
+Example output:
 
+```
 "pulsar://broker1.org.com:4480"
 ```
 
@@ -1051,7 +768,7 @@ persistent://test-tenant/ns1/tp1 \
 
 ```java
 String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.lookup().lookupDestination(topic);
+admin.lookups().lookupDestination(topic);
 ```
 
 
@@ -1070,30 +787,37 @@ You can locate the owner broker of the given partitioned topic in the following
 
 
 ```shell
-pulsar-admin topics partitioned-lookup \
-persistent://test-tenant/ns1/my-topic \
+pulsar-admin topics partitioned-lookup persistent://test-tenant/ns1/my-topic
+```
 
+Example output:
+
+```
 "persistent://test-tenant/ns1/my-topic-partition-0   pulsar://localhost:6650"
 "persistent://test-tenant/ns1/my-topic-partition-1   pulsar://localhost:6650"
 "persistent://test-tenant/ns1/my-topic-partition-2   pulsar://localhost:6650"
 "persistent://test-tenant/ns1/my-topic-partition-3   pulsar://localhost:6650"
 ```
 
-
-
-
-```java
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.lookup().lookupPartitionedTopic(topic);
-```
-
 Lookup the partitioned topics sorted by broker URL
 
 ```shell
 pulsar-admin topics partitioned-lookup \
-persistent://test-tenant/ns1/my-topic --sort-by-broker \
+    persistent://test-tenant/ns1/my-topic --sort-by-broker
+```
+
+Example output:
+
+```
+pulsar://localhost:6650   [persistent://test-tenant/ns1/my-topic-partition-0, persistent://test-tenant/ns1/my-topic-partition-1, persistent://test-tenant/ns1/my-topic-partition-2, persistent://test-tenant/ns1/my-topic-partition-3]
+```
+
+
+
 
-"pulsar://localhost:6650   [persistent://test-tenant/ns1/my-topic-partition-0, persistent://test-tenant/ns1/my-topic-partition-1, persistent://test-tenant/ns1/my-topic-partition-2, persistent://test-tenant/ns1/my-topic-partition-3]"
+```java
+String topic = "persistent://my-tenant/my-namespace/my-topic";
+admin.lookups().lookupPartitionedTopic(topic);
 ```
 
 
@@ -1112,9 +836,12 @@ You can get the range of the bundle that the given topic belongs to in the follo
 
 
 ```shell
-pulsar-admin topics bundle-range \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics bundle-range persistent://test-tenant/ns1/tp1
+```
+
+Example output:
 
+```
 "0x00000000_0xffffffff"
 ```
 
@@ -1128,7 +855,7 @@ persistent://test-tenant/ns1/tp1 \
 
 ```java
 String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.lookup().getBundleRange(topic);
+admin.lookups().getBundleRange(topic);
 ```
 
 
@@ -1147,9 +874,12 @@ You can check all subscription names for a given topic in the following ways.
 
 
 ```shell
-pulsar-admin topics subscriptions \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics subscriptions persistent://test-tenant/ns1/tp1
+```
+
+Example output:
 
+```
 my-subscription
 ```
 
@@ -1185,6 +915,16 @@ You can get the last committed message ID for a persistent topic. It is availabl
 pulsar-admin topics last-message-id topic-name
 ```
 
+Example output:
+
+```json
+{
+  "ledgerId" : 97,
+  "entryId" : 9,
+  "partitionIndex" : -1
+}
+```
+
 
 
 
@@ -1216,7 +956,7 @@ You can get the backlog size of a single partition topic or a non-partitioned to
 ```shell
 pulsar-admin topics get-backlog-size \
   -m 1:1 \
-  persistent://test-tenant/ns1/tp1-partition-0 \
+  persistent://test-tenant/ns1/tp1-partition-0
 ```
 
 
@@ -1252,7 +992,7 @@ To get the topic-level deduplication snapshot interval, use one of the following
 
 
 ```shell
-pulsar-admin topics get-deduplication-snapshot-interval options
+pulsar-admin topics get-deduplication-snapshot-interval my-topic
 ```
 
 
@@ -1285,7 +1025,7 @@ To set the topic-level deduplication snapshot interval, use one of the following
 
 
 ```shell
-pulsar-admin topics set-deduplication-snapshot-interval options
+pulsar-admin topics set-deduplication-snapshot-interval my-topic -i 1000
 ```
 
 
@@ -1322,7 +1062,7 @@ To remove the topic-level deduplication snapshot interval, use one of the follow
 
 
 ```shell
-pulsar-admin topics remove-deduplication-snapshot-interval options
+pulsar-admin topics remove-deduplication-snapshot-interval my-topic
 ```
 
 
@@ -1356,7 +1096,7 @@ To get the topic-level inactive topic policies, use one of the following methods
 
 
 ```shell
-pulsar-admin topics get-inactive-topic-policies options
+pulsar-admin topics get-inactive-topic-policies my-topic
 ```
 
 
@@ -1387,7 +1127,7 @@ To set the topic-level inactive topic policies, use one of the following methods
 
 
 ```shell
-pulsar-admin topics set-inactive-topic-policies options
+pulsar-admin topics set-inactive-topic-policies my-topic
 ```
 
 
@@ -1418,7 +1158,7 @@ To remove the topic-level inactive topic policies, use one of the following meth
 
 
 ```shell
-pulsar-admin topics remove-inactive-topic-policies options
+pulsar-admin topics remove-inactive-topic-policies my-topic
 ```
 
 
@@ -1452,7 +1192,7 @@ To get the topic-level offload policies, use one of the following methods.
 
 
 ```shell
-pulsar-admin topics get-offload-policies options
+pulsar-admin topics get-offload-policies my-topic
 ```
 
 
@@ -1483,7 +1223,7 @@ To set the topic-level offload policies, use one of the following methods.
 
 
 ```shell
-pulsar-admin topics set-offload-policies options
+pulsar-admin topics set-offload-policies my-topic
 ```
 
 
@@ -1514,7 +1254,7 @@ To remove the topic-level offload policies, use one of the following methods.
 
 
 ```shell
-pulsar-admin topics remove-offload-policies options
+pulsar-admin topics remove-offload-policies my-topic
 ```
 
 
@@ -1556,8 +1296,8 @@ You can create non-partitioned topics in the following ways.
 When you create non-partitioned topics with the [`create`](/tools/pulsar-admin/) command, you need to specify the topic name as an argument.
 
 ```shell
-bin/pulsar-admin topics create \
-persistent://my-tenant/my-namespace/my-topic
+pulsar-admin topics create \
+    persistent://my-tenant/my-namespace/my-topic
 ```
 
 :::note
@@ -1595,8 +1335,8 @@ You can delete non-partitioned topics in the following ways.
 
 
 ```shell
-bin/pulsar-admin topics delete \
-persistent://my-tenant/my-namespace/my-topic
+pulsar-admin topics delete \
+    persistent://my-tenant/my-namespace/my-topic
 ```
 
 
@@ -1628,6 +1368,11 @@ You can get the list of topics under a given namespace in the following ways.
 
 ```shell
 pulsar-admin topics list tenant/namespace
+```
+
+Example output:
+
+```
 persistent://tenant/namespace/topic1
 persistent://tenant/namespace/topic2
 ```
@@ -1651,7 +1396,39 @@ admin.topics().getList(namespace);
 
 ### Stats
 
-You can check the current statistics of a given topic. The following is an example. For the description of each stats, refer to [get stats](#get-stats).
+
+You can check the current statistics of a given topic and its connected producers and consumers in the following ways.
+
+````mdx-code-block
+
+
+
+```shell
+pulsar-admin topics stats \
+    persistent://test-tenant/namespace/topic \
+    --get-precise-backlog
+```
+
+
+
+
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/stats|operation/getStats?version=@pulsar:version_number@}
+
+
+
+
+```java
+admin.topics().getStats(topic, false /* is precise backlog */);
+```
+
+
+
+
+````
+
+The following is an example. For the description of topic stats, see [Pulsar statistics](administration-stats.md#topic-stats).
 
 ```json
 {
@@ -1686,45 +1463,18 @@ You can check the current statistics of a given topic. The following is an examp
 }
 ```
 
-You can check the current statistics of a given topic and its connected producers and consumers in the following ways.
-
-````mdx-code-block
-
-
-
-```shell
-pulsar-admin topics stats \
-persistent://test-tenant/namespace/topic \
---get-precise-backlog
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/stats|operation/getStats?version=@pulsar:version_number@}
-
-
-
-
-```java
-admin.topics().getStats(topic, false /* is precise backlog */);
-```
-
-
-
-
-````
-
 ## Manage partitioned topics
 You can use Pulsar [admin API](admin-api-overview.md) to create, update, delete and check the status of partitioned topics.
 
 ### Create
 
-Partitioned topics must be explicitly created. When creating a new partitioned topic, you need to provide a name and the number of partitions for the topic.
+When creating a new partitioned topic, you need to provide a name and the number of partitions for the topic.
 
-By default, 60 seconds after creation, topics are considered inactive and deleted automatically to avoid generating trash data. To disable this feature, set `brokerDeleteInactiveTopicsEnabled` to `false`. To change the frequency of checking inactive topics, set `brokerDeleteInactiveTopicsFrequencySeconds` to a specific value.
+:::note
+
+By default, if there are no messages 60 seconds after creation, topics are considered inactive and deleted automatically to avoid generating trash data. To disable this feature, set `brokerDeleteInactiveTopicsEnabled` to `false`. To change the frequency of checking inactive topics, set `brokerDeleteInactiveTopicsFrequencySeconds` to a specific value.
+
+:::
 
 For more information about the two parameters, see [here](reference-configuration.md#broker).
 
@@ -1740,9 +1490,9 @@ When you create partitioned topics with the [`create-partitioned-topic`](/tools/
 command, you need to specify the topic name as an argument and the number of partitions using the `-p` or `--partitions` flag.
 
 ```shell
-bin/pulsar-admin topics create-partitioned-topic \
-persistent://my-tenant/my-namespace/my-topic \
---partitions 4
+pulsar-admin topics create-partitioned-topic \
+    persistent://my-tenant/my-namespace/my-topic \
+    --partitions 4
 ```
 
 :::note
@@ -1783,8 +1533,8 @@ When topic auto-creation is disabled, and you have a partitioned topic without a
 You can create missed partitions with the [`create-missed-partitions`](/tools/pulsar-admin/) command and specify the topic name as an argument.
 
 ```shell
-bin/pulsar-admin topics create-missed-partitions \
-persistent://my-tenant/my-namespace/my-topic \
+pulsar-admin topics create-missed-partitions \
+    persistent://my-tenant/my-namespace/my-topic
 ```
 
 
@@ -1823,9 +1573,15 @@ You can check the number of partitions in a partitioned topic with the [`get-par
 
 ```shell
 pulsar-admin topics get-partitioned-topic-metadata \
-persistent://my-tenant/my-namespace/my-topic
+    persistent://my-tenant/my-namespace/my-topic
+```
+
+Example output:
+
+```json
 {
-  "partitions": 4
+  "partitions" : 4,
+  "deleted" : false
 }
 ```
 
@@ -1863,8 +1619,8 @@ You can update partitioned topics with the [`update-partitioned-topic`](/tools/p
 
 ```shell
 pulsar-admin topics update-partitioned-topic \
-persistent://my-tenant/my-namespace/my-topic \
---partitions 8
+    persistent://my-tenant/my-namespace/my-topic \
+    --partitions 8
 ```
 
 
@@ -1894,8 +1650,8 @@ You can delete partitioned topics with the [`delete-partitioned-topic`](/tools/p
 
 
 ```shell
-bin/pulsar-admin topics delete-partitioned-topic \
-persistent://my-tenant/my-namespace/my-topic
+pulsar-admin topics delete-partitioned-topic \
+    persistent://my-tenant/my-namespace/my-topic
 ```
 
 
@@ -1927,6 +1683,11 @@ You can get the list of partitioned topics under a given namespace in the follow
 
 ```shell
 pulsar-admin topics list-partitioned-topics tenant/namespace
+```
+
+Example output:
+
+```
 persistent://tenant/namespace/topic1
 persistent://tenant/namespace/topic2
 ```
@@ -1950,7 +1711,39 @@ admin.topics().getPartitionedTopicList(namespace);
 
 ### Stats
 
-You can check the current statistics of a given partitioned topic. The following is an example. For the description of each stats, refer to [get stats](#get-stats).
+
+You can check the current statistics of a given partitioned topic and its connected producers and consumers in the following ways.
+
+````mdx-code-block
+
+
+
+```shell
+pulsar-admin topics partitioned-stats \
+    persistent://test-tenant/namespace/topic \
+    --per-partition
+```
+
+
+
+
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/partitioned-stats|operation/getPartitionedStats?version=@pulsar:version_number@}
+
+
+
+
+```java
+admin.topics().getPartitionedStats(topic, true /* per partition */, false /* is precise backlog */);
+```
+
+
+
+
+````
+
+The following is an example. For the description of each topic stats, see [Pulsar statistics](administration-stats.md#topic-stats).
 
 Note that in the subscription JSON object, `chuckedMessageRate` is deprecated. Please use `chunkedMessageRate`. Both will be sent in the JSON for now.
 
@@ -2007,40 +1800,9 @@ Note that in the subscription JSON object, `chuckedMessageRate` is deprecated. P
 }
 ```
 
-You can check the current statistics of a given partitioned topic and its connected producers and consumers in the following ways. 
-
-````mdx-code-block
-
-
-
-```shell
-pulsar-admin topics partitioned-stats \
-persistent://test-tenant/namespace/topic \
---per-partition
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/partitioned-stats|operation/getPartitionedStats?version=@pulsar:version_number@}
-
-
-
-
-```java
-admin.topics().getPartitionedStats(topic, true /* per partition */, false /* is precise backlog */);
-```
-
-
-
-
-````
-
 ### Internal stats
 
-You can check the detailed statistics of a topic. The following is an example. For the description of each stats, refer to [get internal stats](#get-internal-stats).
+You can check the detailed statistics of a topic. The following is an example. For the description of each internal topic stats, see [Pulsar statistics](administration-stats.md#topic-internal-stats).
 
 ```json
 {
@@ -2127,8 +1889,8 @@ You can create a subscription for a topic using one of the following methods.
 
 ```shell
 pulsar-admin topics create-subscription \
---subscription my-subscription \
-persistent://test-tenant/ns1/tp1
+    --subscription my-subscription \
+    persistent://test-tenant/ns1/tp1
 ```
 
 
@@ -2162,8 +1924,12 @@ You can check all subscription names for a given topic using one of the followin
 
 
 ```shell
-pulsar-admin topics subscriptions \
-persistent://test-tenant/ns1/tp1 \
+pulsar-admin topics subscriptions persistent://test-tenant/ns1/tp1
+```
+
+Example output:
+
+```
 my-subscription
 ```
 
@@ -2198,8 +1964,8 @@ When a subscription does not process messages anymore, you can unsubscribe it us
 
 ```shell
 pulsar-admin topics unsubscribe \
---subscription my-subscription \
-persistent://test-tenant/ns1/tp1
+    --subscription my-subscription \
+    persistent://test-tenant/ns1/tp1
 ```
 
 
diff --git a/site2/docs/admin-api-transactions.md b/site2/docs/admin-api-transactions.md
index 0b04527afa2c1..818409454e34f 100644
--- a/site2/docs/admin-api-transactions.md
+++ b/site2/docs/admin-api-transactions.md
@@ -35,8 +35,7 @@ In the production environment, there may be some long-lasting transactions that
 
 
 ```shell
-pulsar-admin transactions slow-transactions \
--c 1 -t 1s
+pulsar-admin transactions slow-transactions -c 1 -t 1s
 ```
 
 
@@ -48,9 +47,9 @@ pulsar-admin transactions slow-transactions \
 
 
 ```java
-admin.transaction().getSlowTransactionsByCoordinatorId(coordinatorId, timeout, timeUnit)
+admin.transactions().getSlowTransactionsByCoordinatorId(coordinatorId, timeout, timeUnit)
 //Or get slow transactions from all coordinators
-admin.transaction().getSlowTransactions(timeout, timeUnit)
+admin.transactions().getSlowTransactions(timeout, timeUnit)
 ```
 
 
@@ -60,7 +59,7 @@ admin.transaction().getSlowTransactions(timeout, timeUnit)
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
   "(0,3)": {
     "txnId": "(0,3)",
@@ -156,8 +155,7 @@ When the performance of transactions reaches a bottleneck due to the insufficien
 
 
 ```shell
-pulsar-admin transactions scale-transactionCoordinators \
--r 17
+pulsar-admin transactions scale-transactionCoordinators -r 17
 ```
 
 
@@ -169,7 +167,7 @@ pulsar-admin transactions scale-transactionCoordinators \
 
 
 ```java
-admin.transaction().scaleTransactionCoordinators(replicas);
+admin.transactions().scaleTransactionCoordinators(replicas);
 ```
 
 
@@ -198,8 +196,7 @@ Use one of the following ways to get your transaction metadata.
 
 
 ```shell
-pulsar-admin transactions transaction-metadata\
--m 1 -l 1
+pulsar-admin transactions transaction-metadata -m 1 -l 1
 ```
 
 
@@ -221,7 +218,7 @@ admin.transactions().getTransactionMetadata(txnID);
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
  "txnId" : "(1,18)",
  "status" : "ABORTING",
@@ -257,8 +254,7 @@ Use one of the following ways to get transaction stats in pending ack:
 
 
 ```shell
-pulsar-admin transactions transaction-in-pending-ack-stats \
--m 1 -l 1 -t my-topic -s mysubname
+pulsar-admin transactions transaction-in-pending-ack-stats -m 1 -l 1 -t my-topic -s mysubname
 ```
 
 
@@ -270,7 +266,7 @@ pulsar-admin transactions transaction-in-pending-ack-stats \
 
 
 ```java
-admin.transaction().getTransactionInPendingAckStats(txnID, topic, subname);
+admin.transactions().getTransactionInPendingAckStats(txnID, topic, subname);
 ```
 
 
@@ -280,7 +276,7 @@ admin.transaction().getTransactionInPendingAckStats(txnID, topic, subname);
 
 The following is an example of the returned value.
 
-```shell
+```json
 {
  "cumulativeAckPosition" : "137:49959"
  }
@@ -301,8 +297,7 @@ Use one of the following ways to get transaction stats in transaction buffer:
 
 
 ```shell
-pulsar-admin transactions transaction-in-buffer-stats \
--m 1 -l 1 -t my-topic
+pulsar-admin transactions transaction-in-buffer-stats -m 1 -l 1 -t my-topic
 ```
 
 
@@ -314,7 +309,7 @@ pulsar-admin transactions transaction-in-buffer-stats \
 
 
 ```java
-admin.transaction().getTransactionInBufferStatsAsync(txnID, topic);
+admin.transactions().getTransactionInBufferStatsAsync(txnID, topic);
 ```
 
 
@@ -324,7 +319,7 @@ admin.transaction().getTransactionInBufferStatsAsync(txnID, topic);
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
  "startPosition" : "137:49759",
  "aborted" : false
@@ -353,8 +348,7 @@ Use one of the following ways to get transaction coordinator stats:
 
 
 ```shell
-pulsar-admin transactions coordinator-stats \
--c 1
+pulsar-admin transactions coordinator-stats -c 1
 ```
 
 
@@ -366,9 +360,9 @@ pulsar-admin transactions coordinator-stats \
 
 
 ```java
-admin.transaction().getCoordinatorStatsById(coordinatorId);
+admin.transactions().getCoordinatorStatsById(coordinatorId);
 //Or get all coordinator stats.
-admin.transaction().getCoordinatorStats();
+admin.transactions().getCoordinatorStats();
 ```
 
 
@@ -378,7 +372,7 @@ admin.transaction().getCoordinatorStats();
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
   "state" : "Ready",
   "leastSigBits" : 1,
@@ -404,8 +398,7 @@ Use one of the following ways to get coordinator’s internal stats:
 
 
 ```shell
-pulsar-admin transactions coordinator-internal-stats \
--c 1 -m
+pulsar-admin transactions coordinator-internal-stats -c 1 -m
 ```
 
 
@@ -417,7 +410,7 @@ pulsar-admin transactions coordinator-internal-stats \
 
 
 ```java
-admin.transaction().getCoordinatorInternalStats(coordinatorId, metadata);
+admin.transactions().getCoordinatorInternalStats(coordinatorId, metadata);
 ```
 
 
@@ -427,7 +420,7 @@ admin.transaction().getCoordinatorInternalStats(coordinatorId, metadata);
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
  "transactionLogStats" : {
    "managedLedgerName" : "pulsar/system/persistent/__transaction_log_1",
@@ -496,8 +489,7 @@ Use one of the following ways to get transaction pending ack stats:
 
 
 ```shell
-pulsar-admin transactions pending-ack-stats \
--t my-topic -s  mysubName -l
+pulsar-admin.transactions()s pending-ack-stats -t my-topic -s mysubName -l
 ```
 
 
@@ -509,7 +501,7 @@ pulsar-admin transactions pending-ack-stats \
 
 
 ```java
-admin.transaction().getPendingAckStats(topic, subName, lowWaterMarks)
+admin.transactions().getPendingAckStats(topic, subName, lowWaterMarks)
 ```
 
 
@@ -519,7 +511,7 @@ admin.transaction().getPendingAckStats(topic, subName, lowWaterMarks)
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
   "state" : "Ready",
   "lowWaterMarks" : {
@@ -547,8 +539,7 @@ Use one of the following ways to get transaction pending ack internal stats:
 
 
 ```shell
-pulsar-admin transactions pending-ack-internal-stats \
--t my-topic -s  mysubName -m
+pulsar-admin transactions pending-ack-internal-stats -t my-topic -s mysubName -m
 ```
 
 
@@ -560,7 +551,7 @@ pulsar-admin transactions pending-ack-internal-stats \
 
 
 ```java
-admin.transaction().getPendingAckInternalStats(topic, subName, boolean metadata);
+admin.transactions().getPendingAckInternalStats(topic, subName, boolean metadata);
 ```
 
 
@@ -570,7 +561,7 @@ admin.transaction().getPendingAckInternalStats(topic, subName, boolean metadata)
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
  "pendingAckLogStats" : {
    "managedLedgerName" : "public/default/persistent/my-topic-mysubName__transaction_pending_ack",
@@ -642,8 +633,7 @@ If you want to know whether the position has been acknowledged, you can use one
 
 
 ```shell
-pulsar-admin transactions position-stats-in-pending-ack \
--t my-topic -s  mysubName -l 15 -e 6
+pulsar-admin transactions position-stats-in-pending-ack -t my-topic -s mysubName -l 15 -e 6
 ```
 
 
@@ -656,7 +646,7 @@ pulsar-admin transactions position-stats-in-pending-ack \
 
 
 ```java
-admin.transaction().getPositionStatsInPendingAckAsync(topic, subName, ledgerId, entryId, lowWaterMarks);
+admin.transactions().getPositionStatsInPendingAckAsync(topic, subName, ledgerId, entryId, lowWaterMarks);
 ```
 
 
@@ -666,9 +656,9 @@ admin.transaction().getPositionStatsInPendingAckAsync(topic, subName, ledgerId,
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
-"State" : "MarkDelete"
+  "State" : "MarkDelete"
 }
 ```
 
@@ -697,8 +687,7 @@ Use one of the following ways to get transaction buffer stats:
 
 
 ```shell
-pulsar-admin transactions transaction-buffer-stats \
--t my-topic -l
+pulsar-admin transactions transaction-buffer-stats -t my-topic -l
 ```
 
 
@@ -710,7 +699,7 @@ pulsar-admin transactions transaction-buffer-stats \
 
 
 ```java
-admin.transaction().getTransactionBufferStats(topic, lowWaterMarks);
+admin.transactions().getTransactionBufferStats(topic, lowWaterMarks);
 ```
 
 
@@ -720,7 +709,7 @@ admin.transaction().getTransactionBufferStats(topic, lowWaterMarks);
 
 The following is an example of the returned values.
 
-```shell
+```json
 {
   "state" : "Ready",
   "maxReadPosition" : "38:101",
diff --git a/site2/docs/administration-geo.md b/site2/docs/administration-geo.md
index e6ce7c70350ec..cce2e607b3db9 100644
--- a/site2/docs/administration-geo.md
+++ b/site2/docs/administration-geo.md
@@ -19,7 +19,7 @@ Geo-replication is managed at the namespace level, which means you only need to
 Complete the following tasks to enable geo-replication for a namespace:
 
 * [Enable a geo-replication namespace](#enable-geo-replication-at-namespace-level)
-* [Configure that namespace to replicate across two or more provisioned clusters](admin-api-namespaces.md/#configure-replication-clusters)
+* [Configure that namespace to replicate across two or more provisioned clusters](admin-api-namespaces.md#configure-replication-clusters)
 
 Any message published on *any* topic in that namespace is replicated to all clusters in the specified set.
 
@@ -59,19 +59,19 @@ Suppose that you have 3 replication clusters: `us-west`, `us-cent`, and `us-east
 
    Run the following command on `us-west`.
 
-```shell
-bin/pulsar-admin clusters create \
---broker-url pulsar://:	\
---url http://: \
-us-east
-```
+   ```shell
+   bin/pulsar-admin clusters create \
+   --broker-url pulsar://: \
+   --url http://: \
+   us-east
+   ```
 
-   :::tip
+:::tip
 
    - If you want to use a secure connection for a cluster, you can use the flags `--broker-url-secure` and `--url-secure`. For more information, see [pulsar-admin clusters create](/tools/pulsar-admin/).
    - Different clusters may have different authentications. You can use the authentication flag `--auth-plugin` and `--auth-parameters` together to set cluster authentication, which overrides `brokerClientAuthenticationPlugin` and `brokerClientAuthenticationParameters` if `authenticationEnabled` sets to `true` in `broker.conf` and `standalone.conf`. For more information, see [authentication and authorization](concepts-authentication.md).
 
-   :::
+:::
 
 2. Configure the connection from `us-west` to `us-cent`.
 
@@ -100,7 +100,7 @@ bin/pulsar-admin tenants create my-tenant \
 
 To update permissions of an existing tenant, use `update` instead of `create`.
 
-### Enable geo-replication 
+### Enable geo-replication
 
 You can enable geo-replication at **namespace** or **topic** level.
 
@@ -199,7 +199,7 @@ Given that geo-replication topics exist in multiple regions, directly deleting a
 In Pulsar, a topic is automatically deleted when the topic meets the following three conditions:
 - no producers or consumers are connected to it;
 - no subscriptions to it;
-- no more messages are kept for retention. 
+- no more messages are kept for retention.
 For geo-replication topics, each region uses a fault-tolerant mechanism to decide when deleting the topic locally is safe.
 
 You can explicitly disable topic garbage collection by setting `brokerDeleteInactiveTopicsEnabled` to `false` in your [broker configuration](reference-configuration.md#broker).
@@ -210,11 +210,11 @@ To delete a geo-replication topic, close all producers and consumers on the topi
 
 Pulsar supports replicated subscriptions, so you can keep the subscription state in sync, within a sub-second timeframe, in the context of a topic that is being asynchronously replicated across multiple geographical regions.
 
-In case of failover, a consumer can restart consuming from the failure point in a different cluster. 
+In case of failover, a consumer can restart consuming from the failure point in a different cluster.
 
 ### Enable replicated subscription
 
-Replicated subscription is disabled by default. You can enable replicated subscriptions when creating a consumer. 
+Replicated subscription is disabled by default. You can enable replicated subscriptions when creating a consumer.
 
 ```java
 Consumer consumer = client.newConsumer(Schema.STRING)
@@ -226,9 +226,9 @@ Consumer consumer = client.newConsumer(Schema.STRING)
 
 ### Advantages
 
- * It is easy to implement the logic. 
+ * It is easy to implement the logic.
  * You can choose to enable or disable replicated subscription.
- * When you enable it, the overhead is low, and it is easy to configure. 
+ * When you enable it, the overhead is low, and it is easy to configure.
  * When you disable it, the overhead is zero.
 
 ### Limitations
@@ -238,7 +238,7 @@ Consumer consumer = client.newConsumer(Schema.STRING)
 
 ## Migrate data between clusters using geo-replication
 
-Using geo-replication to migrate data between clusters is a special use case of the [active-active replication pattern](concepts-replication.md/#active-active-replication) when you don't have a large amount of data.
+Using geo-replication to migrate data between clusters is a special use case of the [active-active replication pattern](concepts-replication.md#active-active-replication) when you don't have a large amount of data.
 
 1. Create your new cluster.
 2. Add the new cluster to your old cluster.
@@ -269,8 +269,7 @@ Using geo-replication to migrate data between clusters is a special use case of
 
 :::note
 
-* The replication starts from step 4, which means existing messages in your old cluster are not replicated. 
+* The replication starts from step 4, which means existing messages in your old cluster are not replicated.
 * If you have some older messages to migrate, you can pre-create the replication subscriptions for each topic and set it at the earliest position by using `pulsar-admin topics create-subscription -s pulsar.repl.new-cluster -m earliest `.
 
 :::
-
diff --git a/site2/docs/administration-isolation-bookie.md b/site2/docs/administration-isolation-bookie.md
index 4ebbe576921c9..9351c4d414611 100644
--- a/site2/docs/administration-isolation-bookie.md
+++ b/site2/docs/administration-isolation-bookie.md
@@ -19,7 +19,7 @@ Bookie isolation is controlled by BookKeeper clients. For Pulsar, there are two
    * The bookie replication worker writes ledger replicas to target bookies according to the configured isolation policy.
 
 To isolate bookies, you need to complete the following tasks.
-1. Select a [data isolation policy](#understand-bookie-data-isolation-policies) based on your requirements.
+1. Select a [data isolation policy](#understand-bookie-data-isolation-policy) based on your requirements.
 2. [Enable the policy on BookKeeper clients](#enable-bookie-data-placement-policy).
 3. [Configure the policy on bookie instances](#configure-data-placement-policy-on-bookie-instances).
 
diff --git a/site2/docs/administration-isolation-broker.md b/site2/docs/administration-isolation-broker.md
index b23e2f9754acb..3a868e6dd8bb5 100644
--- a/site2/docs/administration-isolation-broker.md
+++ b/site2/docs/administration-isolation-broker.md
@@ -55,6 +55,6 @@ For how to set namespace isolation policy using Java admin API, see [code](https
 
 :::tip
 
-To guarantee all the data that belongs to a namespace is stored in desired bookies, you can isolate the data of the namespace into user-defined groups of bookies. See [configure bookie affinity groups](#configure-bookie-affinity-groups) for more details.
+To guarantee all the data that belongs to a namespace is stored in desired bookies, you can isolate the data of the namespace into user-defined groups of bookies. See [configure bookie affinity groups](administration-isolation-bookie.md#configure-bookie-affinity-groups) for more details.
 
 :::
\ No newline at end of file
diff --git a/site2/docs/administration-isolation.md b/site2/docs/administration-isolation.md
index cb4ecd19986b8..4e78fe8095c82 100644
--- a/site2/docs/administration-isolation.md
+++ b/site2/docs/administration-isolation.md
@@ -34,10 +34,10 @@ The following illustration demonstrates the deployment of separate Pulsar cluste
 ![Deployment of separate Pulsar clusters](/assets/isolation-1.png)
 
 Here are some key points for understanding how it works:
-- Separate Pulsar clusters use a shared [configuration store](concepts-architecture-overview.md/#configuration-store).
+- Separate Pulsar clusters use a shared [configuration store](concepts-architecture-overview.md#configuration-store).
 - Each cluster exposes its service through a DNS entry point and makes sure a client can access the cluster through the DNS entry point. Clients can use one or multiple Pulsar URLs that the Pulsar cluster exposes as the service URL.
 - Each Pulsar cluster has one or multiple brokers and bookies.
-- Each Pulsar cluster has one metadata store, which can be separated into [Pulsar metadata store](concepts-architecture-overview.md/#metadata-store) and [BookKeeper metadata store](https://bookkeeper.apache.org/docs/latest/getting-started/concepts/#metadata-storage). 
+- Each Pulsar cluster has one metadata store, which can be separated into [Pulsar metadata store](concepts-architecture-overview.md#metadata-store) and [BookKeeper metadata store](https://bookkeeper.apache.org/docs/latest/getting-started/concepts/#metadata-storage). 
 
 :::note
 
@@ -52,7 +52,7 @@ The following illustration demonstrates the deployment of shared BookKeeper clus
 ![Deployment of shared BookKeeper cluster](/assets/isolation-2.png)
 
 Here are some key points for understanding how it works:
-- Separate Pulsar clusters share a BookKeeper cluster and a [configuration store](concepts-architecture-overview.md/#configuration-store).
+- Separate Pulsar clusters share a BookKeeper cluster and a [configuration store](concepts-architecture-overview.md#configuration-store).
 - Each cluster exposes its service through a DNS entry point and makes sure a client can access the cluster through the DNS entry point. Clients can use one or multiple Pulsar URLs that the Pulsar cluster exposes as the service URL.
 - Each Pulsar cluster has one or multiple brokers.
 - Each Pulsar cluster has one metadata store. 
diff --git a/site2/docs/administration-load-balance.md b/site2/docs/administration-load-balance.md
index c3d887335bcb9..99542a0f53417 100644
--- a/site2/docs/administration-load-balance.md
+++ b/site2/docs/administration-load-balance.md
@@ -120,7 +120,7 @@ Pulsar supports the following types of automatic load shedding strategies.
 :::note
 
 * From Pulsar 2.10, the **default** shedding strategy is `ThresholdShedder`.
-* You need to restart brokers if the shedding strategy is [dynamically updated](admin-api-brokers.md/#dynamic-broker-configuration).
+* You need to restart brokers if the shedding strategy is [dynamically updated](admin-api-brokers.md#dynamic-broker-configuration).
 
 :::
 
diff --git a/site2/docs/administration-stats.md b/site2/docs/administration-stats.md
index 2ccd73c67f9c4..ec2d6dd120219 100644
--- a/site2/docs/administration-stats.md
+++ b/site2/docs/administration-stats.md
@@ -4,60 +4,167 @@ title: Pulsar stats
 sidebar_label: "Pulsar statistics"
 ---
 
-## Partitioned topics
+## Topic stats
+
+The following table outlines the stats of a topic. For more details about how to get these stats, see [Get stats](admin-api-topics.md#get-stats).
+
+| Stat                                             | Description                                                                                              |
+|--------------------------------------------------|----------------------------------------------------------------------------------------------------------|
+| msgRateIn                                        | The sum of all local and replication publishers' publish rates (message per second).                     |
+| msgThroughputIn                                  | The sum of all local and replication publishers' publish rates (byte per second).                        |
+| msgRateOut                                       | The sum of all local and replication consumers' dispatch rates (message per second).                     |
+| msgThroughputOut                                 | The sum of all local and replication consumers' dispatch rates (byte per second).                        |
+| averageMsgSize                                   | The average size (bytes) of messages published within the last interval.                                 |
+| storageSize                                      | The sum of the ledgers' storage size for this topic. The space used to store the messages for the topic. |
+| earliestMsgPublishTimeInBacklogs                 | The publish time of the earliest message in the backlog (in milliseconds).                               |
+| bytesInCounter                                   | The total bytes published to the topic.                                                                  |
+| msgInCounter                                     | The total messages published to the topic.                                                               |
+| bytesOutCounter                                  | The total bytes delivered to consumers.                                                                  |
+| msgOutCounter                                    | The total messages delivered to consumers.                                                               |
+| msgChunkPublished                                | The topics that have chunked messages published on it.                                                   |
+| backlogSize                                      | The estimated total unconsumed or backlog size (in bytes).                                               |
+| offloadedStorageSize                             | Space that is used to store the offloaded messages for the topic (in bytes).                             |
+| waitingPublishers                                | The number of publishers waiting in a queue in exclusive access mode.                                    |
+| deduplicationStatus                              | The status of message deduplication for the topic.                                                       |
+| topicEpoch                                       | The topic epoch or empty if not set.                                                                     |
+| filteredEntriesCount                             | The count of skipped entries for the topic.                                                              |
+| nonContiguousDeletedMessagesRanges               | The number of non-contiguous deleted messages ranges.                                                    |
+| nonContiguousDeletedMessagesRangesSerializedSize | The serialized size of non-contiguous deleted messages ranges.                                           |
+| ownerBroker                                      | The broker that owns this topic.                                                                         |
+| [publishers](#producer-stats)                    | The list of all local publishers on the topic, ranging from zero to thousands.                           |
+| [subscriptions](#subscription-stats)             | The list of all local subscriptions to the topic.                                                        |
+| [replication](#replication-stats)                | This section gives the stats for cross-colo replication of this topic.                                   |
+
+### Producer stats
 
 |Stat|Description|
 |---|---|
-|msgRateIn| The sum of publish rates of all local and replication publishers in messages per second.|
-|msgThroughputIn| Same as msgRateIn but in bytes per second instead of messages per second.|
-|msgRateOut| The sum of dispatch rates of all local and replication consumers in messages per second.|
-|msgThroughputOut| Same as msgRateOut but in bytes per second instead of messages per second.|
-|averageMsgSize| Average message size, in bytes, from this publisher within the last interval.|
-|storageSize| The sum of storage size of the ledgers for this topic.|
-|publishers| The list of all local publishers into the topic. Publishers can be anywhere from zero to thousands.|
-|producerId| Internal identifier for this producer on this topic.|
-|producerName|  Internal identifier for this producer, generated by the client library.|
+|producerId| The internal identifier for this producer on this topic.|
+|producerName| The internal identifier for this producer, generated by the client library.|
 |address| IP address and source port for the connection of this producer.|
-|connectedSince| Timestamp this producer is created or last reconnected.|
-|subscriptions| The list of all local subscriptions to the topic.|
-|my-subscription| The name of this subscription (client defined).|
-|msgBacklog| The count of messages in backlog for this subscription.|
-|type| This subscription type.|
-|msgRateExpired| The rate at which messages are discarded instead of dispatched from this subscription due to TTL.|
-|consumers| The list of connected consumers for this subscription.|
-|consumerName| Internal identifier for this consumer, generated by the client library.|
-|availablePermits| The number of messages this consumer has space for in the listen queue of client library. A value of 0 means the queue of client library is full and receive() is not being called. A nonzero value means this consumer is ready to be dispatched messages.|
-|replication| This section gives the stats for cross-colo replication of this topic.|
-|replicationBacklog| The outbound replication backlog in messages.|
-|connected| Whether the outbound replicator is connected.|
-|replicationDelayInSeconds| How long the oldest message has been waiting to be sent through the connection, if connected is true.|
-|inboundConnection| The IP and port of the broker in the publisher connection of remote cluster to this broker. |
-|inboundConnectedSince| The TCP connection being used to publish messages to the remote cluster. If no local publishers are connected, this connection is automatically closed after a minute.|
-
-
-## Topics
+|connectedSince| The timestamp when this producer is created or reconnected last time.|
+|accessMode| The type of access to the topic that the producer requires.|
+|msgRateIn| The total rate of messages (message per second) published by this publisher.|
+|msgThroughputIn| The total throughput (byte per second) of the messages published by this publisher.|
+|averageMsgSize| The average message size in bytes from this publisher within the last interval.|
+|chunkedMessageRate| The total rate of chunked messages published by this publisher.|
+|clientVersion| The client library version of this producer.|
+|metadata| The metadata (key/value strings) associated with this publisher.|
 
-|Stat|Description|
-|---|---|
-|entriesAddedCounter| Messages published since this broker loads this topic.|
-|numberOfEntries| Total number of messages being tracked.|
-|totalSize| Total storage size in bytes of all messages.|
-|currentLedgerEntries| Count of messages written to the ledger currently open for writing.|
-|currentLedgerSize| Size in bytes of messages written to ledger currently open for writing.|
-|lastLedgerCreatedTimestamp| Time when last ledger is created.|
-|lastLedgerCreationFailureTimestamp| Time when last ledger is failed.|
-|waitingCursorsCount| How many cursors are caught up and waiting for a new message to be published.|
-|pendingAddEntriesCount| How many messages have (asynchronous) write requests you are waiting on completion.|
-|lastConfirmedEntry| The ledgerid:entryid of the last message successfully written. If the entryid is -1, then the ledger is opened or is being currently opened but has no entries written yet.|
-|state| The state of the cursor ledger. Open means you have a cursor ledger for saving updates of the markDeletePosition.|
-|ledgers| The ordered list of all ledgers for this topic holding its messages.|
-|cursors| The list of all cursors on this topic. Every subscription you saw in the topic stats has one.|
-|markDeletePosition| The ack position: the last message the subscriber acknowledges receiving.|
-|readPosition| The latest position of subscriber for reading message.|
-|waitingReadOp| This is true when the subscription reads the latest message that is published to the topic and waits on new messages to be published.|
-|pendingReadOps| The counter for how many outstanding read requests to the BookKeepers you have in progress.|
-|messagesConsumedCounter| Number of messages this cursor acks since this broker loads this topic.|
-|cursorLedger| The ledger used to persistently store the current markDeletePosition.|
-|cursorLedgerLastEntry| The last entryid used to persistently store the current markDeletePosition.|
-|individuallyDeletedMessages| If Acks are done out of order, shows the ranges of messages Acked between the markDeletePosition and the read-position.|
-|lastLedgerSwitchTimestamp| The last time the cursor ledger is rolled over.|
+### Subscription stats
+
+| Stat                                             | Description                                                                                                                                                                                                                                                          |
+|--------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| my-subscription                                  | The name of this subscription. It is defined by the client.                                                                                                                                                                                                          |
+| msgRateOut                                       | The total rate of messages (message per second) delivered on this subscription.                                                                                                                                                                                      |
+| msgThroughputOut                                 | The total throughput (byte per second) delivered on this subscription.                                                                                                                                                                                               |
+| msgBacklog                                       | The number of messages in the subscription backlog.                                                                                                                                                                                                                  |
+| type                                             | This subscription type.                                                                                                                                                                                                                                              |
+| msgRateExpired                                   | The rate at which messages are discarded instead of dispatched from this subscription due to TTL.                                                                                                                                                                    |
+| lastExpireTimestamp                              | The timestamp of the last message expiration.                                                                                                                                                                                                                        |
+| lastConsumedFlowTimestamp                        | The timestamp of the last flow command received.                                                                                                                                                                                                                     |
+| lastConsumedTimestamp                            | The latest timestamp of all the consumed timestamps of the consumers.                                                                                                                                                                                                |
+| lastAckedTimestamp                               | The latest timestamp of all the acknowledged timestamps of the consumers.                                                                                                                                                                                            |
+| msgRateRedeliver                                 | The total rate of messages redelivered on this subscription (message per second).                                                                                                                                                                                    |
+| chunkedMessageRate                               | The chunked message dispatch rate.                                                                                                                                                                                                                                   |
+| earliestMsgPublishTimeInBacklog                  | The publish time of the earliest message in the backlog for the subscription (in milliseconds).                                                                                                                                                                      |
+| msgBacklogNoDelayed                              | The number of messages in the subscription backlog that do not contain the delay messages.                                                                                                                                                                           |
+| blockedSubscriptionOnUnackedMsgs                 | The flag to verify if a subscription is blocked due to reaching the threshold of unacked messages.                                                                                                                                                                   |
+| msgDelayed                                       | The number of delayed messages that are currently tracked.                                                                                                                                                                                                           |
+| unackedMessages                                  | The number of unacknowledged messages for the subscription, where an unacknowledged message is one that has been sent to a consumer but not yet acknowledged. This field is only meaningful when using a subscription that tracks individual message acknowledgment. |
+| activeConsumerName                               | The name of the consumer that is active for single active consumer subscriptions (such as failover or exclusive).                                                                                                                                                    |
+| totalMsgExpired                                  | The total messages expired on this subscription.                                                                                                                                                                                                                     |
+| lastMarkDeleteAdvancedTimestamp                  | The last `MarkDelete` position advanced timestamp.                                                                                                                                                                                                                   |
+| durable                                          | Whether the subscription is durable or ephemeral (for example, from a reader).                                                                                                                                                                                       |
+| replicated                                       | Mark that the subscription state is kept in sync across different regions.                                                                                                                                                                                           |
+| allowOutOfOrderDelivery                          | Whether out-of-order delivery is allowed on the Key_Shared subscription.                                                                                                                                                                                             |
+| keySharedMode                                    | The options of the Key_Shared subscription mode include `AUTO_SPLIT` or `STICKY`.                                                                                                                                                                                    |
+| consumersAfterMarkDeletePosition                 | Get `recentJoinedConsumers` for the Key_Shared subscription.                                                                                                                                                                                                         |
+| filterProcessedMsgCount                          | The number of messages processed by `EntryFilter`.                                                                                                                                                                                                                   |
+| filterAcceptedMsgCount                           | The number of messages accepted by `EntryFilter`.                                                                                                                                                                                                                    |
+| filterRejectedMsgCount                           | The number of messages rejected by `EntryFilter`.                                                                                                                                                                                                                    |
+| filterRescheduledMsgCount                        | The number of messages rescheduled by `EntryFilter`.                                                                                                                                                                                                                 |
+| bytesOutCounter                                  | The total bytes delivered to a consumer.                                                                                                                                                                                                                             |
+| msgOutCounter                                    | The total messages delivered to a consumer.                                                                                                                                                                                                                          |
+| backlogSize                                      | The size of backlog for this subscription (in bytes).                                                                                                                                                                                                                |
+| nonContiguousDeletedMessagesRanges               | The number of non-contiguous deleted messages ranges.                                                                                                                                                                                                                |
+| nonContiguousDeletedMessagesRangesSerializedSize | The serialized size of non-contiguous deleted messages ranges.                                                                                                                                                                                                       |
+| [consumers](#consumer-stats)                     | The list of connected consumers for this subscription.                                                                                                                                                                                                               |
+
+### Consumer stats
+
+| Stat                         | Description                                                                                                                                                                                                                                            |
+|------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| consumerName                 | Internal identifier for this consumer, generated by the client library.                                                                                                                                                                                |
+| msgRateOut                   | The total rate of messages (message per second) delivered to the consumer.                                                                                                                                                                             |
+| msgThroughputOut             | The total throughput (byte per second) delivered to the consumer.                                                                                                                                                                                      |
+| availablePermits             | The number of messages that the consumer has space for in the client library's listening queue. `0` means the client library's queue is full and `receive()` isn't called. A non-zero value means this consumer is ready for dispatched messages.      |
+| unackedMessages              | The number of unacknowledged messages for the consumer, where an unacknowledged message has been sent to the consumer but not yet acknowledged. This field is only meaningful when using a subscription that tracks individual message acknowledgment. |
+| blockedConsumerOnUnackedMsgs | The flag used to verify if the consumer is blocked due to reaching the threshold of the unacknowledged messages.                                                                                                                                       |
+| lastConsumedTimestamp        | The timestamp when the consumer reads a message the last time.                                                                                                                                                                                         |
+| lastAckedTimestamp           | The timestamp when the consumer acknowledges a message the last time.                                                                                                                                                                                  |
+| address                      | The IP address and source port for the connection of this consumer.                                                                                                                                                                                    |
+| connectedSince               | The timestamp when this consumer is created or reconnected last time.                                                                                                                                                                                  |
+| clientVersion                | The client library version of this consumer.                                                                                                                                                                                                           |
+| bytesOutCounter              | The total bytes delivered to a consumer.                                                                                                                                                                                                               |
+| msgOutCounter                | The total messages delivered to a consumer.                                                                                                                                                                                                            |
+| msgRateRedeliver             | The total rate of messages redelivered by this consumer (message per second).                                                                                                                                                                          |
+| chunkedMessageRate           | The total rate of chunked messages delivered to this consumer.                                                                                                                                                                                         |
+| avgMessagesPerEntry          | The number of average messages per entry for the consumer consumed.                                                                                                                                                                                    |
+| readPositionWhenJoining      | The read position of the cursor when the consumer joins.                                                                                                                                                                                               |
+| keyHashRanges                | The hash ranges assigned to this consumer if it uses Key_Shared sub mode.                                                                                                                                                                              |
+| metadata                     | The metadata (key/value strings) associated with this consumer.                                                                                                                                                                                        |
+
+### Replication stats
+
+| Stat                      | Description                                                                                                                                                      |
+|---------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| msgRateIn                 | The total rate (message per second) of messages received from the remote cluster.                                                                                |
+| msgThroughputIn           | The total throughput (byte per second) received from the remote cluster.                                                                                         |
+| msgRateOut                | The total rate of messages (message per second) delivered to the replication-subscriber.                                                                         |
+| msgThroughputOut          | The total throughput (byte per second) delivered to the replication-subscriber.                                                                                  |
+| msgRateExpired            | The total rate of messages (message per second) expired.                                                                                                         |
+| replicationBacklog        | The number of messages pending to be replicated to remote cluster.                                                                                               |
+| connected                 | Whether the outbound replicator is connected.                                                                                                                    |
+| replicationDelayInSeconds | How long the oldest message has been waiting to be sent through the connection when connected.                                                                   |
+| inboundConnection         | The IP and port of the broker in the remote cluster's publisher connection to this broker.                                                                       |
+| inboundConnectedSince     | The TCP connection used to publish messages to the remote cluster. If no local publishers are connected, this connection is automatically closed after a minute. |
+| outboundConnection        | The address of the outbound replication connection.                                                                                                              |
+| outboundConnectedSince    | The timestamp of establishing an outbound connection.                                                                                                            |
+
+## Topic internal stats
+
+The following table outlines the internal stats inside a topic. For more details about how to get these stats, see [Get stats](admin-api-topics.md#get-internal-stats).
+
+| Stat                               | Description                                                                                                                                                                         |
+|------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| entriesAddedCounter                | Messages published since this broker loads this topic.                                                                                                                              |
+| numberOfEntries                    | The total number of messages tracked.                                                                                                                                               |
+| totalSize                          | The total storage size in bytes of all messages.                                                                                                                                    |
+| currentLedgerEntries               | The count of messages written to the ledger that is currently open for writing.                                                                                                     |
+| currentLedgerSize                  | The size in bytes of messages written to the ledger that is currently open for writing.                                                                                             |
+| lastLedgerCreatedTimestamp         | The time when the last ledger is created.                                                                                                                                           |
+| lastLedgerCreationFailureTimestamp | The time when the last ledger is failed.                                                                                                                                            |
+| waitingCursorsCount                | The number of cursors that are caught up and waiting for a new message to be published.                                                                                             |
+| pendingAddEntriesCount             | The number of messages that have write requests (asynchronous) waiting on completion.                                                                                               |
+| lastConfirmedEntry                 | The `ledgerid:entryid` of the last message that is written successfully. If the `entryid` is `-1`, then the ledger is opened or is currently opened but has no entries written yet. |
+| state                              | The state of the cursor ledger. The state `LedgerOpened` means that a ledger is open for saving published messages.                                                                 |
+| ledgers                            | The ordered list of all ledgers for this topic that holds its messages.                                                                                                             |
+| cursors                            | The list of all cursors on this topic. Each subscription in the topic stats has a cursor.                                                                                           |
+| markDeletePosition                 | The ack position: the last message that the subscriber acknowledges. All messages before this position are acknowledged by the subscriber.                                          |
+| readPosition                       | The latest position of the subscriber for reading messages.                                                                                                                         |
+| waitingReadOp                      | This is true when the subscription reads the latest message that is published to the topic and waits for new messages to be published.                                              |
+| pendingReadOps                     | The count of outstanding read requests to the BookKeepers in progress.                                                                                                              |
+| messagesConsumedCounter            | The number of messages this cursor has acknowledged since this broker loads this topic.                                                                                             |
+| cursorLedger                       | The ledger used to persistently store the current `markDeletePosition`.                                                                                                             |
+| cursorLedgerLastEntry              | The last `entryid` used to persistently store the current `markDeletePosition`.                                                                                                     |
+| individuallyDeletedMessages        | The range of messages acknowledged between `markDeletePosition` and the `readPosition` when acknowledges are done out of order.                                                     |
+| lastLedgerSwitchTimestamp          | The last time when the cursor ledger is rolled over.                                                                                                                                |
+| ledgers                            | The ordered list of all ledgers for this topic that holds messages.                                                                                                                 |
+| schemaLedgers                      | The ordered list of all ledgers for this topic schema.                                                                                                                              |
+| compactedLedger                    | The ledgers holding un-acked messages after topic compaction.                                                                                                                       |
+| ledgerId                           | The ID of this ledger.                                                                                                                                                              |
+| entries                            | The total number of entries that belong to this ledger.                                                                                                                             |
+| size                               | The size of messages written to this ledger (in bytes).                                                                                                                             |
+| offloaded                          | Whether this ledger is offloaded. The value is `false` for the compacted topic ledger.                                                                                              |
+| metadata                           | The ledger metadata.                                                                                                                                                                |
\ No newline at end of file
diff --git a/site2/docs/administration-zk-bk.md b/site2/docs/administration-zk-bk.md
index 03cc889d676d7..a4be8cfdce03a 100644
--- a/site2/docs/administration-zk-bk.md
+++ b/site2/docs/administration-zk-bk.md
@@ -52,7 +52,7 @@ echo 1 > data/zookeeper/myid
 
 On `zk2.us-west.example.com` the command is `echo 2 > data/zookeeper/myid` and so on.
 
-Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```shell
 bin/pulsar-daemon start zookeeper
@@ -68,7 +68,7 @@ If you deploy a [single-cluster](#single-cluster-pulsar-instance) instance, you
 
 If your Pulsar instance consists of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but run on different TCP ports.
 
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorum uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
+To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorum uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#deploy-local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
 
 ```properties
 clientPort=2184
@@ -122,7 +122,7 @@ peerType=observer
 
 ##### Start the service
 
-Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
+Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md)
 
 ```shell
 bin/pulsar-daemon start configuration-store
@@ -201,19 +201,19 @@ BookKeeper provides [persistent message storage](concepts-architecture-overview.
 
 You can start a bookie in the foreground or as a background daemon.
 
-To start a bookie in the foreground, use the [`bookkeeper`](reference-cli-tools.md#bookkeeper) CLI tool:
+To start a bookie in the foreground, use the [`bookkeeper`](reference-cli-tools.md) CLI tool:
 
 ```bash
 bin/bookkeeper bookie
 ```
 
-To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```bash
 bin/pulsar-daemon start bookie
 ```
 
-You can verify whether the bookie works properly with the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
+You can verify whether the bookie works properly with the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md):
 
 ```shell
 bin/bookkeeper shell bookiesanity
diff --git a/site2/docs/client-libraries-cpp.md b/site2/docs/client-libraries-cpp.md
index 58d1cef4b3c20..29ae1d530137a 100644
--- a/site2/docs/client-libraries-cpp.md
+++ b/site2/docs/client-libraries-cpp.md
@@ -9,9 +9,48 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 ````
 
-You can use a Pulsar C++ client to create producers, consumers, and readers.
+You can use a Pulsar C++ client to create producers, consumers, and readers. For Pulsar features that C++ clients support, see [Client Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914). For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
-All the methods in producer, consumer, and reader of a C++ client are thread-safe. You can read the [API docs](/api/cpp) for the C++ client.
+## Changes for version 3.0.0 or later
+
+The new version of the Pulsar C++ client starts from 3.0.0 and has been no longer consistent with Pulsar since 2.10.x. For the latest releases, see the [Download](/download/) page.
+
+Take the [3.0.0 release](https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.0.0/) for example, there are following subdirectories:
+- apk-arm64: the Alpine Linux packages for ARM64 architectures
+- apk-x86_64: the Alpine Linux packages for x64 architectures
+- deb-arm64: the Debian-based Linux packages for ARM64 architectures
+- deb-x86_64: the Debian-based Linux packages for x64 architectures
+- rpm-arm64: the RedHat-based Linux packages for ARM64 architectures
+- rpm-x86_64: the RedHat-based Linux packages for x64 architectures
+
+These Linux packages above all contain the C++ headers installed under `/usr/include` and the following libraries installed under `/usr/lib`:
+- libpulsar.so: the shared library that links 3rd party dependencies statically
+- libpulsar.a: the static library
+- libpulsarwithdeps.a: the fat static library that includes all 3rd party dependencies
+
+Here is an example to link these libraries for a C++ source file named `main.cc`:
+
+```bash
+# Link to libpulsar.so
+g++ -std=c++11 main.cc -lpulsar
+# Link to libpulsarwithdeps.a
+g++ -std=c++11 main.cc /usr/lib/libpulsarwithdeps.a -lpthread -ldl
+# Link to libpulsar.a
+g++ -std=c++11 main.cc /usr/lib/libpulsar.a \
+  -lprotobuf -lcurl -lssl -lcrypto -lz -lzstd -lsnappy -lpthread -ldl
+```
+
+:::caution
+
+Linking to `libpulsar.a` can be difficult for beginners because the 3rd party dependencies must be compatible. For example, the protobuf version must be 3.20.0 or higher for Pulsar C++ client 3.0.0. It's better to link to `libpulsarwithdeps.a` instead.
+
+:::
+
+:::danger
+
+Before 3.0.0, there was a `libpulsarnossl.so`, which is removed now.
+
+:::
 
 ## Installation
 
@@ -29,32 +68,32 @@ brew install libpulsar
 
 1. Download any one of the Deb packages:
 
-
-
+   
+   
 
-```bash
-wget @pulsar:deb:client@
-```
+   ```bash
+   wget @pulsar:deb:client@
+   ```
 
-This package contains shared libraries `libpulsar.so` and `libpulsarnossl.so`.
+   This package contains shared libraries `libpulsar.so` and `libpulsarnossl.so`.
 
-
-
+   
+   
 
-```bash
-wget @pulsar:deb:client-devel@
-```
+   ```bash
+   wget @pulsar:deb:client-devel@
+   ```
 
-This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
+   This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a`, and C/C++ headers.
 
-
-
+   
+   
 
 2. Install the package using the following command:
 
-```bash
-apt install ./apache-pulsar-client*.deb
-```
+   ```bash
+   apt install ./apache-pulsar-client*.deb
+   ```
 
 Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
@@ -62,41 +101,41 @@ Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` dire
 
 1. Download any one of the RPM packages:
 
-
-
+   
+   
 
-```bash
-wget @pulsar:dist_rpm:client@
-```
+   ```bash
+   wget @pulsar:dist_rpm:client@
+   ```
 
-This package contains shared libraries: `libpulsar.so` and `libpulsarnossl.so`.
+   This package contains shared libraries: `libpulsar.so` and `libpulsarnossl.so`.
 
-
-
+   
+   
 
-```bash
-wget @pulsar:dist_rpm:client-debuginfo@
-```
+   ```bash
+   wget @pulsar:dist_rpm:client-debuginfo@
+   ```
 
-This package contains debug symbols for `libpulsar.so`
+   This package contains debug symbols for `libpulsar.so`.
 
-
-
+   
+   
 
-```bash
-wget @pulsar:dist_rpm:client-devel@
-```
+   ```bash
+   wget @pulsar:dist_rpm:client-devel@
+   ```
 
-This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
+   This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-
-
+   
+   
 
 2. Install the package using the following command:
 
-```bash
-rpm -ivh apache-pulsar-client*.rpm
-```
+   ```bash
+   rpm -ivh apache-pulsar-client*.rpm
+   ```
 
 Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
@@ -106,9 +145,11 @@ If you get an error like "libpulsar.so: cannot open shared object file: No such
 
 :::
 
-### Source
+### APK
 
-For how to build Pulsar C++ client on different platforms from source code, see [compliation](https://github.com/apache/pulsar-client-cpp#compilation).
+```bash
+apk add --allow-untrusted ./apache-pulsar-client-*.apk
+```
 
 ## Connection URLs
 
@@ -132,6 +173,14 @@ If you use [TLS](security-tls-authentication.md) authentication, add `+ssl` in t
 pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
+## API reference
+
+All the methods in producer, consumer, and reader of Pulsar C++ clients are thread-safe. See the [API docs](@pulsar:apidoc:cpp@) for more details.
+
+## Release notes
+
+For the changelog of Pulsar C++ clients, see [release notes](/release-notes/#c).
+
 ## Create a producer
 
 To use Pulsar as a producer, you need to create a producer on the C++ client. There are two main ways of using a producer:
@@ -394,98 +443,6 @@ Consumer consumer;
 client.subscribe("my-topic", "my-sub", conf, consumer);
 ```
 
-## Enable authentication in connection URLs
-If you use TLS authentication when connecting to Pulsar, you need to add `ssl` in the connection URLs, and the default port is `6651`. The following is an example.
-
-```cpp
-ClientConfiguration config = ClientConfiguration();
-config.setUseTls(true);
-config.setTlsTrustCertsFilePath("/path/to/cacert.pem");
-config.setTlsAllowInsecureConnection(false);
-config.setAuth(pulsar::AuthTls::create(
-            "/path/to/client-cert.pem", "/path/to/client-key.pem"););
-
-Client client("pulsar+ssl://my-broker.com:6651", config);
-```
-
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
-
 ## Schema
 
-This section describes some examples about schema. For more information about schema, see [Pulsar schema](schema-get-started.md).
-
-### Avro schema
-
-- The following example shows how to create a producer with an Avro schema.
-
-  ```cpp
-  static const std::string exampleSchema =
-      "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
-      "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
-  Producer producer;
-  ProducerConfiguration producerConf;
-  producerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
-  client.createProducer("topic-avro", producerConf, producer);
-  ```
-
-- The following example shows how to create a consumer with an Avro schema.
-
-  ```cpp
-  static const std::string exampleSchema =
-      "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
-      "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
-  ConsumerConfiguration consumerConf;
-  Consumer consumer;
-  consumerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
-  client.subscribe("topic-avro", "sub-2", consumerConf, consumer)
-  ```
-
-### ProtobufNative schema
-
-The following example shows how to create a producer and a consumer with a ProtobufNative schema.
-
-1. Generate the `User` class using Protobuf3 or later versions.
-
-   ```protobuf
-   syntax = "proto3";
-
-   message User {
-       string name = 1;
-       int32 age = 2;
-   }
-   ```
-
-2. Include the `ProtobufNativeSchema.h` in your source code. Ensure the Protobuf dependency has been added to your project.
-
-   ```cpp
-   #include 
-   ```
-
-3. Create a producer to send a `User` instance.
-
-   ```cpp
-   ProducerConfiguration producerConf;
-   producerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
-   Producer producer;
-   client.createProducer("topic-protobuf", producerConf, producer);
-   User user;
-   user.set_name("my-name");
-   user.set_age(10);
-   std::string content;
-   user.SerializeToString(&content);
-   producer.send(MessageBuilder().setContent(content).build());
-   ```
-
-4. Create a consumer to receive a `User` instance.
-
-   ```cpp
-   ConsumerConfiguration consumerConf;
-   consumerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
-   consumerConf.setSubscriptionInitialPosition(InitialPositionEarliest);
-   Consumer consumer;
-   client.subscribe("topic-protobuf", "my-sub", consumerConf, consumer);
-   Message msg;
-   consumer.receive(msg);
-   User user2;
-   user2.ParseFromArray(msg.getData(), msg.getLength());
-   ```
+To work with [Pulsar schema](schema-overview.md) using C++ clients, see [Schema - Get started](schema-get-started.md). For specific schema types that C++ clients support, see [code](https://github.com/apache/pulsar-client-cpp/blob/main/include/pulsar/Schema.h).
diff --git a/site2/docs/client-libraries-dotnet.md b/site2/docs/client-libraries-dotnet.md
index 0401b578fe425..b0ed132553902 100644
--- a/site2/docs/client-libraries-dotnet.md
+++ b/site2/docs/client-libraries-dotnet.md
@@ -4,21 +4,21 @@ title: Pulsar C# client
 sidebar_label: "C#"
 ---
 
-You can use the Pulsar C# client (DotPulsar) to create Pulsar producers and consumers in C#. All the methods in the producer, consumer, and reader of a C# client are thread-safe. The official documentation for DotPulsar is available [here](https://github.com/apache/pulsar-dotpulsar/wiki).
+You can use the Pulsar C# client (DotPulsar) to create Pulsar producers, consumers, and readers in C#. For Pulsar features that C# clients support, see [Pulsar Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914).
 
-## Installation
+All the methods in the producer, consumer, and reader of a C# client are thread-safe. The official documentation for DotPulsar is available [here](https://github.com/apache/pulsar-dotpulsar/wiki). 
 
-You can install the Pulsar C# client library either through the dotnet CLI or through Visual Studio. This section describes how to install the Pulsar C# client library through the dotnet CLI. For information about how to install the Pulsar C# client library through Visual Studio, see [here](https://docs.microsoft.com/en-us/visualstudio/mac/nuget-walkthrough?view=vsmac-2019).
+## Installation
 
-### Prerequisites
+This section describes how to install the Pulsar C# client library through the dotnet CLI. 
 
-Install the [.NET Core SDK](https://dotnet.microsoft.com/download/), which provides the dotnet command-line tool. Starting in Visual Studio 2017, the dotnet CLI is automatically installed with any .NET Core related workloads.
+Alternatively, you can install the Pulsar C# client library through Visual Studio. Note that starting from Visual Studio 2017, the dotnet CLI is automatically installed with any .NET Core related workloads. For more information, see [Microsoft documentation](https://docs.microsoft.com/en-us/visualstudio/mac/nuget-walkthrough?view=vsmac-2019).
 
-### Procedures
+To install the Pulsar C# client library using the dotnet CLI, follow these steps:
 
-To install the Pulsar C# client library, follow these steps:
+1. Install the [.NET Core SDK](https://dotnet.microsoft.com/download/), which provides the dotnet CLI. 
 
-1. Create a project.
+2. Create a project.
 
    1. Create a folder for the project.
 
@@ -32,7 +32,7 @@ To install the Pulsar C# client library, follow these steps:
 
    4. Use `dotnet run` to test that the app has been created properly.
 
-2. Add the DotPulsar NuGet package.
+3. Add the DotPulsar NuGet package.
 
    1. Use the following command to install the `DotPulsar` package.
 
@@ -70,6 +70,10 @@ If you use [TLS](security-tls-authentication.md) authentication, add `+ssl` in t
 pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
+## Release notes
+
+For the changelog of Pulsar C# clients, see [release notes](/release-notes/#c-1).
+
 ## Client
 
 This section describes some configuration examples for the Pulsar C# client.
@@ -212,7 +216,7 @@ If you have followed [Authentication using TLS](security-tls-authentication.md),
 
 A producer is a process that attaches to a topic and publishes messages to a Pulsar broker for processing. This section describes some configuration examples of the producer.
 
-## Send data
+### Send data
 
 This example shows how to send data.
 
diff --git a/site2/docs/client-libraries-go.md b/site2/docs/client-libraries-go.md
index 7ab2b416aabf3..8b8f2260b3cc5 100644
--- a/site2/docs/client-libraries-go.md
+++ b/site2/docs/client-libraries-go.md
@@ -4,42 +4,42 @@ title: Pulsar Go client
 sidebar_label: "Go"
 ---
 
-You can use Pulsar [Go client](https://github.com/apache/pulsar-client-go) to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Golang.
-
-API docs are available on the [Godoc](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar) page
+You can use a Pulsar [Go client](https://github.com/apache/pulsar-client-go) to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Golang. For Pulsar features that Go clients support, see [Client Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914).
 
 ## Installation
 
-### Install go package
+You can install the `pulsar` library by using either `go get` or `go module`.
 
-You can get the `pulsar` library by using `go get` or use it with `go module`.
+### Use `go get`
 
-Download the library of Go client to your local environment:
+1. Download the library of Go client to your local environment:
 
-```bash
-go get -u "github.com/apache/pulsar-client-go/pulsar"
-```
+   ```bash
+   go get -u "github.com/apache/pulsar-client-go/pulsar"
+   ```
 
-Once installed locally, you can import it into your project:
+2. Import it into your project:
 
-```go
-import "github.com/apache/pulsar-client-go/pulsar"
-```
+   ```go
+   import "github.com/apache/pulsar-client-go/pulsar"
+   ```
 
-Use with go module:
+### Use `go module`
 
-```bash
-mkdir test_dir && cd test_dir
-```
+1. Create a directory named `test_dir` and change your working directory to it.
 
-Write a sample script in the `test_dir` directory (such as `test_example.go`) and write `package main` at the beginning of the file.
+   ```bash
+   mkdir test_dir && cd test_dir
+   ```
 
-```bash
-go mod init test_dir 
-go mod tidy && go mod download
-go build test_example.go
-./test_example
-```
+2. Write a sample script (such as `test_example.go`) in the `test_dir` directory and write `package main` at the beginning of the file.
+
+   ```bash
+   go mod init test_dir 
+   go mod tidy && go mod download
+   go build test_example.go
+   ./test_example
+   ```
 
 ## Connection URLs
 
@@ -63,9 +63,17 @@ If you use [TLS](security-tls-authentication.md) authentication, add `+ssl` in t
 pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
+## API reference
+
+API docs are available on the [Godoc](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar) page.
+
+## Release notes
+
+For the changelog of Pulsar Go clients, see [release notes](/release-notes/#go).
+
 ## Create a client
 
-To interact with Pulsar, you need a [`Client`](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar#Client) object first. You can create a client object using the [`NewClient`](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar#NewClient) function, passing in a [`ClientOptions`](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar#ClientOptions) object (more on configuration [below](#client-configuration)). Here's an example:
+To interact with Pulsar, you need a [`Client`](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar#Client) object first. You can create a client object using the [`NewClient`](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar#NewClient) function, passing in a [`ClientOptions`](https://pkg.go.dev/github.com/apache/pulsar-client-go/pulsar#ClientOptions) object. Here's an example:
 
 ```go
 import (
@@ -204,6 +212,34 @@ for i := 0; i < 10; i++ {
 }
 ```
 
+#### How to use chunking in producer
+
+```go
+client, err := pulsar.NewClient(pulsar.ClientOptions{
+	URL: serviceURL,
+})
+
+if err != nil {
+	log.Fatal(err)
+}
+defer client.Close()
+
+// The message chunking feature is OFF by default.
+// By default, a producer chunks the large message based on the max message size (`maxMessageSize`) configured at the broker side (for example, 5MB).
+// Client can also configure the max chunked size using the producer configuration `ChunkMaxMessageSize`.
+// Note: to enable chunking, you need to disable batching (`DisableBatching=true`) concurrently.
+producer, err := client.CreateProducer(pulsar.ProducerOptions{
+  Topic:               "my-topic",
+  DisableBatching:     true,
+  EnableChunking:      true,
+})
+
+if err != nil {
+	log.Fatal(err)
+}
+defer producer.Close()
+```
+
 #### How to use schema interface in producer
 
 ```go
diff --git a/site2/docs/client-libraries-java.md b/site2/docs/client-libraries-java.md
index 2135c165a45b3..b35d7c13d910d 100644
--- a/site2/docs/client-libraries-java.md
+++ b/site2/docs/client-libraries-java.md
@@ -262,7 +262,6 @@ Mode     | Description
 The following is an example:
 
 ```java
-
 String pulsarBrokerRootUrl = "pulsar://localhost:6650";
 String topic = "persistent://my-tenant/my-namespace/my-topic";
 
@@ -272,7 +271,6 @@ Producer producer = pulsarClient.newProducer()
         .messageRoutingMode(MessageRoutingMode.SinglePartition)
         .create();
 producer.send("Partitioned topic message".getBytes());
-
 ```
 
 #### Custom message router
@@ -280,29 +278,24 @@ producer.send("Partitioned topic message".getBytes());
 To use a custom message router, you need to provide an implementation of the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface, which has just one `choosePartition` method:
 
 ```java
-
 public interface MessageRouter extends Serializable {
     int choosePartition(Message msg);
 }
-
 ```
 
 The following router routes every message to partition 10:
 
 ```java
-
 public class AlwaysTenRouter implements MessageRouter {
     public int choosePartition(Message msg) {
         return 10;
     }
 }
-
 ```
 
 With that implementation, you can send messages to partitioned topics as below.
 
 ```java
-
 String pulsarBrokerRootUrl = "pulsar://localhost:6650";
 String topic = "persistent://my-tenant/my-cluster-my-namespace/my-topic";
 
@@ -312,14 +305,12 @@ Producer producer = pulsarClient.newProducer()
         .messageRouter(new AlwaysTenRouter())
         .create();
 producer.send("Partitioned topic message".getBytes());
-
 ```
 
 #### How to choose partitions when using a key
 If a message has a key, it supersedes the round robin routing policy. The following example illustrates how to choose the partition when using a key.
 
 ```java
-
 // If the message has a key, it supersedes the round robin routing policy
         if (msg.hasKey()) {
             return signSafeMod(hash.makeHash(msg.getKey()), topicMetadata.numPartitions());
@@ -331,7 +322,6 @@ If a message has a key, it supersedes the round robin routing policy. The follow
         } else {
             return signSafeMod(PARTITION_INDEX_UPDATER.getAndIncrement(this), topicMetadata.numPartitions());
         }
-
 ```
 
 ### Async send
@@ -387,17 +377,16 @@ To enable chunking, you need to disable batching (`enableBatching`=`false`) conc
 
 ### Intercept messages
 
-`ProducerInterceptor`s intercept and possibly mutate messages received by the producer before they are published to the brokers.
+`ProducerInterceptor` intercepts and possibly mutates messages received by the producer before they are published to the brokers.
 
 The interface has three main events:
 * `eligible` checks if the interceptor can be applied to the message.
 * `beforeSend` is triggered before the producer sends the message to the broker. You can modify messages within this event.
 * `onSendAcknowledgement` is triggered when the message is acknowledged by the broker or the sending failed.
 
-To intercept messages, you can add one or multiple `ProducerInterceptor`s when creating a `Producer` as follows.
+To intercept messages, you can add a `ProducerInterceptor` or multiple ones when creating a `Producer` as follows.
 
 ```java
-
 Producer producer = client.newProducer()
         .topic(topic)
         .intercept(new ProducerInterceptor {
@@ -417,12 +406,11 @@ Producer producer = client.newProducer()
 			}
         })
         .create();
-
 ```
 
 :::note
 
-If you are using multiple interceptors, they apply in the order they are passed to the `intercept` method.
+Multiple interceptors apply in the order they are passed to the `intercept` method.
 
 :::
 
@@ -1141,6 +1129,7 @@ You can use the available parameters in the `loadConf` configuration or related
 |---|---|---|---|---
 | `topic` | string | yes | The topic name of the TableView. | N/A
 | `autoUpdatePartitionInterval` | int | no | The interval to check for newly added partitions. | 60 (seconds)
+| `subscriptionName` | string | no | The subscription name of the TableView. | null
 
 ### Register listeners
  
@@ -1158,7 +1147,7 @@ tv.forEach((key, value) -> /*operations on all existing messages*/)
 
 ## Schema
 
-In Pulsar, all message data consists of byte arrays "under the hood." [Message schemas](schema-get-started.md) enable you to use other types of data when constructing and handling messages (from simple types like strings to more complex, application-specific types). If you construct, say, a [producer](#producer) without specifying a schema, then the producer can only produce messages of type `byte[]`. The following is an example.
+In Pulsar, all message data consists of byte arrays "under the hood." [Message schemas](schema-overview.md) enable you to use other types of data when constructing and handling messages (from simple types like strings to more complex, application-specific types). If you construct, say, a [producer](#producer) without specifying a schema, then the producer can only produce messages of type `byte[]`. The following is an example.
 
 ```java
 Producer producer = client.newProducer()
@@ -1166,103 +1155,16 @@ Producer producer = client.newProducer()
         .create();
 ```
 
-The producer above is equivalent to a `Producer` (in fact, you should *always* explicitly specify the type). If you'd like to use a producer for a different type of data, you'll need to specify a **schema** that informs Pulsar which data type will be transmitted over the [topic](reference-terminology.md#topic).
-
-### AvroBaseStructSchema example
-
-Let's say that you have a `SensorReading` class that you'd like to transmit over a Pulsar topic:
-
-```java
-public class SensorReading {
-    public float temperature;
-
-    public SensorReading(float temperature) {
-        this.temperature = temperature;
-    }
-
-    // A no-arg constructor is required
-    public SensorReading() {
-    }
-
-    public float getTemperature() {
-        return temperature;
-    }
-
-    public void setTemperature(float temperature) {
-        this.temperature = temperature;
-    }
-}
-```
-
-You could then create a `Producer` (or `Consumer`) like this:
-
-```java
-Producer producer = client.newProducer(JSONSchema.of(SensorReading.class))
-        .topic("sensor-readings")
-        .create();
-```
-
-The following schema formats are currently available for Java:
-
-* No schema or the byte array schema (which can be applied using `Schema.BYTES`):
-
-  ```java
-  Producer bytesProducer = client.newProducer(Schema.BYTES)
-      .topic("some-raw-bytes-topic")
-      .create();
-  ```
-
-  Or, equivalently:
-
-  ```java
-  Producer bytesProducer = client.newProducer()
-      .topic("some-raw-bytes-topic")
-      .create();
-  ```
-
-* `String` for normal UTF-8-encoded string data. Apply the schema using `Schema.STRING`:
-
-  ```java
-  Producer stringProducer = client.newProducer(Schema.STRING)
-      .topic("some-string-topic")
-      .create();
-  ```
-
-* Create JSON schemas for POJOs using `Schema.JSON`. The following is an example.
-
-  ```java
-  Producer pojoProducer = client.newProducer(Schema.JSON(MyPojo.class))
-      .topic("some-pojo-topic")
-      .create();
-  ```
-
-* Generate Protobuf schemas using `Schema.PROTOBUF`. The following example shows how to create the Protobuf schema and use it to instantiate a new producer:
-
-  ```java
-  Producer protobufProducer = client.newProducer(Schema.PROTOBUF(MyProtobuf.class))
-      .topic("some-protobuf-topic")
-      .create();
-  ```
-
-* Define Avro schemas with `Schema.AVRO`. The following code snippet demonstrates how to create and use Avro schema.
-
-  ```java
-  Producer avroProducer = client.newProducer(Schema.AVRO(MyAvro.class))
-      .topic("some-avro-topic")
-      .create();
-  ```
-
-### ProtobufNativeSchema example
+The producer above is equivalent to a `Producer` (in fact, you should *always* explicitly specify the type). If you'd like to use a producer for a different type of data, you need to specify a **schema** that informs Pulsar which data type will be transmitted over the topic. For more examples, see [Schema - Get started](schema-get-started.md).
 
-For examples of ProtobufNativeSchema, see [`SchemaDefinition` in `Complex type`](schema-understand.md#complex-type).
 
 ## Authentication
 
-Pulsar currently supports the following authentication mechansims:
+Pulsar Java clients currently support the following authentication mechansims:
 * [TLS](security-tls-authentication.md#configure-tls-authentication-in-pulsar-clients)
 * [JWT](security-jwt.md#configure-jwt-authentication-in-pulsar-clients)
 * [Athenz](security-athenz.md#configure-athenz-authentication-in-pulsar-clients)
-* [Kerberos](security-kerberos.md#java-client-and-java-admin-client)
+* [Kerberos](security-kerberos.md#configure-kerberos-authentication-in-pulsar-clients)
 * [OAuth2](security-oauth2.md#configure-oauth2-authentication-in-pulsar-clients)
 * [HTTP basic](security-basic-auth.md#configure-basic-authentication-in-pulsar-clients)
 
diff --git a/site2/docs/client-libraries-node.md b/site2/docs/client-libraries-node.md
index 3986203dc2d8a..33715f7d774a8 100644
--- a/site2/docs/client-libraries-node.md
+++ b/site2/docs/client-libraries-node.md
@@ -4,29 +4,21 @@ title: The Pulsar Node.js client
 sidebar_label: "Node.js"
 ---
 
-The Pulsar Node.js client can be used to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Node.js.
-
-All the methods in [producers](#producers), [consumers](#consumers), and [readers](#readers) of a Node.js client are thread-safe.
+You can use a Pulsar Node.js client to create producers, consumers, and readers. For Pulsar features that Python clients support, see [Client Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914).
 
 For 1.3.0 or later versions, [type definitions](https://github.com/apache/pulsar-client-node/blob/master/index.d.ts) used in TypeScript are available.
 
 ## Installation
 
-You can install the [`pulsar-client`](https://www.npmjs.com/package/pulsar-client) library via [npm](https://www.npmjs.com/).
-
-### Requirements
-Pulsar Node.js client library is based on the C++ client library.
-Follow [these instructions](client-libraries-cpp.md#compilation) and install the Pulsar C++ client library.
-
-### Compatibility
-
-Compatibility between each version of the Node.js client and the C++ client is listed on [github](https://github.com/apache/pulsar-client-node/blob/master/README.md).
+:::tip
 
-If an incompatible version of the C++ client is installed, you may fail to build or run this library.
+Pulsar Node.js client library is based on the C++ client library. 
+* You must install the Pulsar C++ client library before installing a Node.js client. For more details, see [instructions](client-libraries-cpp.md).
+* If an incompatible version of the C++ client is installed, you may fail to build or run the Node.js library. For the compatibility between each version of the Node.js client and the C++ client, see [README](https://github.com/apache/pulsar-client-node/blob/master/README.md).
 
-### Installation using npm
+:::
 
-Install the `pulsar-client` library via [npm](https://www.npmjs.com/):
+Install the [`pulsar-client`](https://www.npmjs.com/package/pulsar-client) library via [npm](https://www.npmjs.com/):
 
 ```shell
 npm install pulsar-client
@@ -34,7 +26,7 @@ npm install pulsar-client
 
 :::note
 
-Also, this library works only in Node.js 10.x or later because it uses the [`node-addon-api`](https://github.com/nodejs/node-addon-api) module to wrap the C++ library.
+This library only works in Node.js 10.x or later versions because it uses the [`node-addon-api`](https://github.com/nodejs/node-addon-api) module to wrap the C++ library.
 
 :::
 
@@ -60,6 +52,10 @@ If you use [TLS](security-tls-authentication.md) authentication, add `+ssl` in t
 pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
+## Release notes
+
+For the changelog of Pulsar Node.js clients, see [release notes](/release-notes/#nodejs).
+
 ## Create a client
 
 To interact with Pulsar, you first need a client object. You can create a client instance using a `new` operator and the `Client` method, passing in a client options object (more on configuration [below](#client-configuration)).
diff --git a/site2/docs/client-libraries-python.md b/site2/docs/client-libraries-python.md
index 460d2ec477f8f..3c17c2e519c56 100644
--- a/site2/docs/client-libraries-python.md
+++ b/site2/docs/client-libraries-python.md
@@ -9,9 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 ````
 
-You can use a Pulsar Python client to create producers, consumers, and readers.
-
-All the methods in producer, consumer, and reader of a Python client are thread-safe. You can read the [API docs](/api/python) for the Python client.
+You can use a Pulsar Python client to create producers, consumers, and readers. For Pulsar features that Python clients support, see [Client Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914).
 
 ## Installation
 
@@ -63,9 +61,13 @@ If you use [TLS](security-tls-authentication.md) authentication, add `+ssl` in t
 pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
-## API Reference
+## API reference
+
+All the methods in producer, consumer, and reader of Pulsar Python clients are thread-safe. See the [API docs](@pulsar:apidoc:python@) for more details.
+
+## Release notes
 
-The complete Python API reference is available at [api/python](/api/python).
+For the changelog of Pulsar Python clients, see [release notes](/release-notes/#python).
 
 ## Examples
 
diff --git a/site2/docs/client-libraries-websocket.md b/site2/docs/client-libraries-websocket.md
index c154961be0676..554b46be02ebb 100644
--- a/site2/docs/client-libraries-websocket.md
+++ b/site2/docs/client-libraries-websocket.md
@@ -4,12 +4,11 @@ title: Pulsar WebSocket API
 sidebar_label: "WebSocket"
 ---
 
-Pulsar [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) API provides a simple way to interact with Pulsar using languages that do not have an official [client library](client-libraries.md). Through WebSocket, you can publish and consume messages and use features available on the [Client Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) page.
+Pulsar [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) API provides a simple way to interact with Pulsar using languages that do not have an official [client library](client-libraries.md). You can use Pulsar WebSocket API with any WebSocket client library. See [Python and Node.js examples](#client-examples) for more details. 
 
+Through WebSocket, you can publish and consume messages and use features available on the [Client Feature Matrix](https://docs.google.com/spreadsheets/d/1YHYTkIXR8-Ql103u-IMI18TXLlGStK8uJjDsOOA0T20/edit#gid=1784579914) page.
 
-> You can use Pulsar WebSocket API with any WebSocket client library. See examples for Python and Node.js [below](#client-examples).
-
-## Running the WebSocket service
+## Run the WebSocket service
 
 The standalone variant of Pulsar that we recommend using for [local development](getting-started-standalone.md) already has the WebSocket service enabled.
 
@@ -60,17 +59,21 @@ To enable encryption at rest on WebSocket service, add CryptoKeyReaderFactory fa
 cryptoKeyReaderFactoryClassName=org.apache.pulsar.MyCryptoKeyReaderFactoryClassImpl
 ```
 
-### Starting the broker
+### Start the broker
 
-When the configuration is set, you can start the service using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) tool:
+When the configuration is set, you can start the service using the [`pulsar-daemon`](reference-cli-tools.md) tool:
 
 ```shell
 bin/pulsar-daemon start websocket
 ```
 
+## Release notes
+
+For the changelog of Pulsar WebSocket APIs, see [release notes](/release-notes/#websocket).
+
 ## API Reference
 
-Pulsar's WebSocket API offers three endpoints for [producing](#producer-endpoint) messages, [consuming](#consumer-endpoint) messages and [reading](#reader-endpoint) messages.
+Pulsar's WebSocket API offers three endpoints for [producing](#producer-endpoint), [consuming](#consumer-endpoint), and [reading](#reader-endpoint) messages.
 
 All exchanges via the WebSocket API use JSON.
 
@@ -110,7 +113,7 @@ Key | Type | Required? | Explanation
 `encryptionKeys` | string | no | Encryption key to encrypt published message only if encryption reader is configured using cryptoKeyReaderFactoryClassName config in websocket-configuration.
 
 
-#### Publishing a message
+#### Publish a message
 
 ```json
 {
@@ -187,7 +190,7 @@ even if the client doesn't consume on the WebSocket.
 
 :::
 
-##### Receiving messages
+##### Receive messages
 
 Server will push messages on the WebSocket session:
 
@@ -247,7 +250,7 @@ Below are the parameters in the WebSocket consumer response.
   `keyValue` | string | yes | Encryption key (Base64 encoding)
   `metadata` | key-value pairs | no | Application-defined metadata
 
-#### Acknowledging the message
+#### Acknowledge the message
 
 Consumer needs to acknowledge the successful processing of the message to
 have the Pulsar broker delete it.
@@ -262,7 +265,7 @@ Key | Type | Required? | Explanation
 :---|:-----|:----------|:-----------
 `messageId`| string | yes | Message ID of the processed message
 
-#### Negatively acknowledging messages
+#### Negatively acknowledge messages
 
 ```json
 {
diff --git a/site2/docs/client-libraries.md b/site2/docs/client-libraries.md
index f76de91ed7a05..d47951f864381 100644
--- a/site2/docs/client-libraries.md
+++ b/site2/docs/client-libraries.md
@@ -6,14 +6,14 @@ sidebar_label: "Overview"
 
 Pulsar supports the following language-specific client libraries:
 
-| Language  | Documentation                                                        | Release note                                                                      | Code repo                                                             |
-| --------- | -------------------------------------------------------------------- | --------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| Java      | [User doc](client-libraries-java.md)   
     [API doc](/api/client/) | [Bundled](/release-notes/)                                                        | [Bundled](https://github.com/apache/pulsar/tree/master/pulsar-client) |
-| C++       | [User doc](client-libraries-cpp.md)    
     [API doc](/api/cpp/)    | [Bundled](/release-notes/)                                                        | [Standalone](https://github.com/apache/pulsar/pulsar-client-cpp)      |
-| Python    | [User doc](client-libraries-python.md) 
     [API doc](/api/python/) | [Bundled](/release-notes/)                                                        | [Standalone](https://github.com/apache/pulsar-client-python)          |
-| Go client | [User doc](client-libraries-go.md)                                   | [Standalone](https://github.com/apache/pulsar-client-go/releases)                 | [Standalone](https://github.com/apache/pulsar-client-go)              |
-| Node.js   | [User doc](client-libraries-node.md)                                 | [Standalone](https://github.com/apache/pulsar-client-node/releases)               | [Standalone](https://github.com/apache/pulsar-client-node)            |
-| C#        | [User doc](client-libraries-dotnet.md)                               | [Standalone](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG.md) | [Standalone](https://github.com/apache/pulsar-dotpulsar)              |
+| Language  | Documentation                                                                     | Release note                                                                      | Code repo                                                             |
+| --------- |-----------------------------------------------------------------------------------| --------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| Java      | [User doc](client-libraries-java.md)   
     [API doc](/api/client/)              | [Bundled](/release-notes/)                                                        | [Bundled](https://github.com/apache/pulsar/tree/master/pulsar-client) |
+| C++       | [User doc](client-libraries-cpp.md)    
     [API doc](pathname:///api/cpp/3.0.0) | [Bundled](/release-notes/)                                                        | [Standalone](https://github.com/apache/pulsar-client-cpp)      |
+| Python    | [User doc](client-libraries-python.md) 
     [API doc](@pulsar:apidoc:python@)    | [Bundled](/release-notes/)                                                        | [Standalone](https://github.com/apache/pulsar-client-python)          |
+| Go client | [User doc](client-libraries-go.md)                                                | [Standalone](https://github.com/apache/pulsar-client-go/releases)                 | [Standalone](https://github.com/apache/pulsar-client-go)              |
+| Node.js   | [User doc](client-libraries-node.md)                                              | [Standalone](https://github.com/apache/pulsar-client-node/releases)               | [Standalone](https://github.com/apache/pulsar-client-node)            |
+| C#        | [User doc](client-libraries-dotnet.md)                                            | [Standalone](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG.md) | [Standalone](https://github.com/apache/pulsar-dotpulsar)              |
 
 Pulsar supports the following language-agnostic client libraries:
 
diff --git a/site2/docs/concepts-messaging.md b/site2/docs/concepts-messaging.md
index 617982393ac31..357840b8a9452 100644
--- a/site2/docs/concepts-messaging.md
+++ b/site2/docs/concepts-messaging.md
@@ -300,6 +300,12 @@ If batching is enabled, all messages in one batch are redelivered to the consume
 
 ### Acknowledgment timeout
 
+:::note
+
+By default, the acknowledge timeout is disabled and that means that messages delivered to a consumer will not be re-delivered unless the consumer crashes.
+
+:::
+
 The acknowledgment timeout mechanism allows you to set a time range during which the client tracks the unacknowledged messages. After this acknowledgment timeout (`ackTimeout`) period, the client sends `redeliver unacknowledged messages` request to the broker, thus the broker resends the unacknowledged messages to the consumer.
 
 You can configure the acknowledgment timeout mechanism to redeliver the message if it is not acknowledged after `ackTimeout` or to execute a timer task to check the acknowledgment timeout messages during every `ackTimeoutTickTime` period.
@@ -357,7 +363,7 @@ consumer.acknowledge(message);
 
 ### Retry letter topic
 
-The retry letter topic allows you to store the messages that failed to be consumed and retry consuming them later. With this method, you can customize the interval at which the messages are redelivered. Consumers on the original topic are automatically subscribed to the retry letter topic as well. Once the maximum number of retries has been reached, the unconsumed messages are moved to a [dead letter topic](#dead-letter-topic) for manual processing.
+Retry letter topic allows you to store the messages that failed to be consumed and retry consuming them later. With this method, you can customize the interval at which the messages are redelivered. Consumers on the original topic are automatically subscribed to the retry letter topic as well. Once the maximum number of retries has been reached, the unconsumed messages are moved to a [dead letter topic](#dead-letter-topic) for manual processing. The functionality of a retry letter topic is implemented by consumers. 
 
 The diagram below illustrates the concept of the retry letter topic.
 ![](/assets/retry-letter-topic.svg)
@@ -443,7 +449,7 @@ consumer.reconsumeLater(msg, customProperties, 3, TimeUnit.SECONDS);
 
 ### Dead letter topic
 
-Dead letter topic allows you to continue message consumption even when some messages are not consumed successfully. The messages that have failed to be consumed are stored in a specific topic, which is called the dead letter topic. You can decide how to handle the messages in the dead letter topic.
+Dead letter topic allows you to continue message consumption even when some messages are not consumed successfully. The messages that have failed to be consumed are stored in a specific topic, which is called the dead letter topic. The functionality of a dead letter topic is implemented by consumers. You can decide how to handle the messages in the dead letter topic. 
 
 Enable dead letter topic in a Java client using the default dead letter topic.
 
@@ -525,7 +531,7 @@ If no tenant or namespace is specified when a client creates a topic, the topic
 
 ## Namespaces
 
-A namespace is a logical nomenclature within a tenant. A tenant creates namespaces via the [admin API](admin-api-namespaces.md#create). For instance, a tenant with different applications can create a separate namespace for each application. A namespace allows the application to create and manage a hierarchy of topics. The topic `my-tenant/app1` is a namespace for the application `app1` for `my-tenant`. You can create any number of [topics](#topics) under the namespace.
+A namespace is a logical nomenclature within a tenant. A tenant creates namespaces via the [admin API](admin-api-namespaces.md#create-namespaces). For instance, a tenant with different applications can create a separate namespace for each application. A namespace allows the application to create and manage a hierarchy of topics. The topic `my-tenant/app1` is a namespace for the application `app1` for `my-tenant`. You can create any number of [topics](#topics) under the namespace.
 
 ## Subscriptions
 
@@ -570,7 +576,7 @@ In the *Failover* type, multiple consumers can attach to the same subscription.
 
 For example, a partitioned topic has 3 partitions, and 15 consumers. Each partition will have 1 active consumer and 4 stand-by consumers.
 
-In the diagram below, **Consumer A** is the master consumer while **Consumer B** would be the next consumer in line to receive messages if **Consumer B** is disconnected.
+In the diagram below, **Consumer A** is the master consumer while **Consumer B** would be the next consumer in line to receive messages if **Consumer A** is disconnected.
 
 ![Failover subscriptions](/assets/pulsar-failover-subscriptions.svg)
 
@@ -712,7 +718,7 @@ After a consumer is created, the default subscription mode of the consumer is `D
 
 ````
 
-For how to create, check, or delete a durable subscription, see [manage subscriptions](admin-api-topics.md/#manage-subscriptions).
+For how to create, check, or delete a durable subscription, see [manage subscriptions](admin-api-topics.md#manage-subscriptions).
 
 ## Multi-topic subscriptions
 
@@ -846,7 +852,7 @@ Non-persistent messaging is usually faster than persistent messaging because bro
 
 Producers and consumers can connect to non-persistent topics in the same way as persistent topics, with the crucial difference that the topic name must start with `non-persistent`. All the subscription types---[exclusive](#exclusive), [shared](#shared), [key-shared](#key_shared) and [failover](#failover)---are supported for non-persistent topics.
 
-Here's an example [Java consumer](client-libraries-java.md#consumers) for a non-persistent topic:
+Here's an example [Java consumer](client-libraries-java.md#consumer) for a non-persistent topic:
 
 ```java
 PulsarClient client = PulsarClient.builder()
diff --git a/site2/docs/concepts-replication.md b/site2/docs/concepts-replication.md
index a47cd6038dc0f..64120d73e1e8c 100644
--- a/site2/docs/concepts-replication.md
+++ b/site2/docs/concepts-replication.md
@@ -43,7 +43,7 @@ Pulsar provides a great degree of flexibility for customizing your replication s
 
 ### Full-mesh replication
 
-Using full-mesh replication and applying the [selective message replication](administration-geo.md/#selective-replication), you can customize your replication strategies and topologies between any number of data centers.
+Using full-mesh replication and applying the [selective message replication](administration-geo.md#selective-replication), you can customize your replication strategies and topologies between any number of data centers.
 
 ![An example of a full-mesh replication pattern](/assets/full-mesh-replication.svg)
 
@@ -53,7 +53,7 @@ Active-active replication is a variation of full-mesh replication, with only two
 
 ![An example of an active-active replication pattern](/assets/active-active-replication.svg)
 
-For how to use active-active replication to migrate data between clusters, refer to [here](administration-geo.md/#migrate-data-between-clusters-using-geo-replication).
+For how to use active-active replication to migrate data between clusters, refer to [here](administration-geo.md#migrate-data-between-clusters-using-geo-replication).
 
 ### Aggregation replication
 
diff --git a/site2/docs/cookbooks-compaction.md b/site2/docs/cookbooks-compaction.md
index 95403af461d16..561acd59bd81f 100644
--- a/site2/docs/cookbooks-compaction.md
+++ b/site2/docs/cookbooks-compaction.md
@@ -4,7 +4,7 @@ title: Topic compaction
 sidebar_label: "Topic compaction"
 ---
 
-Pulsar's [topic compaction](concepts-topic-compaction.md#compaction) feature enables you to create **compacted** topics in which older, "obscured" entries are pruned from the topic, allowing for faster reads through the topic's history (which messages are deemed obscured/outdated/irrelevant will depend on your use case).
+Pulsar's [topic compaction](concepts-topic-compaction.md#topic-compaction-example-the-stock-ticker) feature enables you to create **compacted** topics in which older, "obscured" entries are pruned from the topic, allowing for faster reads through the topic's history (which messages are deemed obscured/outdated/irrelevant will depend on your use case).
 
 To use compaction:
 
@@ -49,7 +49,7 @@ bin/pulsar-admin topics compact \
 persistent://my-tenant/my-namespace/my-topic
 ```
 
-The `pulsar-admin` tool runs compaction via the Pulsar {@inject: rest:REST:/} API. To run compaction in its own dedicated process, i.e. *not* through the REST API, you can use the [`pulsar compact-topic`](reference-cli-tools.md#pulsar-compact-topic) command. Here's an example:
+The `pulsar-admin` tool runs compaction via the Pulsar {@inject: rest:REST:/} API. To run compaction in its own dedicated process, i.e. *not* through the REST API, you can use the [`pulsar compact-topic`](reference-cli-tools.md) command. Here's an example:
 
 ```bash
 bin/pulsar compact-topic \
diff --git a/site2/docs/cookbooks-deduplication.md b/site2/docs/cookbooks-deduplication.md
index 976670e87aa50..4cf14141e63f3 100644
--- a/site2/docs/cookbooks-deduplication.md
+++ b/site2/docs/cookbooks-deduplication.md
@@ -84,7 +84,7 @@ The instructions for Java, Python, and C++ clients are different.
   values={[{"label":"Java clients","value":"Java clients"},{"label":"Python clients","value":"Python clients"},{"label":"C++ clients","value":"C++ clients"}]}>
 
 
-To ensure the guarantee order on a [Java producer](client-libraries-java.md#producers) sending to a topic with message deduplication enabled, set the producer name using the `producerName` setter, and set the timeout to `0` using the `sendTimeout` setter. 
+To ensure the guarantee order on a [Java producer](client-libraries-java.md#producer) sending to a topic with message deduplication enabled, set the producer name using the `producerName` setter, and set the timeout to `0` using the `sendTimeout` setter. 
 
 ```java
 import org.apache.pulsar.client.api.Producer;
@@ -104,7 +104,7 @@ Producer producer = pulsarClient.newProducer()
 
 
 
-Not to break the guarantee order on a [Python producer](client-libraries-python.md#producers) sending to a topic with message deduplication active, set the producer name using `producer_name`, and set the timeout to `0` using `send_timeout_millis`. 
+Not to break the guarantee order on a [Python producer](client-libraries-python.md) sending to a topic with message deduplication active, set the producer name using `producer_name`, and set the timeout to `0` using `send_timeout_millis`. 
 
 ```python
 import pulsar
@@ -118,7 +118,7 @@ producer = client.create_producer(
 
 
 
-Not to break the guarantee order on a [C++ producer](client-libraries-cpp.md#producer) sending to a topic with message deduplication active, set the producer name using `producer_name`, and set the timeout to `0` using `send_timeout_millis`. 
+Not to break the guarantee order on a [C++ producer](client-libraries-cpp.md#create-a-producer) sending to a topic with message deduplication active, set the producer name using `producer_name`, and set the timeout to `0` using `send_timeout_millis`. 
 
 ```cpp
 #include 
diff --git a/site2/docs/cookbooks-encryption.md b/site2/docs/cookbooks-encryption.md
index 9ea64d2a5c026..98f9347b94fff 100644
--- a/site2/docs/cookbooks-encryption.md
+++ b/site2/docs/cookbooks-encryption.md
@@ -5,7 +5,8 @@ sidebar_label: "Encryption"
 ---
 
 ````mdx-code-block
-import {Redirect} from '@docusaurus/router';
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from "@docusaurus/router";
 
-
+
 ````
\ No newline at end of file
diff --git a/site2/docs/cookbooks-non-persistent.md b/site2/docs/cookbooks-non-persistent.md
index ca8b4b76db8e8..9e1de5652c6c1 100644
--- a/site2/docs/cookbooks-non-persistent.md
+++ b/site2/docs/cookbooks-non-persistent.md
@@ -7,12 +7,12 @@ sidebar_label: "Non-persistent messaging"
 **Non-persistent topics** are Pulsar topics in which message data is *never* [persistently stored](concepts-architecture-overview.md#persistent-storage) and kept only in memory. This cookbook provides:
 
 * A basic [conceptual overview](#overview) of non-persistent topics
-* Information about [configurable parameters](#configuration) related to non-persistent topics
-* A guide to the [CLI interface](#cli) for managing non-persistent topics
+* Information about [configurable parameters](#configuration-for-standalone-mode) related to non-persistent topics
+* A guide to the [CLI interface](#manage-with-cli) for managing non-persistent topics
 
 ## Overview
 
-By default, Pulsar persistently stores *all* unacknowledged messages on multiple [BookKeeper](#persistent-storage) bookies (storage nodes). Data for messages on persistent topics can thus survive broker restarts and subscriber failover.
+By default, Pulsar persistently stores *all* unacknowledged messages on multiple bookies (storage nodes). Data for messages on persistent topics can thus survive broker restarts and subscriber failover.
 
 Pulsar also, however, supports **non-persistent topics**, which are topics on which messages are *never* persisted to disk and live only in memory. When using non-persistent delivery, killing a Pulsar [broker](reference-terminology.md#broker) or disconnecting a subscriber to a topic means that all in-transit messages are lost on that (non-persistent) topic, meaning that clients may see message loss.
 
@@ -26,7 +26,7 @@ non-persistent://tenant/namespace/topic
 
 ## Use
 
-To use non-persistent topics, you need to [enable](#enable) them in your Pulsar broker configuration and differentiate them by name when interacting with them. This [`pulsar-client produce`](reference-cli-tools.md#pulsar-client-produce) command, for example, would produce one message on a non-persistent topic in a standalone cluster:
+To use non-persistent topics, you need to [enable](#enable) them in your Pulsar broker configuration and differentiate them by name when interacting with them. This [`pulsar-client produce`](reference-cli-tools.md) command, for example, would produce one message on a non-persistent topic in a standalone cluster:
 
 ```bash
 bin/pulsar-client produce non-persistent://public/default/example-np-topic \
diff --git a/site2/docs/cookbooks-retention-expiry.md b/site2/docs/cookbooks-retention-expiry.md
index e50beb0fb39d0..5d75fb58c7252 100644
--- a/site2/docs/cookbooks-retention-expiry.md
+++ b/site2/docs/cookbooks-retention-expiry.md
@@ -21,7 +21,7 @@ In Pulsar, you can modify this behavior, with namespace granularity, in two ways
 * You can persistently store messages that are not within a backlog (because they've been acknowledged by every existing subscription, or because there are no subscriptions) by setting [retention policies](#retention-policies).
 * Messages that are not acknowledged within a specified timeframe can be automatically acknowledged, by specifying the [time to live](#time-to-live-ttl) (TTL).
 
-Pulsar's [admin interface](admin-api-overview.md) enables you to manage both retention policies and TTL with namespace granularity (and thus within a specific tenant and either on a specific cluster or in the [`global`](concepts-architecture-overview.md#global-cluster) cluster).
+Pulsar's [admin interface](admin-api-overview.md) enables you to manage both retention policies and TTL with namespace granularity (and thus within a specific tenant and either on a specific cluster or in the [`global`](concepts-architecture-overview.md#clusters) cluster).
 
 
 > #### Retention and TTL solve two different problems
diff --git a/site2/docs/deploy-aws.md b/site2/docs/deploy-aws.md
index b4045b996956a..da954e94a49a4 100644
--- a/site2/docs/deploy-aws.md
+++ b/site2/docs/deploy-aws.md
@@ -1,7 +1,7 @@
 ---
 id: deploy-aws
-title: Deploying a Pulsar cluster on AWS using Terraform and Ansible
-sidebar_label: "Amazon Web Services"
+title: Deploy a Pulsar cluster on AWS using Terraform and Ansible
+sidebar_label: "Terraform (AWS)"
 ---
 
 > For instructions on deploying a single Pulsar cluster manually rather than using Terraform and Ansible, see [Deploying a Pulsar cluster on bare metal](deploy-bare-metal.md). For instructions on manually deploying a multi-cluster Pulsar instance, see [Deploying a Pulsar instance on bare metal](deploy-bare-metal-multi-cluster.md).
@@ -126,7 +126,7 @@ When you run the Ansible playbook, the following AWS resources are used:
   * 3 small VMs for ZooKeeper ([t3.small](https://www.ec2instances.info/?selected=t3.small) instances)
   * 3 larger VMs for BookKeeper [bookies](reference-terminology.md#bookie) ([i3.xlarge](https://www.ec2instances.info/?selected=i3.xlarge) instances)
   * 2 larger VMs for Pulsar [brokers](reference-terminology.md#broker) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
-  * 1 larger VMs for Pulsar [proxy](reference-terminology.md#proxy) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
+  * 1 larger VMs for Pulsar [proxy](reference-terminology.md) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
 * An EC2 [security group](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html)
 * A [virtual private cloud](https://aws.amazon.com/vpc/) (VPC) for security
 * An [API Gateway](https://aws.amazon.com/api-gateway/) for connections from the outside world
@@ -200,7 +200,7 @@ ansible-playbook \
 
 ## Access the cluster
 
-You can now access your running Pulsar using the unique Pulsar connection URL for your cluster, which you can obtain following the instructions [above](#fetching-your-pulsar-connection-url).
+You can now access your running Pulsar using the unique Pulsar connection URL for your cluster, which you can obtain following the instructions [above](#fetch-your-pulsar-connection-url).
 
 For a quick demonstration of accessing the cluster, we can use the Python client for Pulsar and the Python shell. First, install the Pulsar Python module using pip:
 
diff --git a/site2/docs/deploy-bare-metal-multi-cluster.md b/site2/docs/deploy-bare-metal-multi-cluster.md
index 5ea4f035cf34b..ac4add4a0ab6d 100644
--- a/site2/docs/deploy-bare-metal-multi-cluster.md
+++ b/site2/docs/deploy-bare-metal-multi-cluster.md
@@ -61,7 +61,7 @@ The Pulsar binary package initially contains the following directories:
 
 Directory | Contains
 :---------|:--------
-`bin` | [Command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](/tools/pulsar-admin/)
+`bin` | [Command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md) and [`pulsar-admin`](/tools/pulsar-admin/)
 `conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
 `examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
 `lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files that Pulsar uses 
@@ -117,7 +117,7 @@ echo 1 > data/zookeeper/myid
 
 On `zk2.us-west.example.com` the command looks like `echo 2 > data/zookeeper/myid` and so on.
 
-Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```shell
 bin/pulsar-daemon start zookeeper
@@ -133,7 +133,7 @@ If you deploy a single-cluster instance, you do not need a separate cluster for
 
 If your Pulsar instance consists of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but run on different TCP ports.
 
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers to the local quorum. You need to use the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
+To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers to the local quorum. You need to use the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#deploy-local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
 
 ```properties
 clientPort=2184
@@ -191,7 +191,7 @@ peerType=observer
 
 ##### Start the service
 
-Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
+Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md)
 
 ```shell
 bin/pulsar-daemon start configuration-store
@@ -201,7 +201,7 @@ bin/pulsar-daemon start configuration-store
 
 Once you set up the cluster-specific ZooKeeper and configuration store quorums for your instance, you need to write some metadata to ZooKeeper for each cluster in your instance. **you only need to write these metadata once**.
 
-You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. The following is an example:
+You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md) command of the [`pulsar`](reference-cli-tools.md) CLI tool. The following is an example:
 
 ```shell
 bin/pulsar initialize-cluster-metadata \
@@ -240,13 +240,13 @@ You can configure BookKeeper bookies using the [`conf/bookkeeper.conf`](referenc
 
 You can start a bookie in two ways: in the foreground or as a background daemon.
 
-To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```bash
 bin/pulsar-daemon start bookie
 ```
 
-You can verify that the bookie works properly using the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
+You can verify that the bookie works properly using the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md):
 
 ```bash
 bin/bookkeeper shell bookiesanity
@@ -254,7 +254,7 @@ bin/bookkeeper shell bookiesanity
 
 This command creates a new ledger on the local bookie, writes a few entries, reads them back and finally deletes the ledger.
 
-After you have started all bookies, you can use the `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to verify that all bookies in the cluster are running.
+After you have started all bookies, you can use the `simpletest` command for [BookKeeper shell](reference-cli-tools.md) on any bookie node, to verify that all bookies in the cluster are running.
 
 ```bash
 bin/bookkeeper shell simpletest --ensemble  --writeQuorum  --ackQuorum  --numEntries 
@@ -315,13 +315,13 @@ Pulsar brokers do not require any special hardware since they do not use the loc
 
 ### Start the broker service
 
-You can start a broker in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+You can start a broker in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```shell
 bin/pulsar-daemon start broker
 ```
 
-You can also start brokers in the foreground by using [`pulsar broker`](reference-cli-tools.md#broker):
+You can also start brokers in the foreground by using [`pulsar broker`](reference-cli-tools.md):
 
 ```shell
 bin/pulsar broker
@@ -373,7 +373,7 @@ bin/pulsar-admin namespaces create test-tenant/ns1
 ##### Test producer and consumer
 
 
-Everything is now ready to send and receive messages. The quickest way to test the system is through the [`pulsar-perf`](reference-cli-tools.md#pulsar-perf) client tool.
+Everything is now ready to send and receive messages. The quickest way to test the system is through the [`pulsar-perf`](reference-cli-tools.md) client tool.
 
 
 You can use a topic in the namespace that you have just created. Topics are automatically created the first time when a producer or a consumer tries to use them.
diff --git a/site2/docs/deploy-bare-metal.md b/site2/docs/deploy-bare-metal.md
index 1abab93621324..d30fb286326c0 100644
--- a/site2/docs/deploy-bare-metal.md
+++ b/site2/docs/deploy-bare-metal.md
@@ -118,13 +118,13 @@ The extracted directory contains the following subdirectories:
 
 Directory | Contains
 :---------|:--------
-`bin` |[command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](/tools/pulsar-admin/)
+`bin` |[command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md) and [`pulsar-admin`](/tools/pulsar-admin/)
 `conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
 `data` | The data storage directory that ZooKeeper and BookKeeper use
 `lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files that Pulsar uses
 `logs` | Logs that the installation creates
 
-## [Install Built-in Connectors (optional)](/standalone.md#install-built-in-connectors-optional)
+## Install Built-in Connectors (optional)
 
 > Since Pulsar release `2.1.0-incubating`, Pulsar provides a separate binary distribution, containing all the `built-in` connectors.
 > To enable the `built-in` connectors (optional), you can follow the instructions below.
@@ -155,7 +155,7 @@ pulsar-io-aerospike-@pulsar:version@.nar
 ...
 ```
 
-## [Install Tiered Storage Offloaders (optional)](/standalone.md#install-tiered-storage-offloaders-optional)
+## Install Tiered Storage Offloaders (optional)
 
 > Since Pulsar release `2.2.0`, Pulsar releases a separate binary distribution, containing the tiered storage offloaders.
 > If you want to enable tiered storage feature, you can follow the instructions as below; otherwise you can
@@ -231,7 +231,7 @@ echo 1 > data/zookeeper/myid
 
 On `zk2.us-west.example.com`, the command is `echo 2 > data/zookeeper/myid` and so on.
 
-Once you add each server to the `zookeeper.conf` configuration and have the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+Once you add each server to the `zookeeper.conf` configuration and have the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```bash
 bin/pulsar-daemon start zookeeper
@@ -244,13 +244,13 @@ bin/pulsar-daemon start zookeeper
 
 Once you deploy ZooKeeper for your cluster, you need to write some metadata to ZooKeeper. You only need to write this data **once**.
 
-You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. This command can be run on any machine in your Pulsar cluster, so the metadata can be initialized from a ZooKeeper, broker, or bookie machine. The following is an example:
+You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md) command of the [`pulsar`](reference-cli-tools.md) CLI tool. This command can be run on any machine in your Pulsar cluster, so the metadata can be initialized from a ZooKeeper, broker, or bookie machine. The following is an example:
 
 ```shell
 bin/pulsar initialize-cluster-metadata \
 --cluster pulsar-cluster-1 \
---metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
---configuration-metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
+--metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181 \
+--configuration-metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181 \
 --web-service-url http://pulsar.us-west.example.com:8080 \
 --web-service-url-tls https://pulsar.us-west.example.com:8443 \
 --broker-service-url pulsar://pulsar.us-west.example.com:6650 \
@@ -305,7 +305,7 @@ Once you appropriately modify the `zkServers` parameter, you can make any other
 
 Once you apply the desired configuration in `conf/bookkeeper.conf`, you can start up a bookie on each of your BookKeeper hosts. You can start up each bookie either in the background, using [nohup](https://en.wikipedia.org/wiki/Nohup), or in the foreground.
 
-To start the bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+To start the bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```bash
 bin/pulsar-daemon start bookie
@@ -317,7 +317,7 @@ To start the bookie in the foreground:
 bin/pulsar bookie
 ```
 
-You can verify that a bookie works properly by running the `bookiesanity` command on the [BookKeeper shell](reference-cli-tools.md#shell):
+You can verify that a bookie works properly by running the `bookiesanity` command on the [BookKeeper shell](reference-cli-tools.md):
 
 ```bash
 bin/bookkeeper shell bookiesanity
@@ -325,7 +325,7 @@ bin/bookkeeper shell bookiesanity
 
 This command creates an ephemeral BookKeeper ledger on the local bookie, writes a few entries, reads them back, and finally deletes the ledger.
 
-After you start all the bookies, you can use `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to verify all the bookies in the cluster are up running.
+After you start all the bookies, you can use `simpletest` command for [BookKeeper shell](reference-cli-tools.md) on any bookie node, to verify all the bookies in the cluster are up running.
 
 ```bash
 bin/bookkeeper shell simpletest --ensemble  --writeQuorum  --ackQuorum  --numEntries 
@@ -343,8 +343,8 @@ Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Bro
 The most important element of broker configuration is ensuring that each broker is aware of the ZooKeeper cluster that you have deployed. Ensure that the [`metadataStoreUrl`](reference-configuration.md#broker) and [`configurationMetadataStoreUrl`](reference-configuration.md#broker) parameters are correct. In this case, since you only have 1 cluster and no configuration store setup, the `configurationMetadataStoreUrl` point to the same `metadataStoreUrl`.
 
 ```properties
-metadataStoreUrl=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-configurationMetadataStoreUrl=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
+metadataStoreUrl=zk://zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
+configurationMetadataStoreUrl=zk://zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
 ```
 
 You also need to specify the cluster name (matching the name that you provided when you [initialize the metadata of the cluster](#initialize-cluster-metadata)):
@@ -398,13 +398,13 @@ If you want to learn more options about deploying the functions worker, check ou
 
 You can then provide any other configuration changes that you want in the [`conf/broker.conf`](reference-configuration.md#broker) file. Once you decide on a configuration, you can start up the brokers for your Pulsar cluster. Like ZooKeeper and BookKeeper, you can start brokers either in the foreground or in the background, using nohup.
 
-You can start a broker in the foreground using the [`pulsar broker`](reference-cli-tools.md#pulsar-broker) command:
+You can start a broker in the foreground using the [`pulsar broker`](reference-cli-tools.md) command:
 
 ```bash
 bin/pulsar broker
 ```
 
-You can start a broker in the background using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+You can start a broker in the background using the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
 ```bash
 bin/pulsar-daemon start broker
@@ -414,7 +414,7 @@ Once you successfully start up all the brokers that you intend to use, your Puls
 
 ## Connect to the running cluster
 
-Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool, which is included with the Pulsar binary package. The `pulsar-client` tool can publish messages to and consume messages from Pulsar topics and thus provide a simple way to make sure that your cluster runs properly.
+Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the [`pulsar-client`](reference-cli-tools.md) tool, which is included with the Pulsar binary package. The `pulsar-client` tool can publish messages to and consume messages from Pulsar topics and thus provide a simple way to make sure that your cluster runs properly.
 
 To use the `pulsar-client` tool, first modify the client configuration file in [`conf/client.conf`](reference-configuration.md#client) in your binary package. You need to change the values for `webServiceUrl` and `brokerServiceUrl`, substituting `localhost` (which is the default), with the DNS name that you assign to your broker/bookie hosts. The following is an example:
 
diff --git a/site2/docs/deploy-dcos.md b/site2/docs/deploy-dcos.md
index 650d29b594d2b..6186523a5f1f9 100644
--- a/site2/docs/deploy-dcos.md
+++ b/site2/docs/deploy-dcos.md
@@ -6,7 +6,7 @@ sidebar_label: "DC/OS"
 
 :::tip
 
-To enable all built-in [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, we recommend you use `apachepulsar/pulsar-all` image instead of `apachepulsar/pulsar` image; the former has already bundled [all built-in connectors](io-overview.md#working-with-connectors).
+To enable all built-in [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, we recommend you use `apachepulsar/pulsar-all` image instead of `apachepulsar/pulsar` image; the former has already bundled [all built-in connectors](io-overview.md#work-with-connector).
 
 :::
 
diff --git a/site2/docs/deploy-kubernetes.md b/site2/docs/deploy-kubernetes.md
index 7455247c901d4..f6edc27fc96f5 100644
--- a/site2/docs/deploy-kubernetes.md
+++ b/site2/docs/deploy-kubernetes.md
@@ -1,10 +1,27 @@
 ---
 id: deploy-kubernetes
-title: Deploy Pulsar on Kubernetes
+title: Overview
 sidebar_label: "Kubernetes"
 ---
 
-To get up and running with these charts as fast as possible, in a **non-production** use case, we provide
-a [quick start guide](getting-started-helm.md) for Proof of Concept (PoC) deployments.
+The Apache Pulsar Helm Chart provides one of the most convenient ways to deploy and operate Pulsar on Kubernetes. With all the required components, the Helm Chart is scalable and thus suitable for large-scale deployments.
 
-To configure and install a Pulsar cluster on Kubernetes for production usage, follow the complete [Installation Guide](helm-install.md).
\ No newline at end of file
+The Apache Pulsar Helm Chart contains all components to support the features and functions that Pulsar delivers. You can install and configure these components separately. See [README](https://github.com/apache/pulsar-helm-chart#readme) for more details.
+
+## What's Next?
+
+* To get up and running with Pulsar Helm Chart as fast as possible for Proof of Concept (PoC) in a **non-production** use case, see the [Quick Start Guide](getting-started-helm.md). 
+
+* To get up and running with Pulsar Helm Chart in production under sustained load, see the [preparations](helm-prepare.md) and [Deployment Guide](helm-deploy.md).
+
+* To upgrade your existing Pulsar Helm Chart, see the [Upgrade Guide](helm-upgrade.md).
+
+:::tip
+
+* Templating in Helm is done through Golang's [text/template](https://golang.org/pkg/text/template/) and [sprig](https://godoc.org/github.com/Masterminds/sprig). For more information about how all the inner workings behave, check these documents:
+  - [Functions and Pipelines](https://helm.sh/docs/chart_template_guide/functions_and_pipelines/)
+  - [Subcharts and Globals](https://helm.sh/docs/chart_template_guide/subcharts_and_globals/)
+
+* For additional information on developing with Helm, check [tips and tricks](https://helm.sh/docs/howto/charts_tips_and_tricks/) in the Helm repository.
+
+:::
\ No newline at end of file
diff --git a/site2/docs/develop-load-manager.md b/site2/docs/develop-load-manager.md
index 244296c4dbac8..2d8f4ecb1e18b 100644
--- a/site2/docs/develop-load-manager.md
+++ b/site2/docs/develop-load-manager.md
@@ -89,7 +89,7 @@ There are a few different ways to determine which load manager is being used:
    }
    ```
 
-3. The command-line [broker monitor](reference-cli-tools.md#monitor-brokers) will have a different output format depending on which load manager implementation is being used.
+3. The command-line [broker monitor](reference-cli-tools.md) will have a different output format depending on which load manager implementation is being used.
 
    Here is an example from the modular load manager:
 
diff --git a/site2/docs/developers-landing.md b/site2/docs/developers-landing.md
index df03e4fe318be..f5c8ccee181d3 100644
--- a/site2/docs/developers-landing.md
+++ b/site2/docs/developers-landing.md
@@ -1,12 +1,12 @@
 ---
 id: developers-landing
 title: Pulsar for Developers
-sidebar_label: "get started"
+sidebar_label: "Pulsar for Developers"
 ---
 
 Developing applications for Pulsar can be a fun and rewarding experience. With Pulsar, you can quickly create, deploy, and manage your services using a powerful CLI tool and a comprehensive set of libraries. The topics below will get you started!
 
-- [Simulation tools](develop-tools.md)
-- [Developing binary protocol](developing-binary-protocol.md)
-- [Modular load manager](develop-load-manager.md)
-- [Pulsar plugin development](develop-plugin.md)
+- [Develop simulation tools](develop-tools.md)
+- [Develop binary protocol](developing-binary-protocol.md)
+- [Develop load manager](develop-load-manager.md)
+- [Develop Pulsar plugin](develop-plugin.md)
diff --git a/site2/docs/functions-cli.md b/site2/docs/functions-cli.md
index 42bd38dc31021..f99ba32b8b3a2 100644
--- a/site2/docs/functions-cli.md
+++ b/site2/docs/functions-cli.md
@@ -34,7 +34,7 @@ You can configure a function by using a predefined YAML file. The following tabl
 | customSchemaOutputs  | Map``         | `--custom-schema-outputs`  | The mapping from output topics to schema properties.|
 | inputSpecs           | Map`` | `--input-specs` | The mapping from inputs to custom configurations.|
 | output               | String                     | `-o`, `--output`           | The output topic of a function. If none is specified, no output is written.  |
-| producerConfig       | [ProducerConfig](#produceconfig)  | `--producer-config` | The custom configurations for producers.  |
+| producerConfig       | [ProducerConfig](#producerconfig)  | `--producer-config` | The custom configurations for producers.  |
 | outputSchemaType     | String                     | `-st`, `--schema-type`     | The built-in schema type or custom schema class name used for message outputs.   |
 | outputSerdeClassName | String                     | `--output-serde-classname` | The SerDe class used for message outputs. |
 | logTopic             | String                     | `--log-topic`              | The topic that the logs of a function are produced to.  |
@@ -80,7 +80,7 @@ The following table outlines the nested fields and related arguments under the `
 | cryptoConfig         | [CryptoConfig](#cryptoconfig)   | N/A                   |Refer to [code](https://github.com/apache/pulsar/blob/master/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/CryptoConfig.java). |
 | poolMessages         | Boolean                    | N/A                        | N/A |
 
-###### ProducerConfig
+##### ProducerConfig
 
 The following table outlines the nested fields and related arguments under the `producerConfig` field.
 
diff --git a/site2/docs/functions-deploy-cluster-builtin.md b/site2/docs/functions-deploy-cluster-builtin.md
new file mode 100644
index 0000000000000..2e0e3b3cd38cd
--- /dev/null
+++ b/site2/docs/functions-deploy-cluster-builtin.md
@@ -0,0 +1,16 @@
+---
+id: functions-deploy-cluster-builtin
+title: Use built-in functions
+sidebar_label: "Use built-in functions"
+---
+
+Similar to built-in connectors, the code of Java functions [packaged as NAR](functions-package-java.md) that are placed in the `functions` directory of the function worker are loaded at startup and can be referenced when creating a function.
+
+For instance if you have a built-in function with name `exclamation` in its `pulsar-io.yaml`, you can create a function instance with:
+
+```bash
+bin/pulsar-admin functions create \
+  --function-type exclamation \
+  --inputs persistent://public/default/input-1 \
+  --output persistent://public/default/output-1
+```
diff --git a/site2/docs/functions-deploy-cluster-encryption.md b/site2/docs/functions-deploy-cluster-encryption.md
index 7f3fc4cf7ac7b..e7b72a0314bbd 100644
--- a/site2/docs/functions-deploy-cluster-encryption.md
+++ b/site2/docs/functions-deploy-cluster-encryption.md
@@ -23,4 +23,4 @@ public class CryptoConfig {
 - `producerCryptoFailureAction` defines the action that a producer takes if it fails to encrypt the data. Available options are `FAIL` or `SEND`.
 - `consumerCryptoFailureAction` defines the action that a consumer takes if it fails to decrypt the recieved data. Available options are `FAIL`, `DISCARD`, or `CONSUME`.
 
-For more information about these options, refer to [producer configurations](client-libraries-java.md#configure-producer.md) and [consumer configurations](client-libraries-java.md#configure-consumer).
+For more information about these options, refer to [producer configurations](client-libraries-java.md#configure-producer) and [consumer configurations](client-libraries-java.md#configure-consumer).
diff --git a/site2/docs/functions-deploy-cluster.md b/site2/docs/functions-deploy-cluster.md
index 042d5a3d2edbc..ccfd36e63de8f 100644
--- a/site2/docs/functions-deploy-cluster.md
+++ b/site2/docs/functions-deploy-cluster.md
@@ -31,4 +31,5 @@ bin/pulsar-admin functions update \
 * [Enable parallel processing](functions-deploy-cluster-parallelism.md)
 * [Enable end-to-end encryption](functions-deploy-cluster-encryption.md)
 * [Enable package management service](functions-deploy-cluster-package.md)
+* [Use built-in functions](functions-deploy-cluster-builtin.md)
 
diff --git a/site2/docs/functions-deploy-trigger.md b/site2/docs/functions-deploy-trigger.md
index 6b1c7405f7aa1..4ea0999810797 100644
--- a/site2/docs/functions-deploy-trigger.md
+++ b/site2/docs/functions-deploy-trigger.md
@@ -8,7 +8,7 @@ Triggering a function means that you invoke a function by producing a message to
 
 :::tip
 
-With the [`pulsar-admin`](/tools/pulsar-admin/) CLI, you can send messages to functions without using the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool or a language-specific client library.
+With the [`pulsar-admin`](/tools/pulsar-admin/) CLI, you can send messages to functions without using the [`pulsar-client`](reference-cli-tools.md) tool or a language-specific client library.
 
 :::
 
@@ -33,7 +33,7 @@ def process(input):
     --output persistent://public/default/out
   ```
 
-2. Assign a consumer to listen on the output topic for messages from the `myfunc` function with the [`pulsar-client consume`](reference-cli-tools.md#consume) command.
+2. Assign a consumer to listen on the output topic for messages from the `myfunc` function with the [`pulsar-client consume`](reference-cli-tools.md) command.
 
   ```bash
   bin/pulsar-client consume persistent://public/default/out \
diff --git a/site2/docs/functions-develop-metrics.md b/site2/docs/functions-develop-metrics.md
index 11b88fdba5f14..d6a35a6f5a5be 100644
--- a/site2/docs/functions-develop-metrics.md
+++ b/site2/docs/functions-develop-metrics.md
@@ -19,7 +19,7 @@ Using the language-native interface for Java or Python is **not** able to publis
 
 You can use both built-in metrics and customized metrics to monitor functions.
 - Use the built-in [function metrics](reference-metrics.md#pulsar-functions).
-  Pulsar Functions expose the metrics that can be collected and used for monitoring the health of Java, Python, and Go functions. You can check the metrics by following the [monitoring](deploy-monitoring.md/#function-and-connector-stats) guide. 
+  Pulsar Functions expose the metrics that can be collected and used for monitoring the health of Java, Python, and Go functions. You can check the metrics by following the [monitoring](deploy-monitoring.md#function-and-connector-stats) guide. 
 - Set your customized metrics.
   In addition to the built-in metrics, Pulsar allows you to customize metrics for Java and Python functions. Function workers collect user-defined metrics to Prometheus automatically and you can check them in Grafana.
 
diff --git a/site2/docs/functions-develop-security.md b/site2/docs/functions-develop-security.md
index 3ef9556925e57..8807d826e362c 100644
--- a/site2/docs/functions-develop-security.md
+++ b/site2/docs/functions-develop-security.md
@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 ## Prerequisites
 
-If you want to enable security on functions, you need to [enable security settings](functions-worker.md#enable-security-settings) on function workers first.
+If you want to enable security on functions, you need to [enable security settings](functions-worker.md) on function workers first.
 
 
 ## Configure function workers
diff --git a/site2/docs/functions-develop.md b/site2/docs/functions-develop.md
index e17d6356678ff..2b183e205ece8 100644
--- a/site2/docs/functions-develop.md
+++ b/site2/docs/functions-develop.md
@@ -8,7 +8,7 @@ sidebar_label: "How to develop"
 
 Develop functions in Java, Python, or Go. 
 * For supported Java versions, refer to [Pulsar runtime Java version recommendation](https://github.com/apache/pulsar#pulsar-runtime-java-version-recommendation) for more details.
-* For supported Python versions, refer to [Python client](client-libraries-python.md#optional-dependencies) for more details.
+* For supported Python versions, refer to [Python client](client-libraries-python.md) for more details.
 
 :::
 
diff --git a/site2/docs/functions-overview.md b/site2/docs/functions-overview.md
index e017695ddb959..c01a823085541 100644
--- a/site2/docs/functions-overview.md
+++ b/site2/docs/functions-overview.md
@@ -26,9 +26,9 @@ Each time a function receives a message, it completes the following consume-appl
 1. Consumes the message from one or more **input topics**. 
 2. Applies the customized (user-supplied) processing logic to the message.
 3. Publishes the output of the message, including:
-    a) writes output messages to an **output topic** in Pulsar
-    b) writes logs to a **log topic** (if it is configured)for debugging
-    c) writes [state](functions-develop-state.md) updates to BookKeeper (if it is configured) 
+    1. writes output messages to an **output topic** in Pulsar
+    2. writes logs to a **log topic** (if it is configured)for debugging
+    3. writes [state](functions-develop-state.md) updates to BookKeeper (if it is configured) 
     
 You can write functions in Java, Python, and Go. For example, you can use Pulsar Functions to set up the following processing chain:
 * A Python function listens for the `raw-sentences` topic and "sanitizes" incoming strings (removing extraneous white space and converting all characters to lowercase) and then publishes the results to a `sanitized-sentences` topic.
diff --git a/site2/docs/functions-package-java.md b/site2/docs/functions-package-java.md
index fe34a9fd4b2f3..daa3bf8aa4c10 100644
--- a/site2/docs/functions-package-java.md
+++ b/site2/docs/functions-package-java.md
@@ -4,17 +4,29 @@ title: Package Java Functions
 sidebar_label: "Package Java Functions"
 ---
 
+There are two methods to package Java Functions, that is [uber JAR](#package-as-jar) and [NAR](#package-as-nar).
+
 :::note
 
+If you plan to package and distribute your function for others to use, you are obligated to
+license and copyright your own code properly. Remember to add the license and copyright to
+all libraries your code uses and to your distribution.
+
+If you use the [NAR](#package-as-nar) method, the NAR plugin
+automatically creates a `DEPENDENCIES` file in the generated NAR package, including the proper
+licensing and copyrights of all libraries of your function.
+
 For the runtime Java version, refer to [Pulsar Runtime Java Version Recommendation](https://github.com/apache/pulsar/blob/master/README.md#pulsar-runtime-java-version-recommendation) according to your target Pulsar version.
 
 :::
 
-To package a Java function, complete the following steps.
+## Package as JAR
+
+To package a Java function as JAR, complete the following steps.
 
 1. Create a new maven project with a pom file. In the following code sample, the value of `mainClass` is your package name.
 
-   ```java
+   ```xml
     
     
+    
+        4.0.0
+
+        java-function
+        java-function
+        1.0-SNAPSHOT
+
+        
+            
+                org.apache.pulsar
+                pulsar-functions-api
+                @pulsar:version@
+            
+        
+
+        
+            
+                
+                    org.apache.nifi
+                    nifi-nar-maven-plugin
+                    1.2.0
+                    
+                
+                    org.apache.maven.plugins
+                    maven-compiler-plugin
+                    
+                        17
+                    
+                
+            
+        
+
+    
+   ```
+
+   You must also create a `resources/META-INF/services/pulsar-io.yaml` file. In the following code sample, the value of `functionClass` is your function class name. The `name` is the one used when the Function is deployed as a [built-in](functions-deploy-cluster-builtin.md) one.
+
+   ```yaml
+   name: java-function
+   description: my java function
+   functionClass: org.example.test.ExclamationFunction
+   ```
+
+2. Package your Java function.
+
+   ```bash
+   mvn package
+   ```
+
+   After the Java function is packaged, a `target` directory is created automatically. Open the `target` directory to check if there is a NAR package similar to `java-function-1.0-SNAPSHOT.nar`.
+
+3. Copy the packaged NAR file to the Pulsar image.
+
+   ```bash
+    docker cp   CONTAINER ID:/pulsar
+   ```
+
+4. Run the Java function using the following command.
+
+   ```bash
+    ./bin/pulsar-admin functions localrun \
+    --jar java-function-1.0-SNAPSHOT.nar \
+    --inputs persistent://public/default/my-topic-1 \
+    --output persistent://public/default/test-1 \
+    --tenant public \
+    --namespace default \
+    --name JavaFunction
+   ```
+
+   The following log indicates that the Java function starts successfully.
+
+   ```text
+    ...
+    07:55:03.724 [main] INFO  org.apache.pulsar.functions.runtime.ProcessRuntime - Started process successfully
+    ...
+   ```
diff --git a/site2/docs/functions-package-python.md b/site2/docs/functions-package-python.md
index 6caf88e5730b5..80f0936294018 100644
--- a/site2/docs/functions-package-python.md
+++ b/site2/docs/functions-package-python.md
@@ -16,7 +16,7 @@ To package a Python function into **one Python file**, complete the following st
 1. Write a Python function.
 
    ```python
-    from pulsar import Function //  import the Function module from Pulsar
+    from pulsar import Function #  import the Function module from Pulsar
 
     # The classic ExclamationFunction that appends an exclamation at the end
     # of the input
@@ -151,7 +151,7 @@ To package a Python function with **PIP**, complete the following steps.
        pass
 
      def process(self, input, context):
-      // add your logic
+      # add your logic
       return input + '!'
    ```
 
diff --git a/site2/docs/functions-worker-run-separately.md b/site2/docs/functions-worker-run-separately.md
index 2c9f841060405..1f7a4a9c062c5 100644
--- a/site2/docs/functions-worker-run-separately.md
+++ b/site2/docs/functions-worker-run-separately.md
@@ -92,7 +92,7 @@ properties:
 ```
 
 You can enable the following security settings on function workers.
-- [Enable TLS encryption](#enable-tls-transport-encryption)
+- [Enable TLS encryption](#enable-tls-encryption)
 - [Enable authentication providers](#enable-authentication-providers)
 - [Enable authorization providers](#enable-authorization-providers)
 - [Enable end-to-end encryption](functions-deploy-cluster-encryption.md)
@@ -197,7 +197,7 @@ Before starting function workers, make sure [function runtime](functions-runtime
 
 :::
 
-* You can start a function worker in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
+* You can start a function worker in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md) CLI tool:
 
   ```bash
   bin/pulsar-daemon start functions-worker
diff --git a/site2/docs/getting-started-pulsar.md b/site2/docs/getting-started-pulsar.md
index a46e5945dd73b..64f7b55932d4e 100644
--- a/site2/docs/getting-started-pulsar.md
+++ b/site2/docs/getting-started-pulsar.md
@@ -30,8 +30,8 @@ Prior to version 2.0, *all* Pulsar topics had the following form:
 
 Two important changes have been made in Pulsar 2.0:
 
-* There is no longer a [cluster component](#no-cluster)
-* Properties have been [renamed to tenants](#tenants)
+* There is no longer a [cluster component](#no-cluster-component)
+* Properties have been [renamed to tenants](#properties-versus-tenants)
 * You can use a [flexible](#flexible-topic-naming) naming system to shorten many topic names
 * `/` is not allowed in topic name
 
diff --git a/site2/docs/getting-started-standalone.md b/site2/docs/getting-started-standalone.md
index 30f687a7d1796..857a6b752fb8d 100644
--- a/site2/docs/getting-started-standalone.md
+++ b/site2/docs/getting-started-standalone.md
@@ -46,7 +46,7 @@ The following directories are created:
 
 | Directory     | Description                                                                                         |
 | ------------- | --------------------------------------------------------------------------------------------------- |
-| **bin**       | The [`pulsar`](reference-cli-tools.md#pulsar) entry point script, and many other command-line tools |
+| **bin**       | The [`pulsar`](reference-cli-tools.md) entry point script, and many other command-line tools |
 | **conf**      | Configuration files, including `broker.conf`                                                        |
 | **lib**       | JARs used by Pulsar                                                                                 |
 | **examples**  | [Pulsar Functions](functions-overview.md) examples                                                  |
@@ -69,7 +69,7 @@ When the Pulsar cluster starts, the following directories are created:
 
 :::tip
 
-* To run the service as a background process, you can use the `bin/pulsar-daemon start standalone` command. For more information, see [pulsar-daemon](reference-cli-tools.md#pulsar-daemon).
+* To run the service as a background process, you can use the `bin/pulsar-daemon start standalone` command. For more information, see [pulsar-daemon](reference-cli-tools.md).
 * The `public/default` namespace is created when you start a Pulsar cluster. This namespace is for development purposes. All Pulsar topics are managed within namespaces. For more information, see [Namespaces](concepts-messaging.md#namespaces) and [Topics](concepts-messaging.md#topics).
 
 :::
@@ -120,7 +120,7 @@ Leave the consume command from the previous step running. If you've already clos
 Now open a new terminal window and produce more messages. The default message separator is `,`:
 
 ```bash
-bin/pulsar-client produce my-topic --messages "$(seq -s, -f 'Message NO.%g' -t '\n' 1 10)"
+bin/pulsar-client produce my-topic --messages "$(seq -s, -f 'Message NO.%g' 1 10)"
 ```
 
 Note how they are displayed almost instantaneously in the consumer terminal.
diff --git a/site2/docs/helm-deploy.md b/site2/docs/helm-deploy.md
index 8e8985d0d0cd5..dff0ab03aec01 100644
--- a/site2/docs/helm-deploy.md
+++ b/site2/docs/helm-deploy.md
@@ -1,45 +1,48 @@
 ---
 id: helm-deploy
-title: Deploy Pulsar cluster using Helm
-sidebar_label: "Deployment"
+title: Deploy a Pulsar cluster on Kubernetes
+sidebar_label: "Deploy"
 ---
 
-Before running `helm install`, you need to decide how to run Pulsar.
-Options can be specified using Helm's `--set option.name=value` command line option.
+Before deploying a Pulsar cluster, you need to [prepare Kubernetes resources](helm-prepare.md) and then continue with the following steps.
+1. Select configuration options
+2. Install dependent charts
+3. Prepare Helm release
+4. Deploy your Pulsar cluster using Helm
 
 ## Select configuration options
 
-In each section, collect the options that are combined to use with the `helm install` command.
+Specify how to run Pulsar using Helm's `--set option.name=value` command line option. In each section, collect the options that are combined to use with the `helm install` command.
 
-### Kubernetes namespace
+#### Kubernetes namespace
 
-By default, the Pulsar Helm chart is installed in a namespace called `pulsar`.
+By default, the Pulsar Helm Chart is installed in a namespace called `pulsar`.
 
 ```yaml
 namespace: pulsar
 ```
 
-To install the Pulsar Helm chart into a different Kubernetes namespace, you can include this option in the `helm install` command.
+To install the Pulsar Helm Chart into a different Kubernetes namespace, you can include this option in the `helm install` command.
 
 ```bash
 --set namespace=
 ```
 
-By default, the Pulsar Helm chart doesn't create the namespace.
+By default, the Pulsar Helm Chart doesn't create the namespace.
 
 ```yaml
 namespaceCreate: false
 ```
 
-To use the Pulsar Helm chart to create the Kubernetes namespace automatically, you can include this option in the `helm install` command.
+To use the Pulsar Helm Chart to create the Kubernetes namespace automatically, you can include this option in the `helm install` command.
 
 ```bash
 --set namespaceCreate=true
 ```
 
-### Persistence
+#### Persistence
 
-By default, the Pulsar Helm chart creates Volume Claims with the expectation that a dynamic provisioner creates the underlying Persistent Volumes.
+By default, the Pulsar Helm Chart creates Volume Claims with the expectation that a dynamic provisioner creates the underlying Persistent Volumes.
 
 ```yaml
 volumes:
@@ -49,25 +52,19 @@ volumes:
   local_storage: false
 ```
 
-To use local persistent volumes as the persistent storage for Helm release, you can install the [local storage provisioner](#install-local-storage-provisioner) and include the following option in the `helm install` command. 
-
-```bash
---set volumes.local_storage=true
-```
-
 :::note
 
 Before installing the production instance of Pulsar, ensure to plan the storage settings to avoid extra storage migration work. Because after initial installation, you must edit Kubernetes objects manually if you want to change storage settings.
 
 :::
 
-The Pulsar Helm chart is designed for production use. To use the Pulsar Helm chart in a development environment (such as Minikube), you can disable persistence by including this option in your `helm install` command.
+The Pulsar Helm Chart is designed for production use. To use the Pulsar Helm Chart in a development environment (such as Minikube), you can disable persistence by including this option in your `helm install` command.
 
 ```bash
 --set volumes.persistence=false
 ```
 
-### Affinity 
+#### Affinity 
 
 By default, `anti-affinity` is enabled to ensure pods of the same component can run on different nodes.
 
@@ -76,15 +73,15 @@ affinity:
   anti_affinity: true
 ```
 
-To use the Pulsar Helm chart in a development environment (such as Minikube), you can disable `anti-affinity` by including this option in your `helm install` command.
+To use the Pulsar Helm Chart in a development environment (such as Minikube), you can disable `anti-affinity` by including this option in your `helm install` command.
 
 ```bash
 --set affinity.anti_affinity=false
 ```
 
-### Components
+#### Components
 
-The Pulsar Helm chart is designed for production usage. It deploys a production-ready Pulsar cluster, including Pulsar core components and monitoring components.
+The Pulsar Helm Chart is designed for production usage. It deploys a production-ready Pulsar cluster, including Pulsar core components and monitoring components.
 
 You can customize the components to be deployed by turning on/off individual components.
 
@@ -120,9 +117,9 @@ monitoring:
   grafana: true
 ```
 
-### Docker images
+#### Docker images
 
-The Pulsar Helm chart is designed to enable controlled upgrades. So it can configure independent image versions for components. You can customize the images by setting individual components.
+The Pulsar Helm Chart is designed to enable controlled upgrades. So it can configure independent image versions for components. You can customize the images by setting individual components.
 
 ```yaml
 ## Images
@@ -131,49 +128,41 @@ The Pulsar Helm chart is designed to enable controlled upgrades. So it can confi
 images:
   zookeeper:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   bookie:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   autorecovery:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   broker:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   proxy:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   functions:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
-  prometheus:
-    repository: prom/prometheus
-    tag: v1.6.3
-    pullPolicy: IfNotPresent
-  grafana:
-    repository: streamnative/apache-pulsar-grafana-dashboard-k8s
-    tag: 0.0.4
-    pullPolicy: IfNotPresent
+    tag: @pulsar:version@
   pulsar_manager:
     repository: apachepulsar/pulsar-manager
-    tag: v0.1.0
+    tag: v0.3.0
     pullPolicy: IfNotPresent
     hasCommand: false
 ```
 
-### TLS
+#### TLS
 
-The Pulsar Helm chart can be configured to enable TLS (Transport Layer Security) to protect all the traffic between components. Before enabling TLS, you have to provision TLS certificates for the required components.
+The Pulsar Helm Chart can be configured to enable TLS (Transport Layer Security) to protect all the traffic between components. Before enabling TLS, you have to provision TLS certificates for the required components.
 
-#### Provision TLS certificates using cert-manager
+##### Provision TLS certificates using cert-manager
 
-To use the `cert-manager` to provision the TLS certificates, you have to install the [cert-manager](#install-cert-manager) before installing the Pulsar Helm chart. After successfully installing the cert-manager, you can set `certs.internal_issuer.enabled` to `true`. Therefore, the Pulsar Helm chart can use the `cert-manager` to generate `selfsigning` TLS certificates for the configured components.
+To use the `cert-manager` to provision the TLS certificates, you have to install the [cert-manager](#install-cert-manager) before installing the Pulsar Helm Chart. After successfully installing the cert-manager, you can set `certs.internal_issuer.enabled` to `true`. Therefore, the Pulsar Helm Chart can use the `cert-manager` to generate `selfsigning` TLS certificates for the configured components.
 
 ```yaml
 certs:
@@ -200,7 +189,7 @@ tls:
     keyEncoding: pkcs8
 ```
 
-#### Enable TLS
+##### Enable TLS
 
 After installing the `cert-manager`, you can set `tls.enabled` to `true` to enable TLS encryption for the entire cluster.
 
@@ -237,10 +226,10 @@ tls:
     cert_name: tls-toolset
 ```
 
-### Authentication
+#### Authentication
 
 By default, authentication is disabled. You can set `auth.authentication.enabled` to `true` to enable authentication.
-Currently, the Pulsar Helm chart only supports the JWT authentication provider. You can set `auth.authentication.provider` to `jwt` to use the JWT authentication provider.
+Currently, the Pulsar Helm Chart only supports the JWT authentication provider. You can set `auth.authentication.provider` to `jwt` to use the JWT authentication provider.
 
 ```yaml
 # Enable or disable broker authentication and authorization.
@@ -262,13 +251,13 @@ auth:
     client: "admin"
 ```
 
-To enable authentication, you can run [prepare helm release](#prepare-the-helm-release) to generate token secret keys and tokens for three super users specified in the `auth.superUsers` field. The generated token keys and super user tokens are uploaded and stored as Kubernetes secrets prefixed with `-token-`. You can use the following command to find those secrets.
+To enable authentication, you can run [prepare helm release](#prepare-helm-release) to generate token secret keys and tokens for three super users specified in the `auth.superUsers` field. The generated token keys and super user tokens are uploaded and stored as Kubernetes secrets prefixed with `-token-`. You can use the following command to find those secrets.
 
 ```bash
 kubectl get secrets -n 
 ```
 
-### Authorization
+#### Authorization
 
 By default, authorization is disabled. Authorization can be enabled only when authentication is enabled.
 
@@ -284,29 +273,25 @@ To enable authorization, you can include this option in the `helm install` comma
 --set auth.authorization.enabled=true
 ```
 
-### CPU and RAM resource requirements
+#### CPU and RAM resource requirements
 
-By default, the resource requests and the number of replicas for the Pulsar components in the Pulsar Helm chart are adequate for small production deployment. If you deploy a non-production instance, you can reduce the defaults to fit into a smaller cluster.
+By default, the resource requests and the number of replicas for the Pulsar components in the Pulsar Helm Chart are adequate for small production deployment. If you deploy a non-production instance, you can reduce the defaults to fit into a smaller cluster.
 
-Once you have all of your configuration options collected, you can install dependent charts before installing the Pulsar Helm chart.
+Once you have all of your configuration options collected, you can install dependent charts before installing the Pulsar Helm Chart.
 
 ## Install dependent charts
 
-### Install local storage provisioner
+### Install storage provisioner
 
-To use local persistent volumes as the persistent storage, you need to install a storage provisioner for [local persistent volumes](https://kubernetes.io/blog/2019/04/04/kubernetes-1.14-local-persistent-volumes-ga/).
+For more information about storage provisioner, refer to [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#provisioner). Note that you need to create a storage class for your Kubernetes cluster and configure the [storage class name](https://github.com/apache/pulsar-helm-chart/blob/master/charts/pulsar/values.yaml) in the Helm Chart.
 
-One of the easiest ways to get started is to use the local storage provisioner provided along with the Pulsar Helm chart.
-
-```
-helm repo add streamnative https://charts.streamnative.io
-helm repo update
-helm install pulsar-storage-provisioner streamnative/local-storage-provisioner
-```
+If you want to use **local** [persistent volumes](#persistence) as the persistent storage, you need to install a local storage provisioner. Here are two options:
+* [Local Path Provisioner](https://github.com/rancher/local-path-provisioner)
+* [Local Persistence Volume Static Provisioner](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner)
 
 ### Install cert-manager
 
-The Pulsar Helm chart uses the [cert-manager](https://github.com/jetstack/cert-manager) to provision and manage TLS certificates automatically. To enable TLS encryption for brokers or proxies, you need to install the cert-manager in advance.
+The Pulsar Helm Chart uses the [cert-manager](https://github.com/jetstack/cert-manager) to provision and manage TLS certificates automatically. To enable TLS encryption for brokers or proxies, you need to install the cert-manager in advance.
 
 For details about how to install the cert-manager, follow the [official instructions](https://cert-manager.io/docs/installation/kubernetes/#installing-with-helm).
 
@@ -330,19 +315,15 @@ cd pulsar-helm-chart
 
 The `prepare_helm_release` creates the following resources:
 
-- A Kubernetes namespace for installing the Pulsar release
+- A Kubernetes namespace for installing the Pulsar release.
 - JWT secret keys and tokens for three super users: `broker-admin`, `proxy-admin`, and `admin`. By default, it generates an asymmetric public/private key pair. You can choose to generate a symmetric secret key by specifying `--symmetric`.
-  - `proxy-admin` role is used for proxies to communicate to brokers.
-  - `broker-admin` role is used for inter-broker communications.
-  - `admin` role is used by the admin tools.
+  - the `broker-admin` role is used for inter-broker communications.
+  - the `proxy-admin` role is used for proxies to communicate with brokers.
+  - the `admin` role is used by the admin tools.
 
 ## Deploy Pulsar cluster using Helm
 
-Once you have finished the following three things, you can install a Helm release.
-
-- Collect all of your configuration options.
-- Install dependent charts.
-- Prepare the Helm release.
+Once you have finished the above steps, you can install a Helm release.
 
 In this example, the Helm release is named `pulsar`.
 
@@ -354,13 +335,15 @@ helm install pulsar apache/pulsar \
     --set [your configuration options]
 ```
 
-You can also use the `--version ` option if you want to install a specific version of Pulsar Helm chart.
+You can also use the `--version ` option if you want to install a specific version of Pulsar Helm Chart.
 
-## Monitor deployment
+:::tip
 
 A list of installed resources is output once the Pulsar cluster is deployed. This may take 5-10 minutes.
 
-The status of the deployment can be checked by running the `helm status pulsar` command, which can also be done while the deployment is taking place if you run the command in another terminal.
+To check the status of the deployment, run the `helm status pulsar` command. It can also be done while the deployment is taking place if you run the command in another terminal.
+
+:::
 
 ## Access Pulsar cluster
 
@@ -376,3 +359,23 @@ To find the IP addresses of those components, run the following command:
 kubectl get service -n 
 ```
 
+## Troubleshoot
+
+Although we have done our best to make these charts as seamless as possible, troubles do go out of our control occasionally. We have been collecting tips and tricks for troubleshooting common issues. Check it first before raising an [issue](https://github.com/apache/pulsar/issues/new/choose), and feel free to add your solutions by creating a [Pull Request](https://github.com/apache/pulsar/compare).
+
+
+## Uninstall
+
+To uninstall the Pulsar Helm Chart, run the following command:
+
+```bash
+helm uninstall 
+```
+
+For the purposes of continuity, some Kubernetes objects in these charts cannot be removed by using the `helm uninstall` command. It is recommended to *consciously* remove these items, as they affect re-deployment.
+
+* PVCs for stateful data: remove these items.
+  - ZooKeeper: This is your metadata.
+  - BookKeeper: This is your data.
+  - Prometheus: This is your metrics data, which can be safely removed.
+* Secrets: if the secrets are generated by the [prepared release script](https://github.com/apache/pulsar-helm-chart/blob/master/scripts/pulsar/prepare_helm_release.sh), they contain secret keys and tokens. You can use the [cleanup release script](https://github.com/apache/pulsar-helm-chart/blob/master/scripts/pulsar/cleanup_helm_release.sh) to remove these secrets and tokens as needed.
diff --git a/site2/docs/helm-install.md b/site2/docs/helm-install.md
index 16a646d9aa56f..6bfb6fcfd70bf 100644
--- a/site2/docs/helm-install.md
+++ b/site2/docs/helm-install.md
@@ -4,34 +4,9 @@ title: Install Apache Pulsar using Helm
 sidebar_label: "Install "
 ---
 
-Install Apache Pulsar on Kubernetes with the official Pulsar Helm chart.
+````mdx-code-block
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from '@docusaurus/router';
 
-## Requirements
-
-To deploy Apache Pulsar on Kubernetes, the followings are required.
-
-- kubectl 1.14 or higher, compatible with your cluster ([+/- 1 minor release from your cluster](https://kubernetes.io/docs/tasks/tools/install-kubectl/#before-you-begin))
-- Helm v3 (3.0.2 or higher)
-- A Kubernetes cluster, version 1.14 or higher
-
-## Environment setup
-
-Before deploying Pulsar, you need to prepare your environment.
-
-### Tools
-
-Install [`helm`](helm-tools.md) and [`kubectl`](helm-tools.md) on your computer.
-
-## Cloud cluster preparation
-
-To create and connect to the Kubernetes cluster, follow the instructions:
-
-- [Google Kubernetes Engine](helm-prepare.md#google-kubernetes-engine)
-
-## Pulsar deployment
-
-Once the environment is set up and configuration is generated, you can now proceed to the [deployment of Pulsar](helm-deploy.md).
-
-## Pulsar upgrade
-
-To upgrade an existing Kubernetes installation, follow the [upgrade documentation](helm-upgrade.md).
+
+````
\ No newline at end of file
diff --git a/site2/docs/helm-overview.md b/site2/docs/helm-overview.md
index 71659186154e8..2b965999a04ce 100644
--- a/site2/docs/helm-overview.md
+++ b/site2/docs/helm-overview.md
@@ -4,95 +4,9 @@ title: Apache Pulsar Helm Chart
 sidebar_label: "Overview"
 ---
 
-[Helm chart](https://github.com/apache/pulsar-helm-chart) supports you to install Apache Pulsar in a cloud-native environment.
+````mdx-code-block
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from '@docusaurus/router';
 
-## Introduction
-
-The Apache Pulsar Helm chart provides one of the most convenient ways to operate Pulsar on Kubernetes. With all the required components, the Helm chart is scalable and thus suitable for large-scale deployments.
-
-The Apache Pulsar Helm chart contains all components to support the features and functions that Pulsar delivers. You can install and configure these components separately.
-
-- Pulsar core components:
-  - ZooKeeper
-  - Bookies
-  - Brokers
-  - Function workers
-  - Proxies
-- Control center:
-  - Pulsar Manager
-  - Prometheus
-  - Grafana
-
-Moreover, the Helm chart supports:
-
-- Security
-  - Automatically provisioned TLS certificates, using [Jetstack](https://www.jetstack.io/)'s [cert-manager](https://cert-manager.io/docs/)
-      - self-signed
-      - [Let's Encrypt](https://letsencrypt.org/)
-  - TLS Encryption
-      - Proxy
-      - Broker
-      - Toolset
-      - Bookie
-      - ZooKeeper
-  - Authentication
-      - JWT
-  - Authorization
-- Storage
-  - Non-persistence storage
-  - Persistent volume
-  - Local persistent volumes
-- Functions
-  - Kubernetes Runtime
-  - Process Runtime
-  - Thread Runtime
-- Operations
-  - Independent image versions for all components, enabling controlled upgrades
-
-## Quick start
-
-To run with Apache Pulsar Helm chart as fast as possible in a **non-production** use case, we provide a [quick start guide](getting-started-helm.md) for Proof of Concept (PoC) deployments.
-
-This guide walks you through deploying Apache Pulsar Helm chart with default values and features, but it is *not* suitable for deployments in production-ready environments. To deploy the charts in production under sustained load, you can follow the complete [Installation Guide](helm-install.md).
-
-## Troubleshooting
-
-Although we have done our best to make these charts as seamless as possible, troubles do go out of our control occasionally. We have been collecting tips and tricks for troubleshooting common issues. Please check it first before raising an [issue](https://github.com/apache/pulsar/issues/new/choose), and feel free to add your solutions by creating a [Pull Request](https://github.com/apache/pulsar/compare).
-
-## Installation
-
-The Apache Pulsar Helm chart contains all required dependencies.
-
-If you deploy a PoC for testing, we strongly suggest you follow this [Quick Start Guide](getting-started-helm.md) for your first iteration.
-
-1. [Preparation](helm-prepare.md)
-2. [Deployment](helm-deploy.md)
-
-## Upgrading
-
-Once the Apache Pulsar Helm chart is installed, you can use `helm upgrade` command to configure and update it.
-
-```bash
-helm repo add apache https://pulsar.apache.org/charts
-helm repo update
-helm get values  > pulsar.yaml
-helm upgrade  apache/pulsar -f pulsar.yaml
-```
-
-For more detailed information, see [Upgrading](helm-upgrade.md).
-
-## Uninstallation
-
-To uninstall the Apache Pulsar Helm chart, run the following command:
-
-```bash
-helm delete 
-```
-
-For the purposes of continuity, some Kubernetes objects in these charts cannot be removed by `helm delete` command. It is recommended to *consciously* remove these items, as they affect re-deployment.
-
-* PVCs for stateful data: remove these items.
-  - ZooKeeper: This is your metadata.
-  - BookKeeper: This is your data.
-  - Prometheus: This is your metrics data, which can be safely removed.
-* Secrets: if the secrets are generated by the [prepare release script](https://github.com/apache/pulsar-helm-chart/blob/master/scripts/pulsar/prepare_helm_release.sh), they contain secret keys and tokens. You can use the [cleanup release script](https://github.com/apache/pulsar-helm-chart/blob/master/scripts/pulsar/cleanup_helm_release.sh) to remove these secrets and tokens as needed.
+
+````
\ No newline at end of file
diff --git a/site2/docs/helm-prepare.md b/site2/docs/helm-prepare.md
index 15f07c994fadc..d87ffb7cd6928 100644
--- a/site2/docs/helm-prepare.md
+++ b/site2/docs/helm-prepare.md
@@ -4,70 +4,24 @@ title: Prepare Kubernetes resources
 sidebar_label: "Prepare"
 ---
 
-For a fully functional Pulsar cluster, you need a few resources before deploying the Apache Pulsar Helm chart. The following provides instructions to prepare the Kubernetes cluster before deploying the Pulsar Helm chart.
+For a fully functional Pulsar cluster, you need a few resources before deploying the Apache Pulsar Helm Chart. This section provides the information about the preparations you need to do before deploying the Pulsar Helm Chart.
 
-- [Google Kubernetes Engine](#google-kubernetes-engine)
-  - [Manual cluster creation](#manual-cluster-creation)
-  - [Scripted cluster creation](#scripted-cluster-creation)
-  - [Create cluster with local SSDs](#create-cluster-with-local-ssds)
+## Prerequisites
 
-## Google Kubernetes Engine
+Set up your environment by installing the required tools.
 
-To get started easier, a script is provided to create the cluster automatically. Alternatively, a cluster can be created manually as well.
+### Install kubectl
 
-### Manual cluster creation
+`kubectl` 1.18 or higher is the required tool that talks to the Kubernetes API. It needs to be compatible with your cluster ([+/- 1 minor release from your cluster](https://kubernetes.io/docs/tasks/tools/install-kubectl/#before-you-begin)). The server version of `kubectl` cannot be obtained until you connect to a cluster.
 
-To provision a Kubernetes cluster manually, follow the [GKE instructions](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster).
+For the installation instructions, see the [Kubernetes documentation](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl).
 
-### Scripted cluster creation
+### Install Helm
 
-A [bootstrap script](https://github.com/streamnative/charts/tree/master/scripts/pulsar/gke_bootstrap_script.sh) has been created to automate much of the setup process for users on GCP/GKE.
+Helm is the package manager for Kubernetes. The Apache Pulsar Helm Chart is supported with Helm v3 (3.0.2 or higher).
 
-The script can:
+You can get the Helm from the project's [releases page](https://github.com/helm/helm/releases), or follow other options under the official documentation of [installing Helm](https://helm.sh/docs/intro/install/).
 
-1. Create a new GKE cluster.
-2. Allow the cluster to modify DNS (Domain Name Server) records.
-3. Set up `kubectl`, and connect it to the cluster.
-
-Google Cloud SDK is a dependency of this script, so ensure it is [set up correctly](helm-tools.md#connect-to-a-gke-cluster) for the script to work.
-
-The script reads various parameters from environment variables and an argument `up` or `down` for bootstrap and clean-up respectively.
-
-The following table describes all variables.
-
-| **Variable** | **Description** | **Default value** |
-| ------------ | --------------- | ----------------- |
-| PROJECT      | ID of your GCP project | No default value. It requires to be set. |
-| CLUSTER_NAME | Name of the GKE cluster | `pulsar-dev` |
-| CONFDIR | Configuration directory to store Kubernetes configuration | ${HOME}/.config/streamnative |
-| INT_NETWORK | IP space to use within this cluster | `default` |
-| LOCAL_SSD_COUNT | Number of local SSD counts | 4 |
-| MACHINE_TYPE | Type of machine to use for nodes | `n1-standard-4` |
-| NUM_NODES | Number of nodes to be created in each of the cluster's zones | 4 |
-| PREEMPTIBLE | Create nodes using preemptible VM instances in the new cluster. | false |
-| REGION | Compute region for the cluster | `us-east1` |
-| USE_LOCAL_SSD | Flag to create a cluster with local SSDs | false |
-| ZONE | Compute zone for the cluster | `us-east1-b` |
-| ZONE_EXTENSION | The extension (`a`, `b`, `c`) of the zone name of the cluster | `b` |
-| EXTRA_CREATE_ARGS | Extra arguments passed to create command | |
-
-Run the script, by passing in your desired parameters. It can work with the default parameters except for `PROJECT` which is required:
-
-```bash
-PROJECT= scripts/pulsar/gke_bootstrap_script.sh up
-```
-
-The script can also be used to clean up the created GKE resources.
-
-```bash
-PROJECT= scripts/pulsar/gke_bootstrap_script.sh down
-```
-
-#### Create cluster with local SSDs
-
-To install the Pulsar Helm chart using local persistent volumes, you need to create a GKE cluster with local SSDs. You can do so by specifying `USE_LOCAL_SSD` to be `true` in the following command to create a Pulsar cluster with local SSDs.
-
-```bash
-PROJECT= USE_LOCAL_SSD=true LOCAL_SSD_COUNT= scripts/pulsar/gke_bootstrap_script.sh up
-```
+## Create Kubernetes cluster
 
+A Kubernetes cluster version 1.18 or higher is required for continuing the deployment. For details about how to create a Kubernetes cluster, see [Kubernetes documentation](https://kubernetes.io/docs/setup/production-environment/tools/).
\ No newline at end of file
diff --git a/site2/docs/helm-tools.md b/site2/docs/helm-tools.md
index 4aa30bc912485..911b33a031515 100644
--- a/site2/docs/helm-tools.md
+++ b/site2/docs/helm-tools.md
@@ -4,39 +4,9 @@ title: Required tools for deploying Pulsar Helm Chart
 sidebar_label: "Required Tools"
 ---
 
-Before deploying Pulsar to your Kubernetes cluster, there are some tools you must have installed locally.
+````mdx-code-block
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from '@docusaurus/router';
 
-## kubectl
-
-kubectl is the tool that talks to the Kubernetes API. kubectl 1.14 or higher is required and it needs to be compatible with your cluster ([+/- 1 minor release from your cluster](https://kubernetes.io/docs/tasks/tools/install-kubectl/#before-you-begin)).
-
-To install kubectl locally, follow the [Kubernetes documentation](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl).
-
-The server version of kubectl cannot be obtained until we connect to a cluster.
-
-## Helm
-
-Helm is the package manager for Kubernetes. The Apache Pulsar Helm Chart is tested and supported with Helm v3.
-
-### Get Helm
-
-You can get Helm from the project's [releases page](https://github.com/helm/helm/releases), or follow other options under the official documentation of [installing Helm](https://helm.sh/docs/intro/install/).
-
-### Next steps
-
-Once kubectl and Helm are configured, you can configure your [Kubernetes cluster](helm-prepare.md).
-
-## Additional information
-
-### Templates
-
-Templating in Helm is done through Golang's [text/template](https://golang.org/pkg/text/template/) and [sprig](https://godoc.org/github.com/Masterminds/sprig).
-
-For more information about how all the inner workings behave, check these documents:
-
-- [Functions and Pipelines](https://helm.sh/docs/chart_template_guide/functions_and_pipelines/)
-- [Subcharts and Globals](https://helm.sh/docs/chart_template_guide/subcharts_and_globals/)
-
-### Tips and tricks
-
-For additional information on developing with Helm, check [tips and tricks](https://helm.sh/docs/howto/charts_tips_and_tricks/) in the Helm repository.
\ No newline at end of file
+
+````
\ No newline at end of file
diff --git a/site2/docs/helm-upgrade.md b/site2/docs/helm-upgrade.md
index 6aaa8d901725f..209b142703223 100644
--- a/site2/docs/helm-upgrade.md
+++ b/site2/docs/helm-upgrade.md
@@ -4,30 +4,28 @@ title: Upgrade Pulsar Helm release
 sidebar_label: "Upgrade"
 ---
 
-Before upgrading your Pulsar installation, you need to check the change log corresponding to the specific release you want to upgrade to and look for any release notes that might pertain to the new Pulsar helm chart version.
 
-We also recommend that you need to provide all values using the `helm upgrade --set key=value` syntax or the `-f values.yml` instead of using `--reuse-values`, because some of the current values might be deprecated.
+To upgrade Apache Pulsar Helm to a newer version, complete the following steps:
 
-:::note
+1. Check the change log for the specific version you would like to upgrade to and read the release notes that might pertain to the new Pulsar Helm Chart version.
 
-You can retrieve your previous `--set` arguments cleanly, with `helm get values `. If you direct this into a file (`helm get values  > pulsar.yml`), you can safely pass this file through `-f`, namely `helm upgrade  apache/pulsar -f pulsar.yaml`. This safely replaces the behavior of `--reuse-values`.
+2. Go through the [deployment guide](helm-deploy.md) step by step.
 
-:::
-
-## Steps
-
-To upgrade Apache Pulsar to a newer version, follow these steps:
-
-1. Check the change log for the specific version you would like to upgrade to.
-2. Go through [deployment documentation](helm-deploy.md) step by step.
-3. Extract your previous `--set` arguments with the following command.
+3. Extract your previous `--set` arguments with the following command and change the values if required.
 
    ```bash
    helm get values  > pulsar.yaml
    ```
 
-4. Decide all the values you need to set.
-5. Perform the upgrade, with all `--set` arguments extracted in step 4.
+   :::note
+
+   It's highly recommended to provide all values using the `helm upgrade --set key=value` syntax or the `-f values.yml` instead of using `--reuse-values`, because some of the current values might be deprecated.
+
+   You can retrieve your previous `--set` arguments cleanly, with `helm get values `. If you direct this into a file (`helm get values  > pulsar.yml`), you can safely pass this file through `-f`, namely `helm upgrade  apache/pulsar -f pulsar.yaml`. This safely replaces the behavior of `--reuse-values`.
+
+   :::
+
+4. Perform the upgrade, with all `--set` arguments extracted in step 3.
 
    ```bash
    helm upgrade  apache/pulsar \
diff --git a/site2/docs/how-to-landing.md b/site2/docs/how-to-landing.md
new file mode 100644
index 0000000000000..90c47b64b6b34
--- /dev/null
+++ b/site2/docs/how-to-landing.md
@@ -0,0 +1,17 @@
+---
+Id: how-to-landing
+title: How-to
+sidebar_label: “”
+---
+
+
+Learning new software can be an overwhelming task, but relax – most aspects of Pulsar can be easily configured in just a few steps. These tutorials will show you how to quickly create topics, tenants, and namespaces, produce and consume messages, and more!
+
+- [How to create a topic](tutorials-topic.md)
+- [How to create a tenant](tutorials-tenant.md)
+- [How to create a namespace](tutorials-namespace.md)
+- [How to produce and consume messages](tutorials-produce-consume.md)
+
+
+
+
diff --git a/site2/docs/install-deploy-upgrade-landing.md b/site2/docs/install-deploy-upgrade-landing.md
new file mode 100644
index 0000000000000..5751dca2eb592
--- /dev/null
+++ b/site2/docs/install-deploy-upgrade-landing.md
@@ -0,0 +1,23 @@
+---
+Id: install-deploy-upgrade-landing
+title: Install, Deploy and Upgrade Pulsar
+sidebar_label: “Tutorials”
+---
+
+
+Any developer can install, deploy, and upgrade Apache Pulsar in a few simple steps and start building scalable, real-time applications quickly. The resources below will kickstart your deployment!
+
+- [Set up a standalone Pulsar locally](getting-started-standalone.md)
+
+- [Deploy a Pulsar cluster on AWS using Terraform and Ansible](deploy-aws.md)
+
+- [Deploy a Pulsar cluster using Helm](helm-deploy.md)
+
+- [Upgrade Pulsar Helm release](helm-upgrade.md)
+
+
+
+
+
+
+
diff --git a/site2/docs/io-cassandra-sink.md b/site2/docs/io-cassandra-sink.md
index f9df7d8c2c2ef..59eafdf4cf8da 100644
--- a/site2/docs/io-cassandra-sink.md
+++ b/site2/docs/io-cassandra-sink.md
@@ -51,4 +51,4 @@ Before using the Cassandra sink connector, you need to create a configuration fi
 
 ## Usage
 
-For more information about **how to connect Pulsar with Cassandra**, see [here](io-quickstart.md#connect-pulsar-to-apache-cassandra).
+For more information about **how to connect Pulsar with Cassandra**, see [here](io-quickstart.md#connect-pulsar-to-cassandra).
diff --git a/site2/docs/io-connectors.md b/site2/docs/io-connectors.md
index 1b6f9e85bc2e0..c23aca27b6354 100644
--- a/site2/docs/io-connectors.md
+++ b/site2/docs/io-connectors.md
@@ -188,7 +188,7 @@ Pulsar has various sink connectors, which are sorted alphabetically as below.
 
 * [Configuration](io-jdbc-sink.md#configuration)
   
-* [Example](io-jdbc-sink.md#example-for-clickhouse)
+* [Example](io-jdbc-sink.md#example-of-clickhouse)
   
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/jdbc/clickhouse/src/main/java/org/apache/pulsar/io/jdbc/ClickHouseJdbcAutoSchemaSink.java)
 
@@ -196,7 +196,7 @@ Pulsar has various sink connectors, which are sorted alphabetically as below.
 
 * [Configuration](io-jdbc-sink.md#configuration)
   
-* [Example](io-jdbc-sink.md#example-for-mariadb)
+* [Example](io-jdbc-sink.md#example-of-mariadb)
   
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/jdbc/mariadb/src/main/java/org/apache/pulsar/io/jdbc/MariadbJdbcAutoSchemaSink.java)
 
@@ -204,7 +204,7 @@ Pulsar has various sink connectors, which are sorted alphabetically as below.
 
 * [Configuration](io-jdbc-sink.md#configuration)
 
-* [Example](io-jdbc-sink.md#example-for-openmldb)
+* [Example](io-jdbc-sink.md#example-of-openmldb)
 
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/jdbc/openmldb/src/main/java/org/apache/pulsar/io/jdbc/OpenMLDBJdbcAutoSchemaSink.java)
 
@@ -212,7 +212,7 @@ Pulsar has various sink connectors, which are sorted alphabetically as below.
 
 * [Configuration](io-jdbc-sink.md#configuration)
   
-* [Example](io-jdbc-sink.md#example-for-postgresql)
+* [Example](io-jdbc-sink.md#example-of-postgresql)
   
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/jdbc/postgres/src/main/java/org/apache/pulsar/io/jdbc/PostgresJdbcAutoSchemaSink.java)
   
@@ -220,7 +220,7 @@ Pulsar has various sink connectors, which are sorted alphabetically as below.
 
 * [Configuration](io-jdbc-sink.md#configuration)
   
-* [Example](io-jdbc-sink.md#example-for-sqlite)
+* [Example](io-jdbc-sink.md#example-of-sqlite)
   
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/jdbc/sqlite/src/main/java/org/apache/pulsar/io/jdbc/SqliteJdbcAutoSchemaSink.java)
   
diff --git a/site2/docs/io-debezium-source.md b/site2/docs/io-debezium-source.md
index c4ce2c2f63e3f..a68dbcb53ab7b 100644
--- a/site2/docs/io-debezium-source.md
+++ b/site2/docs/io-debezium-source.md
@@ -26,9 +26,9 @@ The configuration of the Debezium source connector has the following properties.
 | `database.history.pulsar.topic` | true | null | The name of the database history topic where the connector writes and recovers DDL statements. 

    **Note: this topic is for internal use only and should not be used by consumers.** |
 | `database.history.pulsar.service.url` | true | null | Pulsar cluster service URL for history topic. |
 | `offset.storage.topic` | true | null | Record the last committed offsets that the connector successfully completes. |
-| `json-with-envelope` | false | false | Present the message only consist of payload. |
+| `json-with-envelope` | false | false | Present the message that only consists of payload. |
 | `database.history.pulsar.reader.config` | false | null | The configs of the reader for the database schema history topic, in the form of a JSON string with key-value pairs. |
-| `offset.storage.reader.config` | false | null | The configs of the reader for the kafka connector offsets topic, in the form of a JSON string with key-value pairs. | 
+| `offset.storage.reader.config` | false | null | The configs of the reader for the kafka connector offsets topic, in the form of a JSON string with key-value pairs. |
 
 ### Converter Options
 
@@ -57,7 +57,6 @@ Schema.AUTO_CONSUME(), KeyValueEncodingType.SEPARATED)`, and the message consist
 The Debezium Connector exposes `database.history.pulsar.reader.config` and `offset.storage.reader.config` to configure the reader of database schema history topic and the Kafka connector offsets topic. For example, it can be used to configure the subscription name and other reader configurations. You can find the available configurations at [ReaderConfigurationData](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java).
 
 For example, to configure the subscription name for both Readers, you can add the following configuration:
-
 * JSON
 
    ```json
@@ -72,11 +71,9 @@ For example, to configure the subscription name for both Readers, you can add th
 * YAML
 
    ```yaml
-   
    configs:
       database.history.pulsar.reader.config: "{\"subscriptionName\":\"history-reader\"}"
       offset.storage.reader.config: "{\"subscriptionName\":\"offset-reader\"}"
-
    ```
 
 ## Example of MySQL
diff --git a/site2/docs/io-debug.md b/site2/docs/io-debug.md
index 0ef98bfd96e77..45a0907b34ebf 100644
--- a/site2/docs/io-debug.md
+++ b/site2/docs/io-debug.md
@@ -58,7 +58,7 @@ Start the Mongo sink in localrun mode using the `localrun` command.
 
 :::tip
 
-For more information about the `localrun` command, see [`localrun`](reference-connector-admin.md/#localrun-1).
+For more information about the `localrun` command, see [`localrun`](reference-connector-admin.md).
 
 :::
 
@@ -255,7 +255,7 @@ Use the `get` command to get the basic information about the Mongo sink connecto
 
 :::tip
 
-For more information about the `get` command, see [`get`](reference-connector-admin.md/#get-1).
+For more information about the `get` command, see [`get`](reference-connector-admin.md).
 
 :::
 
@@ -291,7 +291,7 @@ Use the `status` command to get the current status about the Mongo sink connecto
 
 :::tip
 
-For more information about the `status` command, see [`status`](reference-connector-admin.md/#stauts-1).
+For more information about the `status` command, see [`status`](reference-connector-admin.md).
 If there are multiple connectors running on a worker, `workerId` can locate the worker on which the specified connector is running.
 
 :::
diff --git a/site2/docs/io-elasticsearch-sink.md b/site2/docs/io-elasticsearch-sink.md
index 26e04569ef723..ba593e62ad12a 100644
--- a/site2/docs/io-elasticsearch-sink.md
+++ b/site2/docs/io-elasticsearch-sink.md
@@ -33,17 +33,17 @@ entry.

    The `DELETE` operation can be performed when the primary key i
 not empty and the remaining value is empty. Use the `nullValueAction` to
 configure this behavior. The default configuration simply ignores such empty
 values.
-		
+
 ### Map multiple indexes
-		
+
 Since Pulsar 2.9.0, the `indexName` property is no more required. If you omit it, the sink writes to an index name after the Pulsar topic name.
-		
+
 ### Enable bulk writes
-		
+
 Since Pulsar 2.9.0, you can use bulk writes by setting the `bulkEnabled` property to `true`.
-		
+
 ### Enable secure connections via TLS
-		
+
 Since Pulsar 2.9.0, you can enable secure connections with TLS.  
 
 ## Configuration
diff --git a/site2/docs/io-overview.md b/site2/docs/io-overview.md
index 765cacbae0177..ed6b6dc95fbd6 100644
--- a/site2/docs/io-overview.md
+++ b/site2/docs/io-overview.md
@@ -85,7 +85,7 @@ bin/pulsar-admin sources create \
 # Other source configs
 ```
 
-For more information about the options of `pulsar-admin sources create`, see [here](reference-connector-admin.md#create).
+For more information about the options of `pulsar-admin sources create`, see [here](reference-connector-admin.md).
 
     
 
@@ -96,7 +96,7 @@ bin/pulsar-admin sinks create \
 # Other sink configs
 ```
 
-For more information about the options of `pulsar-admin sinks create`, see [here](reference-connector-admin.md#create-1).
+For more information about the options of `pulsar-admin sinks create`, see [here](reference-connector-admin.md).
 
 
 
@@ -128,7 +128,7 @@ bin/pulsar-admin sources update \
 # Other source configs
 ```
 
-For more information about the options of `pulsar-admin sources update`, see [here](reference-connector-admin.md#update).
+For more information about the options of `pulsar-admin sources update`, see [here](reference-connector-admin.md).
 
 
 
@@ -139,7 +139,7 @@ bin/pulsar-admin sinks update \
 # Other sink configs
 ```
 
-For more information about the options of `pulsar-admin sinks update`, see [here](reference-connector-admin.md#update-1).
+For more information about the options of `pulsar-admin sinks update`, see [here](reference-connector-admin.md).
 
 
 
diff --git a/site2/docs/io-use.md b/site2/docs/io-use.md
index d0d0965175753..99dbe54beba76 100644
--- a/site2/docs/io-use.md
+++ b/site2/docs/io-use.md
@@ -32,7 +32,7 @@ You can configure the following information:
 
 * [Configure a default storage location for a connector](#configure-a-default-storage-location-for-a-connector)
 
-* [Configure a connector with a YAML file](#configure-a-connector-with-yaml-file)
+* [Configure a connector with a YAML file](#configure-a-connector-with-a-yaml-file)
 
 ### Configure a default storage location for a connector
 
diff --git a/site2/docs/kubernetes-helm.md b/site2/docs/kubernetes-helm.md
index 5513a090b19e5..e8bc8070de17a 100644
--- a/site2/docs/kubernetes-helm.md
+++ b/site2/docs/kubernetes-helm.md
@@ -4,6 +4,12 @@ title: Get started in Kubernetes
 sidebar_label: "Run Pulsar in Kubernetes"
 ---
 
+:::tip
+
+This page has been deprecated and is no longer updated. For the latest and complete information about running Pulsar in Kubernetes, see the [quick start guide](getting-started-helm.md).
+
+:::
+
 This section guides you through every step of installing and running Apache Pulsar with Helm on Kubernetes quickly, including the following sections:
 
 - Install the Apache Pulsar on Kubernetes using Helm
@@ -16,8 +22,8 @@ For deploying a Pulsar cluster for production usage, read the documentation on [
 
 ## Prerequisite
 
-- Kubernetes server 1.14.0+
-- kubectl 1.14.0+
+- Kubernetes server 1.18.0+
+- kubectl 1.18.0+
 - Helm 3.0+
 
 :::tip
diff --git a/site2/docs/performance-pulsar-perf.md b/site2/docs/performance-pulsar-perf.md
index da715b4a12fbd..42cbed8fad0b5 100644
--- a/site2/docs/performance-pulsar-perf.md
+++ b/site2/docs/performance-pulsar-perf.md
@@ -10,7 +10,7 @@ The Pulsar Perf is a built-in performance test tool for Apache Pulsar. You can u
 
 :::tip
 
-For the latest and complete information about `pulsar-perf`, including commands, flags, descriptions, and more, see [`pulsar-perf`](/tools/pulsar-perf/) or [here](reference-cli-tools.md#pulsar-perf).
+For the latest and complete information about `pulsar-perf`, including commands, flags, descriptions, and more, see [`pulsar-perf`](/tools/pulsar-perf/) or [here](reference-cli-tools.md).
 
 :::
 
@@ -68,7 +68,7 @@ For the latest and complete information about `pulsar-perf`, including commands,
 
 :::tip
 
-For the latest and complete information about `pulsar-perf`, including commands, flags, descriptions, and more, see [`pulsar-perf`](/tools/pulsar-perf/) or [here](reference-cli-tools.md#pulsar-perf).
+For the latest and complete information about `pulsar-perf`, including commands, flags, descriptions, and more, see [`pulsar-perf`](/tools/pulsar-perf/) or [here](reference-cli-tools.md).
 
 :::
 
diff --git a/site2/docs/reference-cli-bookkeeper.md b/site2/docs/reference-cli-bookkeeper.md
deleted file mode 100644
index 2f6cf6ac7e85c..0000000000000
--- a/site2/docs/reference-cli-bookkeeper.md
+++ /dev/null
@@ -1,106 +0,0 @@
----
-id: reference-cli-bookkeeper
-title: Pulsar CLI tools - bookkeeper
-sidebar_label: "cli-bookkeeper"
----
-
-## `bookkeeper`
-A tool for managing BookKeeper.
-
-Usage
-
-```bash
-bookkeeper command
-```
-
-Environment variables
-
-The table below lists the environment variables that you can use to configure the bookkeeper tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|BOOKIE_LOG_CONF|Log4j configuration file|conf/log4j2.yaml|
-|BOOKIE_CONF|BookKeeper configuration file|conf/bk_server.conf|
-|BOOKIE_EXTRA_OPTS|Extra options to be passed to the JVM||
-|BOOKIE_EXTRA_CLASSPATH|Extra paths for BookKeeper's classpath||
-|ENTRY_FORMATTER_CLASS|The Java class used to format entries||
-|BOOKIE_PID_DIR|Folder where the BookKeeper server PID file should be stored||
-|BOOKIE_STOP_TIMEOUT|Wait time before forcefully killing the Bookie server instance if attempts to stop it are not successful||
-|BOOKIE_GC_LOG|Gc options to be passed to the jvm||
-
-
-### `autorecovery`
-Runs an auto-recovery service
-
-Usage
-
-```bash
-bookkeeper autorecovery options
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-
-
-### `bookie`
-Starts up a BookKeeper server (aka bookie)
-
-Usage
-
-```bash
-bookkeeper bookie options
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-|-readOnly|Force start a read-only bookie server|false|
-|-withAutoRecovery|Start auto-recovery service bookie server|false|
-
-
-### `localbookie`
-Runs a test ensemble of N bookies locally
-
-Usage
-
-```bash
-bookkeeper localbookie N
-```
-
-### `upgrade`
-Upgrade the bookie’s filesystem
-
-Usage
-
-```bash
-bookkeeper upgrade options
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-|`-u`, `--upgrade`|Upgrade the bookie’s directories||
-
-
-### `shell`
-Run shell for admin commands. To see a full listing of those commands, run bookkeeper shell without an argument.
-
-Usage
-
-```bash
-bookkeeper shell
-```
-
-Example
-
-```bash
-bookkeeper shell bookiesanity
-```
-
diff --git a/site2/docs/reference-cli-broker-tool.md b/site2/docs/reference-cli-broker-tool.md
deleted file mode 100644
index 56e2de9f5a288..0000000000000
--- a/site2/docs/reference-cli-broker-tool.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-id: reference-cli-broker-tool
-title: Pulsar CLI tools - broker-tool
-sidebar_label: "cli-broker-tool"
----
-
-## `broker-tool`
-
-The `broker- tool` is used for operations on a specific broker.
-
-Usage
-
-```bash
-broker-tool command
-```
-
-Example
-
-Two ways to get more information about a command as below:
-
-```bash
-broker-tool help command
-broker-tool command --help
-```
-
-### `load-report`
-
-Collect the load report of a specific broker. 
-The command is run on a broker, and used for troubleshooting why broker can’t collect right load report.
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--interval`| Interval to collect load report, in milliseconds ||
-|`-h`, `--help`| Display help information ||
diff --git a/site2/docs/reference-cli-pulsar-daemon.md b/site2/docs/reference-cli-pulsar-daemon.md
deleted file mode 100644
index b210f1793da3f..0000000000000
--- a/site2/docs/reference-cli-pulsar-daemon.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-id: reference-cli-pulsar-daemon
-title: Pulsar CLI tools - pulsar-daemon
-sidebar_label: "cli-pulsar-daemon"
----
-
-## `pulsar-daemon`
-
-A wrapper around the pulsar tool that’s used to start and stop processes, such as ZooKeeper, bookies, and Pulsar brokers, in the background using nohup.
-
-pulsar-daemon has a similar interface to the pulsar command but adds start and stop commands for various services. For a listing of those services, run pulsar-daemon to see the help output or see the documentation for the pulsar command.
-
-Usage
-
-```bash
-pulsar-daemon command
-```
-
-### `start`
-Start a service in the background using nohup.
-
-Usage
-
-```bash
-pulsar-daemon start service
-```
-
-### `stop`
-Stop a service that’s already been started using start.
-
-Usage
-
-```bash
-pulsar-daemon stop service options
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|-force|Stop the service forcefully if not stopped by normal shutdown.|false|
-
-### `restart`
-Restart a service that has already been started.
-
-```bash
-pulsar-daemon restart service
-```
\ No newline at end of file
diff --git a/site2/docs/reference-cli-pulsar-shell.md b/site2/docs/reference-cli-pulsar-shell.md
deleted file mode 100644
index fc22af59034a2..0000000000000
--- a/site2/docs/reference-cli-pulsar-shell.md
+++ /dev/null
@@ -1,155 +0,0 @@
----
-id: reference-cli-pulsar-shell
-title: Pulsar CLI tools - pulsar-shell
-sidebar_label: "cli-pulsar-shell"
----
-
-## `pulsar-shell`
-
-[Pulsar shell](administration-pulsar-shell.md) tool.
-
-### Interactive mode
-
-Usage
-
-```bash
-pulsar-shell
-```
-
-Options
-
-| Flag               | Description                                                               | Default          |
-|--------------------|---------------------------------------------------------------------------|------------------|
-| `-c`, `--config`   | Client configuration file. It is used as a `default` config.           | conf/client.conf | 
-| `--fail-on-error` | If true, the shell is interrupted when a command throws an exception.  | false            | 
-| `-h`, `--help`     | Show this help.                                                            | |
-
-
-### Non interactive mode
-
-Usage
-
-```bash
-pulsar-shell -f [FILE]
-pulsar-shell -e [COMMAND]
-echo "[COMMAND]" | pulsar-shell -
-```
-
-Options
-
-| Flag                      | Description                                                                                         | Default         |
-|---------------------------|-----------------------------------------------------------------------------------------------------|-----------------|
-| `-c`, `--config`          | Client configuration file. It is used as a `default` config.                                     | conf/client.conf | 
-| `--fail-on-error`         | If true, the shell is interrupted when a command throws an exception.                            | false           | 
-| `-np`, `--no-progress`    | Display raw output of the commands without the fancy progress visualization.                        | false           | 
-| `-f`, `--filename`        | Input filename with a list of commands to be executed. Each command must be separated by a newline. |                 |
-| `-e`, `--execute-command` | Execute this command and exit.                                                                      | |
-| `-` | Read commands from the standard input.                                                              | |
-| `-h`, `--help`     | Show this help.                                                                                      | |
-
-
-Commands
-* `admin` - See [Admin API](admin-api-overview.md)
-* `client` - See [pulsar-client](#pulsar-client)
-* `config`
-
-
-### `config`
-
-Manage shell configurations.
-
-#### `use`
-
-Use a specific configuration for next commands.
-
-```bash
-default(localhost)> config use mycluster
-```
-
-#### `create`
-
-Create a new configuration.
-
-```bash
-default(localhost)> config create --file ./conf/client.conf mycluster
-```
-
-Options
-
-| Flag     | Description              | Default         |
-|----------|--------------------------|-----------------|
-| `--file` | File path of the config. |  | 
-| `--url`  | URL of the config.       |  |
-| `--value`  | Inline value of the config. Base64-encoded value is supported with the prefix `base64:`. |  |
-
-#### `update`
-
-Update an existing configuration.
-
-```bash
-default(localhost)> config update --file ./conf/client.conf mycluster
-```
-
-Options
-
-| Flag     | Description              | Default         |
-|----------|--------------------------|-----------------|
-| `--file` | File path of the config. |  | 
-| `--url`  | URL of the config.       |  |
-| `--value`  | Inline value of the config. Base64-encoded value is supported with the prefix `base64:`. |  |
-
-#### `set-property`
-
-Set a value for a specified configuration property.
-
-```bash
-default(localhost)> config set-property -p webServiceUrl -v http:// mycluster
-```
-
-Options
-
-| Flag               | Description                 | Default         |
-|--------------------|-----------------------------|-----------------|
-| `-p`, `--property` | Property name to update.    |  | 
-| `-v`, `--value`    | New value for the property. |  |
-
-
-#### `get-property`
-
-Get the value for a specified configuration property.
-
-```bash
-default(localhost)> config get-property -p webServiceUrl mycluster
-```
-
-Options
-
-| Flag               | Description                 | Default         |
-|--------------------|-----------------------------|-----------------|
-| `-p`, `--property` | Property name to update.    |  | 
-
-
-#### `view`
-
-View details of a config.
-
-```bash
-default(localhost)> config view mycluster
-```
-
-#### `delete`
-
-Delete a config. You can't delete a config if it's currently used.
-
-```bash
-default(localhost)> config delete mycluster
-```
-
-
-#### `list`
-
-List all the configuration names.
-
-```bash
-default(localhost)> config list
-```
\ No newline at end of file
diff --git a/site2/docs/reference-cli-tools.md b/site2/docs/reference-cli-tools.md
index cde841484a4f4..3c592b195634c 100644
--- a/site2/docs/reference-cli-tools.md
+++ b/site2/docs/reference-cli-tools.md
@@ -6,14 +6,19 @@ sidebar_label: "Pulsar CLI tools"
 
 Pulsar offers several command-line tools that you can use for managing Pulsar installations, performance testing, using command-line producers and consumers, and more.
 
-* [`pulsar-admin`](https://pulsar.apache.org/reference/#/latest/pulsar-admin/)
-* [`pulsar`](https://pulsar.apache.org/reference/#/latest/pulsar/)
-* [`pulsar-client`](https://pulsar.apache.org/reference/#/latest/pulsar-client/)
-* [`pulsar-perf`](https://pulsar.apache.org/reference/#/latest/pulsar-perf/)
-* [`pulsar-daemon`](reference-cli-pulsar-daemon.md)
-* [`pulsar-shell`](reference-cli-pulsar-shell.md)
-* [`bookkeeper`](reference-cli-bookkeeper.md)
-* [`broker-tool`](reference-cli-broker-tool.md) 
+* `pulsar-admin`
+* `pulsar`
+* `pulsar-client`
+* `pulsar-daemon`
+* `pulsar-perf`
+* `pulsar-shell`
+* `bookkeeper`
+
+:::tip
+
+For the latest and complete information about command-line tools, including commands, flags, descriptions, and more information, see [Pulsar Reference](https://pulsar.apache.org/reference).
+
+:::
 
 All Pulsar command-line tools can be run from the `bin` directory of your [installed Pulsar package](getting-started-standalone.md). 
 
@@ -21,6 +26,4 @@ You can get help for any CLI tool, command, or subcommand using the `--help` fla
 
 ```shell
 bin/pulsar broker --help
-```
-
-
+```
\ No newline at end of file
diff --git a/site2/docs/reference-configuration-bookkeeper.md b/site2/docs/reference-configuration-bookkeeper.md
deleted file mode 100644
index 28e85dcaf6c25..0000000000000
--- a/site2/docs/reference-configuration-bookkeeper.md
+++ /dev/null
@@ -1,583 +0,0 @@
-# BookKeeper
-
-BookKeeper is a replicated log storage system that Pulsar uses for durable storage of all messages.
-
-### bookiePort
-
-The port on which the bookie server listens.
-
-**Default**: 3181
-
-### allowLoopback
-
-Whether the bookie is allowed to use a loopback interface as its primary interface (that is the interface used to establish its identity). By default, loopback interfaces are not allowed to work as the primary interface. Using a loopback interface as the primary interface usually indicates a configuration error. For example, it’s fairly common in some VPS setups to not configure a hostname or to have the hostname resolve to `127.0.0.1`. If this is the case, then all bookies in the cluster will establish their identities as `127.0.0.1:3181` and only one will be able to join the cluster. For VPSs configured like this, you should explicitly set the listening interface.
-
-**Default**: false
-
-### listeningInterface
-
-The network interface on which the bookie listens. By default, the bookie listens on all interfaces.
-
-**Default**: eth0
-
-### advertisedAddress
-
-Configure a specific hostname or IP address that the bookie should use to advertise itself to clients. By default, the bookie advertises either its own IP address or hostname according to the `listeningInterface` and `useHostNameAsBookieID` settings.
-
-**Default**: N/A
-
-### allowMultipleDirsUnderSameDiskPartition
-
-Configure the bookie to enable/disable multiple ledger/index/journal directories in the same filesystem disk partition.
-
-**Default**: false
-
-### minUsableSizeForIndexFileCreation
-
-The minimum safe usable size available in index directory for bookie to create index files while replaying journal at the time of bookie starts in Readonly Mode (in bytes).
-
-**Default**: 1073741824
-
-### journalDirectory
-
-The directory where BookKeeper outputs its write-ahead log (WAL).
-
-**Default**: data/bookkeeper/journal
-
-### journalDirectories
-
-Directories that BookKeeper outputs its write ahead log. Multiple directories are available, being separated by `,`. For example: `journalDirectories=/tmp/bk-journal1,/tmp/bk-journal2`. If `journalDirectories` is set, the bookies skip `journalDirectory` and use this setting directory.
-
-**Default**: /tmp/bk-journal
-
-### ledgerDirectories
-
-The directory where BookKeeper outputs ledger snapshots. This could define multiple directories to store snapshots separated by `,`, for example `ledgerDirectories=/tmp/bk1-data,/tmp/bk2-data`. Ideally, ledger dirs and the journal dir are each in a different device, which reduces the contention between random I/O and sequential write. It is possible to run with a single disk, but performance will be significantly lower.
-
-**Default**: data/bookkeeper/ledgers
-
-### ledgerManagerType
-
-The type of ledger manager used to manage how ledgers are stored, managed, and garbage collected. See [BookKeeper Internals](https://bookkeeper.apache.org/docs/next/getting-started/concepts) for more info.
-
-**Default**: hierarchical
-
-### zkLedgersRootPath
-
-The root ZooKeeper path used to store ledger metadata. This parameter is used by the ZooKeeper-based ledger manager as a root znode to store all ledgers.
-
-**Default**: /ledgers
-
-### ledgerStorageClass
-
-Ledger storage implementation class
-
-**Default**: org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage
-
-### entryLogFilePreallocationEnabled
-
-Enable or disable entry logger preallocation
-
-**Default**: true
-
-### logSizeLimit
-
-Max file size of the entry logger, in bytes. A new entry log file will be created when the old one reaches the file size limitation.
-
-**Default**: 1073741824
-
-### minorCompactionThreshold
-
-Threshold of minor compaction. Entry log files whose remaining size percentage reaches below this threshold will be compacted in a minor compaction. If set to less than zero, the minor compaction is disabled.
-
-**Default**: 0.2
-
-### minorCompactionInterval
-
-Time interval to run minor compaction, in seconds. If set to less than zero, the minor compaction is disabled. Note: should be greater than gcWaitTime.
-
-**Default**: 3600
-
-### majorCompactionThreshold
-
-The threshold of major compaction. Entry log files whose remaining size percentage reaches below this threshold will be compacted in a major compaction. Those entry log files whose remaining size percentage is still higher than the threshold will never be compacted. If set to less than zero, the major compaction is disabled.
-
-**Default**: 0.5
-
-### majorCompactionInterval
-
-The time interval to run major compaction, in seconds. If set to less than zero, the major compaction is disabled. Note: should be greater than gcWaitTime.
-
-**Default**: 86400
-
-### readOnlyModeEnabled
-
-If `readOnlyModeEnabled=true`, then on all full ledger disks, bookie will be converted to read-only mode and serve only read requests. Otherwise the bookie will be shutdown.
-
-**Default**: true
-
-### forceReadOnlyBookie
-
-Whether the bookie is force started in read only mode.
-
-**Default**: false
-
-### persistBookieStatusEnabled
-
-Persist the bookie status locally on the disks. So the bookies can keep their status upon restarts.
-
-**Default**: false
-
-### compactionMaxOutstandingRequests
-
-Sets the maximum number of entries that can be compacted without flushing. When compacting, the entries are written to the entrylog and the new offsets are cached in memory. Once the entrylog is flushed the index is updated with the new offsets. This parameter controls the number of entries added to the entrylog before a flush is forced. A higher value for this parameter means more memory will be used for offsets. Each offset consists of 3 longs. This parameter should not be modified unless you’re fully aware of the consequences.
-
-**Default**: 100000
-
-### compactionRate
-
-The rate at which compaction will read entries, in adds per second.
-
-**Default**: 1000
-
-### isThrottleByBytes
-
-Throttle compaction by bytes or by entries.
-
-**Default**: false
-
-### compactionRateByEntries
-
-The rate at which compaction will read entries, in adds per second.
-
-**Default**: 1000
-
-### compactionRateByBytes
-
-Set the rate at which compaction reads entries. The unit is bytes added per second.
-
-**Default**: 1000000
-
-### journalMaxSizeMB
-
-Max file size of journal file, in megabytes. A new journal file will be created when the old one reaches the file size limitation.
-
-**Default**: 2048
-
-### journalMaxBackups
-
-The max number of old journal files to keep. Keeping a number of old journal files would help data recovery in special cases.
-
-**Default**: 5
-
-### journalPreAllocSizeMB
-
-How space to pre-allocate at a time in the journal.
-
-**Default**: 16
-
-### journalWriteBufferSizeKB
-
-The of the write buffers used for the journal.
-
-**Default**: 64
-
-### journalRemoveFromPageCache
-
-Whether pages should be removed from the page cache after force write.
-
-**Default**: true
-
-### journalAdaptiveGroupWrites
-
-Whether to group journal force writes, which optimizes group commit for higher throughput.
-
-**Default**: true
-
-### journalMaxGroupWaitMSec
-
-The maximum latency to impose on a journal write to achieve grouping.
-
-**Default**: 1
-
-### journalAlignmentSize
-
-All the journal writes and commits should be aligned to given size
-
-**Default**: 4096
-
-### journalBufferedWritesThreshold
-
-Maximum writes to buffer to achieve grouping
-
-**Default**: 524288
-
-### journalFlushWhenQueueEmpty
-
-If we should flush the journal when journal queue is empty
-
-**Default**: false
-
-### numJournalCallbackThreads
-
-The number of threads that should handle journal callbacks
-
-**Default**: 8
-
-### openLedgerRereplicationGracePeriod
-
-The grace period, in milliseconds, that the replication worker waits before fencing and replicating a ledger fragment that's still being written to upon bookie failure.
-
-**Default**: 30000
-
-### rereplicationEntryBatchSize
-
-The number of max entries to keep in fragment for re-replication
-
-**Default**: 100
-
-### autoRecoveryDaemonEnabled
-
-Whether the bookie itself can start auto-recovery service.
-
-**Default**: true
-
-### lostBookieRecoveryDelay
-
-How long to wait, in seconds, before starting auto recovery of a lost bookie.
-
-**Default**: 0
-
-### gcWaitTime
-
-How long the interval to trigger next garbage collection, in milliseconds. Since garbage collection is running in background, too frequent gc will heart performance. It is better to give a higher number of gc interval if there is enough disk capacity.
-
-**Default**: 900000
-
-### gcOverreplicatedLedgerWaitTime
-
-How long the interval to trigger next garbage collection of overreplicated ledgers, in milliseconds. This should not be run very frequently since we read the metadata for all the ledgers on the bookie from zk.
-
-**Default**: 86400000
-
-### flushInterval
-
-How long the interval to flush ledger index pages to disk, in milliseconds. Flushing index files will introduce much random disk I/O. If separating journal dir and ledger dirs each on different devices, flushing would not affect performance. But if putting journal dir and ledger dirs on same device, performance degrade significantly on too frequent flushing. You can consider increment flush interval to get better performance, but you need to pay more time on bookie server restart after failure.
-
-**Default**: 60000
-
-### bookieDeathWatchInterval
-
-Interval to watch whether bookie is dead or not, in milliseconds
-
-**Default**: 1000
-
-### allowStorageExpansion
-
-Allow the bookie storage to expand. Newly added ledger and index dirs must be empty.
-
-**Default**: false
-
-### zkServers
-
-A list of one of more servers on which zookeeper is running. The server list can be comma separated values, for example: zkServers=zk1:2181,zk2:2181,zk3:2181.
-
-**Default**: localhost:2181
-
-### zkTimeout
-
-ZooKeeper client session timeout in milliseconds Bookie server will exit if it received SESSION_EXPIRED because it was partitioned off from ZooKeeper for more than the session timeout JVM garbage collection, disk I/O will cause SESSION_EXPIRED. Increment this value could help avoiding this issue
-
-**Default**: 30000
-
-### zkRetryBackoffStartMs
-
-The start time that the Zookeeper client backoff retries in milliseconds.
-
-**Default**: 1000
-
-### zkRetryBackoffMaxMs
-
-The maximum time that the Zookeeper client backoff retries in milliseconds.
-
-**Default**: 10000
-
-### zkEnableSecurity
-
-Set ACLs on every node written on ZooKeeper, allowing users to read and write BookKeeper metadata stored on ZooKeeper. In order to make ACLs work you need to setup ZooKeeper JAAS authentication. All the bookies and Client need to share the same user, and this is usually done using Kerberos authentication. See ZooKeeper documentation.
-
-**Default**: false
-
-### httpServerEnabled
-
-The flag enables/disables starting the admin http server.
-
-**Default**: false
-
-### httpServerPort
-
-The HTTP server port to listen on. By default, the value is `8080`. If you want to keep it consistent with the Prometheus stats provider, you can set it to `8000`.
-
-**Default**: 8080
-
-### httpServerClass
-
-The http server class.
-
-**Default**: org.apache.bookkeeper.http.vertx.VertxHttpServer
-
-### serverTcpNoDelay
-
-This settings is used to enabled/disabled Nagle’s algorithm, which is a means of improving the efficiency of TCP/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance.
-
-**Default**: true
-
-### serverSockKeepalive
-
-This setting is used to send keep-alive messages on connection-oriented sockets.
-
-**Default**: true
-
-### serverTcpLinger
-
-The socket linger timeout on close. When enabled, a close or shutdown will not return until all queued messages for the socket have been successfully sent or the linger timeout has been reached. Otherwise, the call returns immediately and the closing is done in the background.
-
-**Default**: 0
-
-### byteBufAllocatorSizeMax
-
-The maximum buf size of the received ByteBuf allocator.
-
-**Default**: 1048576
-
-### nettyMaxFrameSizeBytes
-
-The maximum netty frame size in bytes. Any message received larger than this will be rejected.
-
-**Default**: 5253120
-
-### openFileLimit
-
-Max number of ledger index files could be opened in bookie server If number of ledger index files reaches this limitation, bookie server started to swap some ledgers from memory to disk. Too frequent swap will affect performance. You can tune this number to gain performance according your requirements.
-
-**Default**: 0
-
-### pageSize
-
-Size of a index page in ledger cache, in bytes A larger index page can improve performance writing page to disk, which is efficient when you have small number of ledgers and these ledgers have similar number of entries. If you have large number of ledgers and each ledger has fewer entries, smaller index page would improve memory usage.
-
-**Default**: 8192
-
-### pageLimit
-
-How many index pages provided in ledger cache If number of index pages reaches this limitation, bookie server starts to swap some ledgers from memory to disk. You can increment this value when you found swap became more frequent. But make sure pageLimit\*pageSize should not more than JVM max memory limitation, otherwise you would got OutOfMemoryException. In general, incrementing pageLimit, using smaller index page would gain better performance in lager number of ledgers with fewer entries case If pageLimit is -1, bookie server will use 1/3 of JVM memory to compute the limitation of number of index pages.
-
-**Default**: 0
-
-### readOnlyModeEnabled
-
-If all ledger directories configured are full, then support only read requests for clients. If "readOnlyModeEnabled=true" then on all ledger disks full, bookie will be converted to read-only mode and serve only read requests. Otherwise the bookie will be shutdown. By default this will be disabled.
-
-**Default**: true
-
-### diskUsageThreshold
-
-For each ledger dir, maximum disk space which can be used. Default is 0.95f. i.e. 95% of disk can be used at most after which nothing will be written to that partition. If all ledger dir partitions are full, then bookie will turn to readonly mode if ‘readOnlyModeEnabled=true’ is set, else it will shutdown. Valid values should be in between 0 and 1 (exclusive).
-
-**Default**: 0.95
-
-### diskCheckInterval
-
-Disk check interval in milli seconds, interval to check the ledger dirs usage.
-
-**Default**: 10000
-
-### auditorPeriodicCheckInterval
-
-Interval at which the auditor will do a check of all ledgers in the cluster. By default this runs once a week. The interval is set in seconds. To disable the periodic check completely, set this to 0. Note that periodic checking will put extra load on the cluster, so it should not be run more frequently than once a day.
-
-**Default**: 604800
-
-### sortedLedgerStorageEnabled
-
-Whether sorted-ledger storage is enabled.
-
-**Default**: true
-
-### auditorPeriodicBookieCheckInterval
-
-The interval between auditor bookie checks. The auditor bookie check, checks ledger metadata to see which bookies should contain entries for each ledger. If a bookie which should contain entries is unavailable, thea the ledger containing that entry is marked for recovery. Setting this to 0 disabled the periodic check. Bookie checks will still run when a bookie fails. The interval is specified in seconds.
-
-**Default**: 86400
-
-### numAddWorkerThreads
-
-The number of threads that should handle write requests. if zero, the writes would be handled by netty threads directly.
-
-**Default**: 0
-
-### numReadWorkerThreads
-
-The number of threads that should handle read requests. if zero, the reads would be handled by netty threads directly.
-
-**Default**: 8
-
-### numHighPriorityWorkerThreads
-
-The umber of threads that should be used for high priority requests (i.e. recovery reads and adds, and fencing).
-
-**Default**: 8
-
-### maxPendingReadRequestsPerThread
-
-If read workers threads are enabled, limit the number of pending requests, to avoid the executor queue to grow indefinitely.
-
-**Default**: 2500
-
-### maxPendingAddRequestsPerThread
-
-The limited number of pending requests, which is used to avoid the executor queue to grow indefinitely when add workers threads are enabled.
-
-**Default**: 10000
-
-### isForceGCAllowWhenNoSpace
-
-Whether force compaction is allowed when the disk is full or almost full. Forcing GC could get some space back, but could also fill up the disk space more quickly. This is because new log files are created before GC, while old garbage log files are deleted after GC.
-
-**Default**: false
-
-### verifyMetadataOnGC
-
-True if the bookie should double check `readMetadata` prior to GC.
-
-**Default**: false
-
-### flushEntrylogBytes
-
-Entry log flush interval in bytes. Flushing in smaller chunks but more frequently reduces spikes in disk I/O. Flushing too frequently may also affect performance negatively.
-
-**Default**: 268435456
-
-### readBufferSizeBytes
-
-The number of bytes we should use as capacity for BufferedReadChannel.
-
-**Default**: 4096
-
-### writeBufferSizeBytes
-
-The number of bytes used as capacity for the write buffer
-
-**Default**: 65536
-
-### useHostNameAsBookieID
-
-Whether the bookie should use its hostname to register with the coordination service (e.g.: zookeeper service). When false, bookie will use its ip address for the registration.
-
-**Default**: false
-
-### bookieId
-
-If you want to custom a bookie ID or use a dynamic network address for the bookie, you can set the `bookieId`. 

    Bookie advertises itself using the `bookieId` rather than the `BookieSocketAddress` (`hostname:port` or `IP:port`). If you set the `bookieId`, then the `useHostNameAsBookieID` does not take effect.

    The `bookieId` is a non-empty string that can contain ASCII digits and letters ([a-zA-Z9-0]), colons, dashes, and dots. 

    For more information about `bookieId`, see [here](http://bookkeeper.apache.org/bps/BP-41-bookieid/).
-
-**Default**: N/A
-
-### allowEphemeralPorts
-
-Whether the bookie is allowed to use an ephemeral port (port 0) as its server port. By default, an ephemeral port is not allowed. Using an ephemeral port as the service port usually indicates a configuration error. However, in unit tests, using an ephemeral port will address port conflict problems and allow running tests in parallel.
-
-**Default**: false
-
-### enableLocalTransport
-
-Whether the bookie is allowed to listen for the BookKeeper clients executed on the local JVM.
-
-**Default**: false
-
-### disableServerSocketBind
-
-Whether the bookie is allowed to disable bind on network interfaces. This bookie will be available only to BookKeeper clients executed on the local JVM.
-
-**Default**: false
-
-### skipListArenaChunkSize
-
-The number of bytes that we should use as chunk allocation for `org.apache.bookkeeper.bookie.SkipListArena`.
-
-**Default**: 4194304
-
-### skipListArenaMaxAllocSize
-
-The maximum size that we should allocate from the skiplist arena. Allocations larger than this should be allocated directly by the VM to avoid fragmentation.
-
-**Default**: 131072
-
-### bookieAuthProviderFactoryClass
-
-The factory class name of the bookie authentication provider. If this is null, then there is no authentication.
-
-**Default**: null
-
-### statsProviderClass
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    **Default**: org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    **Default**:
-
-### prometheusStatsHttpPort
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    **Default**: 8000
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    **Default**:
-
-### dbStorage_writeCacheMaxSizeMb
-
-Size of Write Cache. Memory is allocated from JVM direct memory. Write cache is used to buffer entries before flushing into the entry log. For good performance, it should be big enough to hold a substantial amount of entries in the flush interval.
-
-**Default**: 25% of direct memory
-
-### dbStorage_readAheadCacheMaxSizeMb
-
-Size of Read cache. Memory is allocated from JVM direct memory. This read cache is pre-filled doing read-ahead whenever a cache miss happens. By default, it is allocated to 25% of the available direct memory.
-
-**Default**: N/A
-
-### dbStorage_readAheadCacheBatchSize
-
-How many entries to pre-fill in cache after a read cache miss
-
-**Default**: 1000
-
-### dbStorage_rocksDB_blockCacheSize
-
-Size of RocksDB block-cache. For best performance, this cache should be big enough to hold a significant portion of the index database which can reach ~2GB in some cases. By default, it uses 10% of direct memory.
-
-**Default**: N/A
-
-### dbStorage_rocksDB_writeBufferSizeMB
-
-**Default**: 64
-
-### dbStorage_rocksDB_sstSizeInMB
-
-**Default**: 64
-
-### dbStorage_rocksDB_blockSize
-
-**Default**: 65536
-
-### dbStorage_rocksDB_bloomFilterBitsPerKey
-
-**Default**: 10
-
-### dbStorage_rocksDB_numLevels
-
-**Default**: -1
-
-### dbStorage_rocksDB_numFilesInLevel0
-
-**Default**: 4
-
-### dbStorage_rocksDB_maxSizeInLevel1MB
-
-**Default**: 256
diff --git a/site2/docs/reference-configuration-log4j-shell.md b/site2/docs/reference-configuration-log4j-shell.md
deleted file mode 100644
index 43fca015c0d2d..0000000000000
--- a/site2/docs/reference-configuration-log4j-shell.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Log4j shell
-
-### bookkeeper.root.logger
-
-**Default**: ERROR,CONSOLE
-
-### log4j.rootLogger
-
-**Default**: ${bookkeeper.root.logger}
-
-### log4j.appender.CONSOLE
-
-**Default**: org.apache.log4j.ConsoleAppender
-
-### log4j.appender.CONSOLE.Threshold
-
-**Default**: DEBUG
-
-### log4j.appender.CONSOLE.layout
-
-**Default**: org.apache.log4j.PatternLayout
-
-### log4j.appender.CONSOLE.layout.ConversionPattern
-
-**Default**: %d{ABSOLUTE} %-5p %m%n
-
-### log4j.logger.org.apache.zookeeper
-
-**Default**: ERROR
-
-### log4j.logger.org.apache.bookkeeper
-
-**Default**: ERROR
-
-### log4j.logger.org.apache.bookkeeper.bookie.BookieShell
-
-**Default**: INFO
diff --git a/site2/docs/reference-configuration-log4j.md b/site2/docs/reference-configuration-log4j.md
deleted file mode 100644
index 6aa18e03a23b5..0000000000000
--- a/site2/docs/reference-configuration-log4j.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Log4j
-
-You can set the log level and configuration in the [log4j2.yaml](https://github.com/apache/pulsar/blob/d557e0aa286866363bc6261dec87790c055db1b0/conf/log4j2.yaml#L155) file. The following logging configuration parameters are available.
-
-### pulsar.root.logger
-
-**Default**: WARN,CONSOLE
-
-### pulsar.log.dir
-
-**Default**: logs
-
-### pulsar.log.file
-
-**Default**: pulsar.log
-
-### log4j.rootLogger
-
-**Default**: ${pulsar.root.logger}
-
-### log4j.appender.CONSOLE
-
-**Default**: org.apache.log4j.ConsoleAppender
-
-### log4j.appender.CONSOLE.Threshold
-
-**Default**: DEBUG
-
-### log4j.appender.CONSOLE.layout
-
-**Default**: org.apache.log4j.PatternLayout
-
-### log4j.appender.CONSOLE.layout.ConversionPattern
-
-**Default**: %d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
-
-### log4j.appender.ROLLINGFILE
-
-**Default**: org.apache.log4j.DailyRollingFileAppender
-
-### log4j.appender.ROLLINGFILE.Threshold
-
-**Default**: DEBUG
-
-### log4j.appender.ROLLINGFILE.File
-
-**Default**: ${pulsar.log.dir}/${pulsar.log.file}
-
-### log4j.appender.ROLLINGFILE.layout
-
-**Default**: org.apache.log4j.PatternLayout
-
-### log4j.appender.ROLLINGFILE.layout.ConversionPattern
-
-**Default**: %d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
-
-### log4j.appender.TRACEFILE
-
-**Default**: org.apache.log4j.FileAppender
-
-### log4j.appender.TRACEFILE.Threshold
-
-**Default**: TRACE
-
-### log4j.appender.TRACEFILE.File
-
-**Default**: pulsar-trace.log
-
-### log4j.appender.TRACEFILE.layout
-
-**Default**: org.apache.log4j.PatternLayout
-
-### log4j.appender.TRACEFILE.layout.ConversionPattern
-
-**Default**: %d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
-
-> Note: 'topic' in log4j2.appender is configurable.
->
-> - If you want to append all logs to a single topic, set the same topic name.
-> - If you want to append logs to different topics, you can set different topic names.
diff --git a/site2/docs/reference-configuration-zookeeper.md b/site2/docs/reference-configuration-zookeeper.md
deleted file mode 100644
index 0e4b6b43f54e2..0000000000000
--- a/site2/docs/reference-configuration-zookeeper.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# ZooKeeper
-
-ZooKeeper handles a broad range of essential configuration- and coordination-related tasks for Pulsar. The default configuration file for ZooKeeper is in the `conf/zookeeper.conf` file in your Pulsar installation. The following parameters are available:
-
-### tickTime
-
-The tick is the basic unit of time in ZooKeeper, measured in milliseconds and used to regulate things like heartbeats and timeouts. tickTime is the length of a single tick.
-
-**Default**: 2000
-
-### initLimit
-
-The maximum time, in ticks, that the leader ZooKeeper server allows follower ZooKeeper servers to successfully connect and sync. The tick time is set in milliseconds using the tickTime parameter.
-
-**Default**: 10
-
-### syncLimit
-
-The maximum time, in ticks, that a follower ZooKeeper server is allowed to sync with other ZooKeeper servers. The tick time is set in milliseconds using the tickTime parameter.
-
-**Default**: 5
-
-### dataDir
-
-The location where ZooKeeper will store in-memory database snapshots as well as the transaction log of updates to the database.
-
-**Default**: data/zookeeper
-
-### clientPort
-
-The port on which the ZooKeeper server will listen for connections.
-
-**Default**: 2181
-
-### admin.enableServer
-
-The port at which the admin listens.
-
-**Default**: true
-
-### admin.serverPort
-
-The port at which the admin listens.
-
-**Default**: 9990
-
-### autopurge.snapRetainCount
-
-In ZooKeeper, auto purge determines how many recent snapshots of the database stored in dataDir to retain within the time interval specified by autopurge.purgeInterval (while deleting the rest).
-
-**Default**: 3
-
-### autopurge.purgeInterval
-
-The time interval, in hours, by which the ZooKeeper database purge task is triggered. Setting to a non-zero number will enable auto purge; setting to 0 will disable. Read this guide before enabling auto purge.
-
-**Default**: 1
-
-### forceSync
-
-Requires updates to be synced to media of the transaction log before finishing processing the update. If this option is set to 'no', ZooKeeper will not require updates to be synced to the media. WARNING: it's not recommended to run a production ZK cluster with `forceSync` disabled.
-
-**Default**: yes
-
-### maxClientCnxns
-
-The maximum number of client connections. Increase this if you need to handle more ZooKeeper clients.
-
-**Default**: 60
-
----
-
-In addition to the parameters above, configuring ZooKeeper for Pulsar involves adding a `server.N` line to the `conf/zookeeper.conf` file for each node in the ZooKeeper cluster, where `N` is the number of the ZooKeeper node. Here's an example of a three-node ZooKeeper cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-> We strongly recommend consulting the [ZooKeeper Administrator's Guide](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html) for a more thorough and comprehensive introduction to ZooKeeper configuration
diff --git a/site2/docs/reference-configuration.md b/site2/docs/reference-configuration.md
new file mode 100644
index 0000000000000..8671e87999cfe
--- /dev/null
+++ b/site2/docs/reference-configuration.md
@@ -0,0 +1,7 @@
+---
+id: reference-configuration
+title: Pulsar Configuration
+sidebar_label: "Pulsar Configuration"
+---
+
+For a complete list of Pulsar configuration, visit the [Pulsar Reference](http://pulsar.apache.org/reference/#/) website.
diff --git a/site2/docs/reference-landing.md b/site2/docs/reference-landing.md
new file mode 100644
index 0000000000000..2a04ba9c93d0e
--- /dev/null
+++ b/site2/docs/reference-landing.md
@@ -0,0 +1,15 @@
+---
+id: reference-landing
+title: Reference
+sidebar_label: "Reference"
+---
+
+This reference section provides an overview of Apache Pulsar's key concepts, terminology, and features. You'll find more detailed information in the resources listed below. Happy streaming!
+
+- [Glossary](reference-terminology.md)
+- [Pulsar CLI tools](reference-cli-tools.md)
+- [Pulsar configuration](reference-configuration.md)
+- [Pulsar metrics](reference-metrics.md)
+
+
+
diff --git a/site2/docs/reference-metrics.md b/site2/docs/reference-metrics.md
index 959e58a4d0225..cbbca2cf03da6 100644
--- a/site2/docs/reference-metrics.md
+++ b/site2/docs/reference-metrics.md
@@ -25,7 +25,7 @@ The following types of metrics are available:
 
 ## ZooKeeper
 
-The ZooKeeper metrics are exposed under "/metrics" at port `8000`. You can use a different port by configuring the `metricsProvider.httpPort` in conf/zookeeper.conf.
+The ZooKeeper metrics are exposed under "/metrics" at port `8000`. You can use a different port by configuring the `metricsProvider.httpPort` in `conf/zookeeper.conf`.
 
 ZooKeeper provides a New Metrics System since 3.6.0. For more detailed metrics, refer to the [ZooKeeper Monitor Guide](https://zookeeper.apache.org/doc/r3.7.0/zookeeperMonitor.html).
 
@@ -605,16 +605,19 @@ All the web service executor metrics are labeled with the following labels:
 
 ### Metadata store metrics
 
-All the metadata store metrics are labelled with the following labels:
+All the metadata store metrics are labeled with the following labels:
 
 - *cluster*: `cluster=${pulsar_cluster}`. `${pulsar_cluster}` is the cluster name that you configured in `broker.conf`.
 - *name*: `name=${metadata-store|configuration-metadata-store|state-metadata-store}`. `${name}` is the metadata store name.
 
-| Name                                   | Type      | Description                                                                                  |
-|----------------------------------------|-----------|----------------------------------------------------------------------------------------------|
-| pulsar_metadata_store_ops_latency      | Histogram | The latency of getting/deleting/putting data fail/success operations from/to metadata store. |
-| pulsar_metadata_store_put_bytes_total  | Counter   | The number of data put to metadata store.                                                    |
-
+| Name                                               | Type      | Description                                                                                  |
+|----------------------------------------------------|-----------|----------------------------------------------------------------------------------------------|
+| pulsar_metadata_store_ops_latency                  | Histogram | The latency of getting/deleting/putting data from/to metadata store.                         |
+| pulsar_metadata_store_put_bytes_total              | Counter   | The number of data put to metadata store.                                                    |
+| pulsar_batch_metadata_store_executor_queue_size    | Gauge     | The number of blocking operations in metadata store executor.                                |
+| pulsar_batch_metadata_store_queue_wait_time_ms     | Histogram | The waiting time of batch operations.                                                        |
+| pulsar_batch_metadata_store_batch_execute_time_ms  | Histogram | The duration of the batch execution in milliseconds.                                         |
+| pulsar_batch_metadata_store_batch_size             | Histogram | The number of read/write operations in the batch.                                            |
 
 ## Pulsar Functions
 
diff --git a/site2/docs/reference-pulsar-admin.md b/site2/docs/reference-pulsar-admin.md
index 6115182419544..a121c1680d391 100644
--- a/site2/docs/reference-pulsar-admin.md
+++ b/site2/docs/reference-pulsar-admin.md
@@ -1409,7 +1409,7 @@ Options
 |Flag|Description|Default|
 |----|---|---|
 |`-s`, `--size`|The retention size limits (for example 10M, 16G or 3T) for each topic in the namespace. 0 means no retention and -1 means infinite size retention||
-|`-t`, `--time`|The retention time in minutes, hours, days, or weeks. Examples: 100m, 13h, 2d, 5w. 0 means no retention and -1 means infinite time retention||
+|`-t`, `--time`|The retention time with optional time unit suffix. For example, 100m, 3h, 2d, 5w. If the time unit is not specified, the default unit is seconds. For example, -t 120 sets retention to 2 minutes. 0 means no retention and -1 means infinite time retention||
 
 
 ### `unload`
diff --git a/site2/docs/schema-evolution-compatibility.md b/site2/docs/schema-evolution-compatibility.md
index 7e9d48f381d21..438eea638bfb0 100644
--- a/site2/docs/schema-evolution-compatibility.md
+++ b/site2/docs/schema-evolution-compatibility.md
@@ -6,29 +6,21 @@ sidebar_label: "Schema evolution and compatibility"
 
 Normally, schemas do not stay the same over a long period of time. Instead, they undergo evolutions to satisfy new needs. 
 
-This chapter examines how Pulsar schema evolves and what Pulsar schema compatibility check strategies are.
+This chapter introduces how Pulsar schema evolves and what compatibility check strategies it adopts.
 
 ## Schema evolution
 
-Pulsar schema is defined in a data structure called `SchemaInfo`. 
-
-Each `SchemaInfo` stored with a topic has a version. The version is used to manage the schema changes happening within a topic. 
-
 The message produced with `SchemaInfo` is tagged with a schema version. When a message is consumed by a Pulsar client, the Pulsar client can use the schema version to retrieve the corresponding `SchemaInfo` and use the correct schema information to deserialize data.
 
-### What is schema evolution?
-
 Schemas store the details of attributes and types. To satisfy new business requirements,  you need to update schemas inevitably over time, which is called **schema evolution**. 
 
 Any schema changes affect downstream consumers. Schema evolution ensures that the downstream consumers can seamlessly handle data encoded with both old schemas and new schemas. 
 
-### How Pulsar schema should evolve? 
-
-The answer is Pulsar schema compatibility check strategy. It determines how schema compares old schemas with new schemas in topics.
+### How schema evolves? 
 
-For more information, see [Schema compatibility check strategy](#schema-compatibility-check-strategy).
+The answer is [schema compatibility check strategy](#schema-compatibility-check-strategy). It determines how schema compares old schemas with new schemas in topics.
 
-### How does Pulsar support schema evolution?
+### How Pulsar supports schema evolution?
 
 The process of how Pulsar supports schema evolution is described as follows.
 
@@ -46,38 +38,38 @@ The process of how Pulsar supports schema evolution is described as follows.
 
    :::
 
-3. Brokers use the schema compatibility checker to check if the `SchemaInfo` is compatible with the latest schema of the topic by applying its [compatibility check strategy](#compatibility-check-strategy). Currently, the compatibility check strategy is configured at the namespace level and applied to all the topics within that namespace.
+3. Brokers use the schema compatibility checker to check if the `SchemaInfo` is compatible with the latest schema of the topic by applying its [compatibility check strategy](#schema-compatibility-check-strategy). Currently, the compatibility check strategy is configured at the namespace level and applied to all the topics within that namespace.
 
 For more details, see [`schemaRegistryCompatibilityCheckers`](https://github.com/apache/pulsar/blob/bf194b557c48e2d3246e44f1fc28876932d8ecb8/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java).
 
 
 ## Schema compatibility check strategy
 
-Pulsar has 8 schema compatibility check strategies, which are summarized in the following table.
+The following table outlines 8 schema compatibility check strategies and how it works.
 
-Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is the oldest and V3 is the latest:
+Suppose that you have a topic containing three schemas (V1, V2, and V3). V1 is the oldest and V3 is the latest.
 
 |  Compatibility check strategy  |   Definition  |   Changes allowed  |   Check against which schema  |   Upgrade first  | 
 | --- | --- | --- | --- | --- |
 |  `ALWAYS_COMPATIBLE`  |   Disable schema compatibility check.  |   All changes are allowed  |   All previous versions  |   Any order  | 
-|  `ALWAYS_INCOMPATIBLE`  |   Disable schema evolution.  |   All changes are disabled  |   None  |   None  | 
-|  `BACKWARD`  |   Consumers using schema V3 can process data written by producers using schema V3 or V2.  |   
  • Add optional fields 
  • Delete fields 
    •  |   Latest version  |   Consumers  | 
-|  `BACKWARD_TRANSITIVE`  |   Consumers using schema V3 can process data written by producers using schema V3, V2 or V1.  |   
  • Add optional fields 
  • Delete fields 
    •  |   All previous versions  |   Consumers  | 
-|  `FORWARD`  |   Consumers using schema V3 or V2 can process data written by producers using schema V3.  |   
  • Add fields 
  • Delete optional fields 
    •  |   Latest version  |   Producers  | 
-|  `FORWARD_TRANSITIVE`  |   Consumers using schema V3, V2, or V1 can process data written by producers using schema V3.  |   
  • Add fields 
  • Delete optional fields 
    •  |   All previous versions  |   Producers  | 
-|  `FULL`  |   Backward and forward compatible between the schema V3 and V2.  |   
  • Modify optional fields 
    •  |   Latest version  |   Any order  | 
-|  `FULL_TRANSITIVE`  |   Backward and forward compatible among schema V3, V2, and V1.  |   
  • Modify optional fields 
    •  |   All previous versions  |   Any order  | 
-
-### ALWAYS_COMPATIBLE and ALWAYS_INCOMPATIBLE 
-
-|  Compatibility check strategy  |   Definition  |   Note  | 
-| --- | --- | --- |
-|  `ALWAYS_COMPATIBLE`  |   Disable schema compatibility check.  |   None  | 
-|  `ALWAYS_INCOMPATIBLE`  |   Disable schema evolution, that is, any schema change is rejected.  |   
  • For all schema types except Avro and JSON, the default schema compatibility check strategy is `ALWAYS_INCOMPATIBLE`. 
  • For Avro and JSON, the default schema compatibility check strategy is `FULL`. 
    •  |  
-
-#### Example 
-  
-* Example  1
+|  `ALWAYS_INCOMPATIBLE`  |   Disable schema evolution, that is, any schema change is rejected.  |   All changes are disabled  |   None  |   None  | 
+|  `BACKWARD`  |   Consumers using schema V3 can process data written by producers using the **last schema version** V2.  |   
  • Add optional fields 
  • Delete fields 
    •  |   Latest version  |   Consumers  | 
+|  `BACKWARD_TRANSITIVE`  |   Consumers using schema V3 can process data written by producers using **all previous schema versions** V2 and V1.  |   
  • Add optional fields 
  • Delete fields 
    •  |   All previous versions  |   Consumers  | 
+|  `FORWARD`  |   Consumers using the **last schema version** V2 can process data written by producers using a new schema V3, even though they may not be able to use the full capabilities of the new schema.  |   
  • Add fields 
  • Delete optional fields 
    •  |   Latest version  |   Producers  | 
+|  `FORWARD_TRANSITIVE`  |   Consumers using **all previous schema versions** V2 or V1 can process data written by producers using a new schema V3.  |   
  • Add fields 
  • Delete optional fields 
    •  |   All previous versions  |   Producers  | 
+|  `FULL`  |   Schemas are both backward and forward compatible. 
  • Consumers using the last schema V2 can process data written by producers using the new schema V3. 
  • Consumers using the new schema V3 can process data written by producers using the last schema V2.
    •   |   
  • Modify optional fields 
    •  |   Latest version  |   Any order  | 
+|  `FULL_TRANSITIVE`  |   Backward and forward compatible among schema V3, V2, and V1. 
  • Consumers using the schema V3 can process data written by producers using schema V2 and V1. 
  • Consumers using the schema V2 or V1 can process data written by producers using the schema V3.
    •   |   
  • Modify optional fields 
    •  |   All previous versions  |   Any order  | 
+
+:::tip
+
+* The default schema compatibility check strategy varies depending on schema types.
+  * For Avro and JSON, the default one is `FULL`.
+  * For others, the default one is `ALWAYS_INCOMPATIBLE`.
+* You can set schema compatibility check strategy at the topic, namespace or broker level. For how to set the strategy, see [here](admin-api-schemas.md#set-schema-compatibility-check-strategy).
+
+:::
+
+### ALWAYS_COMPATIBLE example
   
   In some situations, an application needs to store events of several different types in the same Pulsar topic. 
 
@@ -85,13 +77,11 @@ Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is t
 
   For example, for a user entity, there are `userCreated`, `userAddressChanged` and `userEnquiryReceived` events. The application requires that those events are always read in the same order. 
 
-  Consequently, those events need to go in the same Pulsar partition to maintain order. This application can use `ALWAYS_COMPATIBLE` to allow different kinds of events to co-exist in the same topic.
-
-* Example 2
+  Consequently, those events need to go in the same Pulsar partition to maintain order. This application can use `ALWAYS_COMPATIBLE` to allow different kinds of events to co-exist on the same topic.
 
-  Sometimes we also make incompatible changes. 
+### ALWAYS_INCOMPATIBLE example
 
-  For example, you are modifying a field type from `string` to `int`.
+  Sometimes we also make incompatible changes. For example, you are modifying a field type from `string` to `int`.
 
   In this case, you need to:
 
@@ -99,16 +89,7 @@ Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is t
 
   * Optionally, create a new topic and start migrating applications to use the new topic and the new schema, avoiding the need to handle two incompatible versions in the same topic.
 
-### BACKWARD and BACKWARD_TRANSITIVE 
-
-Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is the oldest and V3 is the latest:
-
-| Compatibility check strategy | Definition                                                                                           | Description                                                                                             |
-|------------------------------|------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|
-| `BACKWARD`                   | Consumers using the new schema can process data written by producers using the **last schema**.      | The consumers using the schema V3 can process data written by producers using the schema V3 or V2.      |
-| `BACKWARD_TRANSITIVE`        | Consumers using the new schema can process data written by producers using **all previous schemas**. | The consumers using the schema V3 can process data written by producers using the schema V3, V2, or V1. |
-
-#### Example  
+### BACKWARD and BACKWARD_TRANSITIVE example
   
 * Example 1
   
@@ -122,17 +103,8 @@ Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is t
 
   Same SQL queries must continue to work even if the data is changed. To support it, you can evolve the schemas using the `BACKWARD` strategy.
 
-### FORWARD and FORWARD_TRANSITIVE 
+### FORWARD and FORWARD_TRANSITIVE example
 
-Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is the oldest and V3 is the latest:
-
-| Compatibility check strategy | Definition                                                                                                                                                                     | Description                                                                                             |
-|------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|
-| `FORWARD`                    | Consumers using the **last schema** can process data written by producers using a new schema, even though they may not be able to use the full capabilities of the new schema. | The consumers using the schema V3 or V2 can process data written by producers using the schema V3.      |
-| `FORWARD_TRANSITIVE`         | Consumers using **all previous schemas** can process data written by producers using a new schema.                                                                             | The consumers using the schema V3, V2, or V1 can process data written by producers using the schema V3. |
-
-#### Example  
-  
 * Example 1
   
   Add a field.
@@ -147,40 +119,28 @@ Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is t
   
   Consequently, you can evolve the schemas using the `FORWARD` strategy to ensure that the old schema can process data encoded with the new schema.
 
-### FULL and FULL_TRANSITIVE 
-
-Suppose that you have a topic containing three schemas (V1, V2, and V3), V1 is the oldest and V3 is the latest:
-
-|  Compatibility check strategy  |   Definition  |   Description  |   Note  | 
-| --- | --- | --- | --- |
-|  `FULL`  |   Schemas are both backward and forward compatible, which means: Consumers using the last schema can process data written by producers using the new schema. AND Consumers using the new schema can process data written by producers using the last schema.  |   Consumers using the schema V3 can process data written by producers using the schema V3 or V2. AND Consumers using the schema V3 or V2 can process data written by producers using the schema V3.  |   
  • For Avro and JSON, the default schema compatibility check strategy is `FULL`. 
  • For all schema types except Avro and JSON, the default schema compatibility check strategy is `ALWAYS_INCOMPATIBLE`. 
    •  | 
-|  `FULL_TRANSITIVE`  |   The new schema is backward and forward compatible with all previously registered schemas.  |   Consumers using the schema V3 can process data written by producers using the schema V3, V2 or V1. AND Consumers using the schema V3, V2 or V1 can process data written by producers using the schema V3.  |   None  | 
-
-#### Example  
+### FULL and FULL_TRANSITIVE example
 
 In some data formats, for example, Avro, you can define fields with default values. Consequently, adding or removing a field with a default value is a fully compatible change.
 
-:::tip
 
-You can set schema compatibility check strategy at the topic, namespace or broker level. For how to set the strategy, see [here](schema-manage.md#set-schema-compatibility-check-strategy).
-
-:::
-
-## Schema verification
+## Schema validation
 
 When a producer or a consumer tries to connect to a topic, a broker performs some checks to verify a schema.
 
-### Producer
+### Validation on producers
 
-When a producer tries to connect to a topic (suppose ignore the schema auto-creation), a broker does the following checks:
+By default, `schemaValidationEnforced` is **disabled** for producers, which means:
+* A producer without a schema can produce any kind of messages to a topic with schemas, which may result in producing trash data to the topic. 
+* It allows non-java language clients that don’t support schema can produce messages to a topic with schemas.
 
-* Check if the schema carried by the producer exists in the schema registry or not.
+However, if you want a stronger guarantee on the topics with schemas, you can enable `schemaValidationEnforced` across the whole cluster or on a per-namespace basis. 
 
+With `schemaValidationEnforced` enabled, When a producer tries to connect to a topic (suppose ignore the schema auto-creation), the broker checks if the schema carried by the producer exists in the schema registry or not.
   * If the schema is already registered, then the producer is connected to a broker and produces messages with that schema.
-  
   * If the schema is not registered, then Pulsar verifies if the schema is allowed to be registered based on the configured compatibility check strategy.
   
-### Consumer
+### Validation on consumers
 
 When a consumer tries to connect to a topic, a broker checks if a carried schema is compatible with a registered schema based on the configured schema compatibility check strategy.
 
@@ -197,7 +157,7 @@ When a consumer tries to connect to a topic, a broker checks if a carried schema
 
 ## Order of upgrading clients
 
-The order of upgrading client applications is determined by the compatibility check strategy.
+The order of upgrading client applications is determined by the [schema compatibility check strategy](#schema-compatibility-check-strategy).
 
 For example, the producers use schemas to write data to Pulsar and the consumers use schemas to read data from Pulsar. 
 
@@ -207,8 +167,4 @@ For example, the producers use schemas to write data to Pulsar and the consumers
 |  `ALWAYS_INCOMPATIBLE`  |   None  | The schema evolution is disabled.                                                                                                                                                                                                                                                                                   | 
 |  
  • `BACKWARD` 
  • `BACKWARD_TRANSITIVE` 
    •  |   Consumers  | There is no guarantee that consumers using the old schema can read data produced using the new schema. Consequently, **upgrade all consumers first**, and then start producing new data.                                                                                                                            | 
 |  
  • `FORWARD` 
  • `FORWARD_TRANSITIVE` 
    •  |   Producers  | There is no guarantee that consumers using the new schema can read data produced using the old schema. Consequently, **upgrade all producers first**
  • to use the new schema and ensure that the data already produced using the old schemas are not available to consumers, and then upgrades the consumers. 
    •  | 
-|  
  • `FULL` 
  • `FULL_TRANSITIVE` 
    •  |   Any order  | It is guaranteed that consumers using the old schema can read data produced using the new schema and consumers using the new schema can read data produced using the old schema. Consequently, you can upgrade the producers and consumers in **any order**.                                                        | 
-
-
-
-
+|  
  • `FULL` 
  • `FULL_TRANSITIVE` 
    •  |   Any order  | It is guaranteed that consumers using the old schema can read data produced using the new schema and consumers using the new schema can read data produced using the old schema. Consequently, you can upgrade the producers and consumers in **any order**.                                                        | 
\ No newline at end of file
diff --git a/site2/docs/schema-get-started.md b/site2/docs/schema-get-started.md
index be7a288dc7da9..5b6cea677e3b4 100644
--- a/site2/docs/schema-get-started.md
+++ b/site2/docs/schema-get-started.md
@@ -4,92 +4,470 @@ title: Get started
 sidebar_label: "Get started"
 ---
 
-This chapter introduces Pulsar schemas and explains why they are important. 
 
-## Schema Registry
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
 
-Type safety is extremely important in any application built around a message bus like Pulsar. 
 
-Producers and consumers need some kind of mechanism for coordinating types at the topic level to avoid various potential problems arising. For example, serialization and deserialization issues. 
+This hands-on tutorial provides instructions and examples on how to construct and customize schemas.
 
-Applications typically adopt one of the following approaches to guarantee type safety in messaging. Both approaches are available in Pulsar, and you're free to adopt one or the other or to mix and match on a per-topic basis.
+## Construct a string schema
 
-#### Note
->
-> Currently, the Pulsar schema registry is only available for the [Java client](client-libraries-java.md), [Go client](client-libraries-go.md), [Python client](client-libraries-python.md), and [C++ client](client-libraries-cpp.md).
+This example demonstrates how to construct a [string schema](schema-understand.md#primitive-type) and use it to produce and consume messages in Java.
 
-### Client-side approach
+1. Create a producer with a string schema and send messages.
 
-Producers and consumers are responsible for not only serializing and deserializing messages (which consist of raw bytes) but also "knowing" which types are being transmitted via which topics. 
+   ```java
+   Producer producer = client.newProducer(Schema.STRING).create();
+   producer.newMessage().value("Hello Pulsar!").send();
+   ```
 
-If a producer is sending temperature sensor data on the topic `topic-1`, consumers of that topic will run into trouble if they attempt to parse that data as moisture sensor readings.
+2. Create a consumer with a string schema and receive messages.  
 
-Producers and consumers can send and receive messages consisting of raw byte arrays and leave all type safety enforcement to the application on an "out-of-band" basis.
+   ```java
+   Consumer consumer = client.newConsumer(Schema.STRING).subscribe();
+   consumer.receive();
+   ```
 
-### Server-side approach 
+## Construct a key/value schema
 
-Producers and consumers inform the system which data types can be transmitted via the topic. 
+This example shows how to construct a [key/value schema](schema-understand.md#keyvalue-schema) and use it to produce and consume messages in Java.
 
-With this approach, the messaging system enforces type safety and ensures that producers and consumers remain synced.
+1. Construct a key/value schema with `INLINE` encoding type.
 
-Pulsar has a built-in **schema registry** that enables clients to upload data schemas on a per-topic basis. Those schemas dictate which data types are recognized as valid for that topic.
+   ```java
+   Schema> kvSchema = Schema.KeyValue(
+   Schema.INT32,
+   Schema.STRING,
+   KeyValueEncodingType.INLINE
+   );
+   ```
 
-## Why use schema
+2. Optionally, construct a key/value schema with `SEPARATED` encoding type.
 
-When a schema is enabled, Pulsar does parse data, it takes bytes as inputs and sends bytes as outputs. While data has meaning beyond bytes, you need to parse data and might encounter parse exceptions which mainly occur in the following situations:
+   ```java
+   Schema> kvSchema = Schema.KeyValue(
+   Schema.INT32,
+   Schema.STRING,
+   KeyValueEncodingType.SEPARATED
+   );
+   ```
 
-* The field does not exist
+3. Produce messages using a key/value schema.
 
-* The field type has changed (for example, `string` is changed to `int`)
+   ```java
+   Producer> producer = client.newProducer(kvSchema)
+       .topic(TOPIC)
+       .create();
 
-There are a few methods to prevent and overcome these exceptions, for example, you can catch exceptions when parsing errors, which makes code hard to maintain; or you can adopt a schema management system to perform schema evolution, not to break downstream applications, and enforces type safety to max extend in the language you are using, the solution is Pulsar Schema.
+   final int key = 100;
+   final String value = "value-100";
 
-Pulsar schema enables you to use language-specific types of data when constructing and handling messages from simple types like `string` to more complex application-specific types. 
+   // send the key/value message
+   producer.newMessage()
+   .value(new KeyValue(key, value))
+   .send();
+   ```
+
+4. Consume messages using a key/value schema.
+
+   ```java
+   Consumer> consumer = client.newConsumer(kvSchema)
+       ...
+       .topic(TOPIC)
+       .subscriptionName(SubscriptionName).subscribe();
+
+   // receive key/value pair
+   Message> msg = consumer.receive();
+   KeyValue kv = msg.getValue();
+   ```
+
+## Construct a struct schema
+
+This example shows how to construct a [struct schema](schema-understand.md#struct-schema) and use it to produce and consume messages using different methods.
+
+````mdx-code-block
+
+
+
+
+You can predefine the `struct` schema, which can be a POJO in Java, a `struct` in Go, or classes generated by Avro or Protobuf tools. 
+
+**Example** 
+
+Pulsar gets the schema definition from the predefined `struct` using an Avro library. The schema definition is the schema data stored as a part of the `SchemaInfo`.
+
+1. Create the _User_ class to define the messages sent to Pulsar topics.
+
+   ```java
+   @Builder
+   @AllArgsConstructor
+   @NoArgsConstructor
+   public static class User {
+       String name;
+       int age;
+   }
+   ```
+
+2. Create a producer with a `struct` schema and send messages.
+
+   ```java
+   Producer producer = client.newProducer(Schema.AVRO(User.class)).create();
+   producer.newMessage().value(User.builder().name("pulsar-user").age(1).build()).send();
+   ```
+
+3. Create a consumer with a `struct` schema and receive messages
+
+   ```java
+   Consumer consumer = client.newConsumer(Schema.AVRO(User.class)).subscribe();
+   User user = consumer.receive().getValue();
+   ```
+
+
+
+
+Sometimes applications do not have pre-defined structs, and you can use this method to define schema and access data.
+
+You can define the `struct` schema using the `GenericSchemaBuilder`, generate a generic struct using `GenericRecordBuilder` and consume messages into `GenericRecord`.
+
+**Example** 
+
+1. Use `RecordSchemaBuilder` to build a schema.
+
+   ```java
+   RecordSchemaBuilder recordSchemaBuilder = SchemaBuilder.record("schemaName");
+   recordSchemaBuilder.field("intField").type(SchemaType.INT32);
+   SchemaInfo schemaInfo = recordSchemaBuilder.build(SchemaType.AVRO);
+
+   Producer producer = client.newProducer(Schema.generic(schemaInfo)).create();
+   ```
+
+2. Use `RecordBuilder` to build the struct records.
+
+   ```java
+   producer.newMessage().value(schema.newRecordBuilder()
+               .set("intField", 32)
+               .build()).send();
+   ```
+
+
+
+
+You can define the `schemaDefinition` to generate a `struct` schema.
 
 **Example** 
 
-You can use the _User_ class to define the messages sent to Pulsar topics.
+1. Create the _User_ class to define the messages sent to Pulsar topics.
+
+   ```java
+   @Builder
+   @AllArgsConstructor
+   @NoArgsConstructor
+   public static class User {
+       String name;
+       int age;
+   }
+   ```
+
+2. Create a producer with a `SchemaDefinition` and send messages.
+
+   ```java
+   SchemaDefinition schemaDefinition = SchemaDefinition.builder().withPojo(User.class).build();
+   Producer producer = client.newProducer(Schema.AVRO(schemaDefinition)).create();
+   producer.newMessage().value(User.builder().name("pulsar-user").age(1).build()).send();
+   ```
+
+3. Create a consumer with a `SchemaDefinition` schema and receive messages
+
+   ```java
+   SchemaDefinition schemaDefinition = SchemaDefinition.builder().withPojo(User.class).build();
+   Consumer consumer = client.newConsumer(Schema.AVRO(schemaDefinition)).subscribe();
+   User user = consumer.receive().getValue();
+   ```
+
+
+
+
+````
+
+### Avro schema using Java
+
+Suppose you have a `SensorReading` class as follows, and you'd like to transmit it over a Pulsar topic.
 
 ```java
-public class User {
-    String name;
-    int age;
+public class SensorReading {
+    public float temperature;
+
+    public SensorReading(float temperature) {
+        this.temperature = temperature;
+    }
+
+    // A no-arg constructor is required
+    public SensorReading() {
+    }
+
+    public float getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(float temperature) {
+        this.temperature = temperature;
+    }
 }
 ```
 
-When constructing a producer with the _User_ class, you can specify a schema or not as below.
+Create a `Producer` (or `Consumer`) like this:
+
+```java
+Producer producer = client.newProducer(AvroSchema.of(SensorReading.class))
+        .topic("sensor-readings")
+        .create();
+```
+
+### Avro-based schema using Java
+
+The following schema formats are currently available for Java:
+
+* No schema or the byte array schema (which can be applied using `Schema.BYTES`):
+
+  ```java
+  Producer bytesProducer = client.newProducer(Schema.BYTES)
+      .topic("some-raw-bytes-topic")
+      .create();
+  ```
+
+  Or, equivalently:
+
+  ```java
+  Producer bytesProducer = client.newProducer()
+      .topic("some-raw-bytes-topic")
+      .create();
+  ```
+
+* `String` for normal UTF-8-encoded string data. Apply the schema using `Schema.STRING`:
+
+  ```java
+  Producer stringProducer = client.newProducer(Schema.STRING)
+      .topic("some-string-topic")
+      .create();
+  ```
+
+* Create JSON schemas for POJOs using `Schema.JSON`. The following is an example.
+
+  ```java
+  Producer pojoProducer = client.newProducer(Schema.JSON(MyPojo.class))
+      .topic("some-pojo-topic")
+      .create();
+  ```
+
+* Generate Protobuf schemas using `Schema.PROTOBUF`. The following example shows how to create the Protobuf schema and use it to instantiate a new producer:
+
+  ```java
+  Producer protobufProducer = client.newProducer(Schema.PROTOBUF(MyProtobuf.class))
+      .topic("some-protobuf-topic")
+      .create();
+  ```
+
+* Define Avro schemas with `Schema.AVRO`. The following code snippet demonstrates how to create and use Avro schema.
+
+  ```java
+  Producer avroProducer = client.newProducer(Schema.AVRO(MyAvro.class))
+      .topic("some-avro-topic")
+      .create();
+  ```
+
+
+### Avro schema using C++
+
+- The following example shows how to create a producer with an Avro schema.
+
+  ```cpp
+  static const std::string exampleSchema =
+      "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
+      "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
+  Producer producer;
+  ProducerConfiguration producerConf;
+  producerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
+  client.createProducer("topic-avro", producerConf, producer);
+  ```
+
+- The following example shows how to create a consumer with an Avro schema.
+
+  ```cpp
+  static const std::string exampleSchema =
+      "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
+      "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
+  ConsumerConfiguration consumerConf;
+  Consumer consumer;
+  consumerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
+  client.subscribe("topic-avro", "sub-2", consumerConf, consumer)
+  ```
+
+### ProtobufNative schema using C++
+
+The following example shows how to create a producer and a consumer with a ProtobufNative schema.
+
+1. Generate the `User` class using Protobuf3 or later versions.
+
+   ```protobuf
+   syntax = "proto3";
+
+   message User {
+       string name = 1;
+       int32 age = 2;
+   }
+   ```
+
+2. Include the `ProtobufNativeSchema.h` in your source code. Ensure the Protobuf dependency has been added to your project.
+
+   ```cpp
+   #include 
+   ```
+
+3. Create a producer to send a `User` instance.
+
+   ```cpp
+   ProducerConfiguration producerConf;
+   producerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
+   Producer producer;
+   client.createProducer("topic-protobuf", producerConf, producer);
+   User user;
+   user.set_name("my-name");
+   user.set_age(10);
+   std::string content;
+   user.SerializeToString(&content);
+   producer.send(MessageBuilder().setContent(content).build());
+   ```
+
+4. Create a consumer to receive a `User` instance.
+
+   ```cpp
+   ConsumerConfiguration consumerConf;
+   consumerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
+   consumerConf.setSubscriptionInitialPosition(InitialPositionEarliest);
+   Consumer consumer;
+   client.subscribe("topic-protobuf", "my-sub", consumerConf, consumer);
+   Message msg;
+   consumer.receive(msg);
+   User user2;
+   user2.ParseFromArray(msg.getData(), msg.getLength());
+   ```
+
+
+## Construct an AUTO_PRODUCE schema
+
+Suppose you have a Pulsar topic _P_, a producer processing messages from a Kafka topic _K_, an application reading the messages from _K_ and writing the messages to _P_.
+
+This example shows how to construct an [AUTO_PRODUCE](schema-understand.md#auto-schema) schema to verify whether the bytes produced by _K_ can be sent to _P_.
+
+```java
+Produce pulsarProducer = client.newProducer(Schema.AUTO_PRODUCE())
+    …
+    .create();
+
+byte[] kafkaMessageBytes = … ; 
+
+pulsarProducer.produce(kafkaMessageBytes);
+```
+
+## Construct an AUTO_CONSUME schema
+
+Suppose you have a Pulsar topic _P_, a consumer (for example, _MySQL_) receiving messages from the topic _P_, an application reading the messages from _P_ and writing the messages to _MySQL_.
+
+This example shows how to construct an [AUTO_CONSUME schema](schema-understand.md#auto-schema) to verify whether the bytes produced by _P_ can be sent to _MySQL_.
+
+```java
+Consumer pulsarConsumer = client.newConsumer(Schema.AUTO_CONSUME())
+    …
+    .subscribe();
+
+Message msg = consumer.receive() ; 
+GenericRecord record = msg.getValue();
+```
+
+## Construct a native Avro schema
+
+This example shows how to construct a [native Avro schema](schema-understand.md#native-avro-schema).
+
+```java
+org.apache.avro.Schema nativeAvroSchema = … ;
+
+Producer producer = pulsarClient.newProducer().topic("ingress").create();
+
+byte[] content = … ;
+
+producer.newMessage(Schema.NATIVE_AVRO(nativeAvroSchema)).value(content).send();
+```
+
+## Customize schema storage
+
+By default, Pulsar stores various data types of schemas in [Apache BookKeeper](https://bookkeeper.apache.org) deployed alongside Pulsar. Alternatively, you can use another storage system if needed. 
 
-### Without schema
+To use a non-default (non-BookKeeper) storage system for Pulsar schemas, you need to implement the following Java interfaces: 
+* [SchemaStorage interface](#schemastorage-interface) 
+* [SchemaStorageFactory interface](#schemastoragefactory-interface)
 
-If you construct a producer without specifying a schema, then the producer can only produce messages of type `byte[]`. If you have a POJO class, you need to serialize the POJO into bytes before sending messages.
+### Implement SchemaStorage interface
 
-**Example**
+The `SchemaStorage` interface has the following methods:
 
 ```java
-Producer producer = client.newProducer()
-        .topic(topic)
-        .create();
-User user = new User("Tom", 28);
-byte[] message = … // serialize the `user` by yourself;
-producer.send(message);
+public interface SchemaStorage {
+    // How schemas are updated
+    CompletableFuture put(String key, byte[] value, byte[] hash);
+
+    // How schemas are fetched from storage
+    CompletableFuture get(String key, SchemaVersion version);
+
+    // How schemas are deleted
+    CompletableFuture delete(String key);
+
+    // Utility method for converting a schema version byte array to a SchemaVersion object
+    SchemaVersion versionFromBytes(byte[] version);
+
+    // Startup behavior for the schema storage client
+    void start() throws Exception;
+
+    // Shutdown behavior for the schema storage client
+    void close() throws Exception;
+}
 ```
 
-### With schema
+:::tip
 
-If you construct a producer with specifying a schema, then you can send a class to a topic directly without worrying about how to serialize POJOs into bytes. 
+For a complete example of **schema storage** implementation, see [BookKeeperSchemaStorage](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java) class.
 
-**Example**
+:::
 
-This example constructs a producer with the _JSONSchema_, and you can send the _User_ class to topics directly without worrying about how to serialize it into bytes. 
+### Implement SchemaStorageFactory interface 
+
+The `SchemaStorageFactory` interface has the following method:
 
 ```java
-Producer producer = client.newProducer(JSONSchema.of(User.class))
-        .topic(topic)
-        .create();
-User user = new User("Tom", 28);
-producer.send(user);
+public interface SchemaStorageFactory {
+    @NotNull
+    SchemaStorage create(PulsarService pulsar) throws Exception;
+}
 ```
 
-### Summary
+:::tip
+
+For a complete example of **schema storage factory** implementation, see [BookKeeperSchemaStorageFactory](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java) class.
+
+:::
+
+### Deploy custom schema storage
+
+To use your custom schema storage implementation, perform the following steps.
 
-When constructing a producer with a schema, you do not need to serialize messages into bytes, instead Pulsar schema does this job in the background.
+1. Package the implementation in a [JAR](https://docs.oracle.com/javase/tutorial/deployment/jar/basicsindex.html) file.
+   
+2. Add the JAR file to the `lib` folder in your Pulsar binary or source distribution.
+   
+3. Change the `schemaRegistryStorageClassName` configuration in the `conf/broker.conf` file to your custom factory class.
+      
+4. Start Pulsar.
diff --git a/site2/docs/schema-manage.md b/site2/docs/schema-manage.md
index 8c65ac4d7b488..304c7e2bb84b5 100644
--- a/site2/docs/schema-manage.md
+++ b/site2/docs/schema-manage.md
@@ -5,767 +5,8 @@ sidebar_label: "Manage schema"
 ---
 
 ````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-This guide demonstrates the ways to manage schemas:
-
-* Automatically 
-  
-  * [Schema AutoUpdate](#schema-autoupdate)
-
-* Manually
-  
-  * [Schema manual management](#schema-manual-management)
-  
-  * [Custom schema storage](#custom-schema-storage)
-
-## Schema AutoUpdate
-
-If a schema passes the schema compatibility check, Pulsar producer automatically updates this schema to the topic it produces by default. 
-
-### AutoUpdate for producer
-
-For a producer, the `AutoUpdate` happens in the following cases:
-
-* If a **topic doesn’t have a schema**, Pulsar registers a schema automatically.
-
-* If a **topic has a schema**:
-
-  * If a **producer doesn’t carry a schema**:
-
-  * If `isSchemaValidationEnforced` or `schemaValidationEnforced` is **disabled** in the namespace to which the topic belongs, the producer is allowed to connect to the topic and produce data. 
-  
-  * If `isSchemaValidationEnforced` or `schemaValidationEnforced` is **enabled** in the namespace to which the topic belongs, the producer is rejected and disconnected.
-
-  * If a **producer carries a schema**:
-  
-  A broker performs the compatibility check based on the configured compatibility check strategy of the namespace to which the topic belongs.
-  
-  * If the schema is registered, a producer is connected to a broker. 
-  
-  * If the schema is not registered:
-  
-     * If `isAllowAutoUpdateSchema` sets to **false**, the producer is rejected to connect to a broker.
-  
-      * If `isAllowAutoUpdateSchema` sets to **true**:
-   
-          * If the schema passes the compatibility check, then the broker registers a new schema automatically for the topic and the producer is connected.
-      
-          * If the schema does not pass the compatibility check, then the broker does not register a schema and the producer is rejected to connect to a broker.
-
-![AutoUpdate Producer](/assets/schema-producer.png)
-
-### AutoUpdate for consumer
-
-For a consumer, the `AutoUpdate` happens in the following cases:
-
-* If a **consumer connects to a topic without a schema** (which means the consumer receiving raw bytes), the consumer can connect to the topic successfully without doing any compatibility check.
-
-* If a **consumer connects to a topic with a schema**.
-
-  * If a topic does not have all of them (a schema/data/a local consumer and a local producer):
-  
-      * If `isAllowAutoUpdateSchema` sets to **true**, then the consumer registers a schema and it is connected to a broker.
-      
-      * If `isAllowAutoUpdateSchema` sets to **false**, then the consumer is rejected to connect to a broker.
-      
-  * If a topic has one of them (a schema/data/a local consumer and a local producer), then the schema compatibility check is performed.
-  
-      * If the schema passes the compatibility check, then the consumer is connected to the broker.
-      
-      * If the schema does not pass the compatibility check, then the consumer is rejected to connect to the broker.
-      
-![AutoUpdate Consumer](/assets/schema-consumer.png)
-        
-
-### Manage AutoUpdate strategy
-
-You can use the `pulsar-admin` command to manage the `AutoUpdate` strategy as below:
-
-* [Enable AutoUpdate](#enable-autoupdate)
-
-* [Disable AutoUpdate](#disable-autoupdate)
-
-* [Adjust compatibility](#adjust-compatibility)
-
-#### Enable AutoUpdate
-
-To enable `AutoUpdate` on a namespace, you can use the `pulsar-admin` command.
-
-```bash
-bin/pulsar-admin namespaces set-is-allow-auto-update-schema --enable tenant/namespace
-```
-
-#### Disable AutoUpdate 
-
-To disable `AutoUpdate` on a namespace, you can use the `pulsar-admin` command.
-
-```bash
-bin/pulsar-admin namespaces set-is-allow-auto-update-schema --disable tenant/namespace
-```
-
-Once the `AutoUpdate` is disabled, you can only register a new schema using the `pulsar-admin` command.
-
-#### Adjust compatibility
-
-To adjust the schema compatibility level on a namespace, you can use the `pulsar-admin` command.
-
-```bash
-bin/pulsar-admin namespaces set-schema-compatibility-strategy --compatibility  tenant/namespace
-```
-
-### Schema validation
-
-By default, `schemaValidationEnforced` is **disabled** for producers:
-
-* This means a producer without a schema can produce any kind of messages to a topic with schemas, which may result in producing trash data to the topic. 
-
-* This allows non-java language clients that don’t support schema can produce messages to a topic with schemas.
-
-However, if you want a stronger guarantee on the topics with schemas, you can enable `schemaValidationEnforced` across the whole cluster or on a per-namespace basis.
-
-#### Enable schema validation
-
-To enable `schemaValidationEnforced` on a namespace, you can use the `pulsar-admin` command.
-
-```bash
-bin/pulsar-admin namespaces set-schema-validation-enforce --enable tenant/namespace
-```
-
-#### Disable schema validation
-
-To disable `schemaValidationEnforced` on a namespace, you can use the `pulsar-admin` command.
-
-```bash
-bin/pulsar-admin namespaces set-schema-validation-enforce --disable tenant/namespace
-```
-
-## Schema manual management
-
-To manage schemas, you can use one of the following methods.
-
-| Method |  Description | 
-| --- | --- |
-|  **Admin CLI**
  •  |   You can use the `pulsar-admin` tool to manage Pulsar schemas, brokers, clusters, sources, sinks, topics, tenants and so on. For more information about how to use the `pulsar-admin` tool, see [here](/tools/pulsar-admin/).  | 
-|  **REST API**
  •  |   Pulsar exposes schema related management API in Pulsar’s admin RESTful API. You can access the admin RESTful endpoint directly to manage schemas. For more information about how to use the Pulsar REST API, see [here](/admin-rest-api/).  | 
-|  **Java Admin API**
  •  |  Pulsar provides Java admin library. | 
-
-### Upload a schema
-
-To upload (register) a new schema for a topic, you can use one of the following methods.
-
-````mdx-code-block
-
-
-
-
-Use the `upload` subcommand.
-
-```bash
-pulsar-admin schemas upload --filename  
-```
-
-The `schema-definition-file` is in JSON format. 
-
-```json
-{
-    "type": "",
-    "schema": "",
-    "properties": {} // the properties associated with the schema
-}
-```
-
-The `schema-definition-file` includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `type`  |   The schema type. | 
-|  `schema`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a 
    • **primitive**
  • schema, this field should be blank. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. | 
-
-Here are examples of the `schema-definition-file` for a JSON schema.
-
-**Example 1**
-
-```json
-{
-    "type": "JSON",
-    "schema": "{\"type\":\"record\",\"name\":\"User\",\"namespace\":\"com.foo\",\"fields\":[{\"name\":\"file1\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"file2\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"file3\",\"type\":[\"string\",\"null\"],\"default\":\"dfdf\"}]}",
-    "properties": {}
-}
-```
-
-**Example 2**
-
-```json
-{
-    "type": "STRING",
-    "schema": "",
-    "properties": {
-        "key1": "value1"
-    }
-}
-```
-
-    
-
-
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
-
-The post payload is in JSON format.
-
-```json
-{
-    "type": "",
-    "schema": "",
-    "properties": {} // the properties associated with the schema
-}
-```
-
-The post payload includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `type`  |   The schema type. | 
-|  `schema`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a 
    • **primitive**
  • schema, this field should be blank. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. |
-
-    
-
-
-```java
-void createSchema(String topic, PostSchemaPayload schemaPayload)
-```
-
-The `PostSchemaPayload` includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `type`  |   The schema type. | 
-|  `schema`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a 
    • **primitive**
  • schema, this field should be blank. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. | 
-
-Here is an example of `PostSchemaPayload`:
-
-```java
-PulsarAdmin admin = …;
-
-PostSchemaPayload payload = new PostSchemaPayload();
-payload.setType("INT8");
-payload.setSchema("");
-
-admin.createSchema("my-tenant/my-ns/my-topic", payload);
-```
-
-    
-
-    
-````
-
-### Get a schema (latest)
-
-To get the latest schema for a topic, you can use one of the following methods. 
-
-````mdx-code-block
-
-
-
-
-Use the `get` subcommand.
-
-```bash
-pulsar-admin schemas get 
-
-{
-    "version": 0,
-    "type": "String",
-    "timestamp": 0,
-    "data": "string",
-    "properties": {
-        "property1": "string",
-        "property2": "string"
-    }
-}
-```
-
-
-
-
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
-
-Here is an example of a response, which is returned in JSON format.
-
-```json
-{
-    "version": "",
-    "type": "",
-    "timestamp": "",
-    "data": "",
-    "properties": {} // the properties associated with the schema
-}
-```
-
-The response includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `version`  |   The schema version, which is a long number. | 
-|  `type`  |   The schema type. | 
-|  `timestamp`  |   The timestamp of creating this version of schema. | 
-|  `data`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a 
    • **primitive**
  • schema, this field should be blank. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. |
-
-    
-
-
-```java
-SchemaInfo createSchema(String topic)
-```
-
-The `SchemaInfo` includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `name`  |   The schema name. | 
-|  `type`  |   The schema type. | 
-|  `schema`  |   A byte array of the schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a 
    • **primitive**
  • schema, this byte array should be empty. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition converted to a byte array. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. | 
-
-Here is an example of `SchemaInfo`:
-
-```java
-PulsarAdmin admin = …;
-
-SchemaInfo si = admin.getSchema("my-tenant/my-ns/my-topic");
-```
-
-    
-
-    
-````
-
-### Get a schema (specific)
-
-To get a specific version of a schema, you can use one of the following methods.
-
-````mdx-code-block
-
-
-
-
-Use the `get` subcommand.
-
-```bash
-pulsar-admin schemas get  --version=
-```
-
-
-
-
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
-
-Here is an example of a response, which is returned in JSON format.
-
-```json
-{
-    "version": "",
-    "type": "",
-    "timestamp": "",
-    "data": "",
-    "properties": {} // the properties associated with the schema
-}
-```
-
-The response includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `version`  |   The schema version, which is a long number. | 
-|  `type`  |   The schema type. | 
-|  `timestamp`  |   The timestamp of creating this version of schema. | 
-|  `data`  |   The schema definition data, which is encoded in UTF 8 charset. 
  • If the schema is a 
    • **primitive**
  • schema, this field should be blank. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. |
-
-    
-
-
-```java
-SchemaInfo createSchema(String topic, long version)
-```
-
-The `SchemaInfo` includes the following fields:
-
-| Field |  Description | 
-| --- | --- |
-|  `name`  |  The schema name. | 
-|  `type`  |  The schema type. | 
-|  `schema`  |   A byte array of the schema definition data, which is encoded in UTF 8. 
  • If the schema is a 
    • **primitive**
  • schema, this byte array should be empty. 
  • If the schema is a 
    • **struct**
  • schema, this field should be a JSON string of the Avro schema definition converted to a byte array. 
    •  | 
-|  `properties`  |  The additional properties associated with the schema. | 
-
-Here is an example of `SchemaInfo`:
-
-```java
-PulsarAdmin admin = …;
-
-SchemaInfo si = admin.getSchema("my-tenant/my-ns/my-topic", 1L);
-```
-
-    
-
-    
-````
-
-### Extract a schema
-
-To provide a schema via a topic, you can use the following method.
-
-````mdx-code-block
-
-
-
-
-Use the `extract` subcommand.
-
-```bash
-pulsar-admin schemas extract --classname  --jar  --type 
-```
-
-
-
-
-````
-
-### Delete a schema
-
-To delete a schema for a topic, you can use one of the following methods.
-
-:::note
-
-In any case, the **delete** action deletes **all versions** of a schema registered for a topic.
-
-:::
-
-````mdx-code-block
-
-
-
-
-Use the `delete` subcommand.
-
-```bash
-pulsar-admin schemas delete 
-```
-
-
-
-
-Send a `DELETE` request to a schema endpoint: {@inject: endpoint|DELETE|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/deleteSchema?version=@pulsar:version_number@} 
-
-Here is an example of a response, which is returned in JSON format.
-
-```json
-{
-    "version": "",
-}
-```
-
-The response includes the following field:
-
-Field | Description |
----|---|
-`version` | The schema version, which is a long number. |
-
-
-
-
-```java
-void deleteSchema(String topic)
-```
-
-Here is an example of deleting a schema.
-
-```java
-PulsarAdmin admin = …;
-
-admin.deleteSchema("my-tenant/my-ns/my-topic");
-```
-
-
-
-
-````
-
-## Custom schema storage
-
-By default, Pulsar stores various data types of schemas in [Apache BookKeeper](https://bookkeeper.apache.org) deployed alongside Pulsar. 
-
-However, you can use another storage system if needed. 
-
-### Implement
-
-To use a non-default (non-BookKeeper) storage system for Pulsar schemas, you need to implement the following Java interfaces: 
-
-* [SchemaStorage interface](#schemastorage-interface) 
-
-* [SchemaStorageFactory interface](#schemastoragefactory-interface)
-
-#### SchemaStorage interface
-
-The `SchemaStorage` interface has the following methods:
-
-```java
-public interface SchemaStorage {
-    // How schemas are updated
-    CompletableFuture put(String key, byte[] value, byte[] hash);
-
-    // How schemas are fetched from storage
-    CompletableFuture get(String key, SchemaVersion version);
-
-    // How schemas are deleted
-    CompletableFuture delete(String key);
-
-    // Utility method for converting a schema version byte array to a SchemaVersion object
-    SchemaVersion versionFromBytes(byte[] version);
-
-    // Startup behavior for the schema storage client
-    void start() throws Exception;
-
-    // Shutdown behavior for the schema storage client
-    void close() throws Exception;
-}
-```
-
-:::tip
-
-For a complete example of **schema storage** implementation, see [BookKeeperSchemaStorage](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java) class.
-
-:::
-
-#### SchemaStorageFactory interface 
-
-The `SchemaStorageFactory` interface has the following method:
-
-```java
-public interface SchemaStorageFactory {
-    @NotNull
-    SchemaStorage create(PulsarService pulsar) throws Exception;
-}
-```
-
-:::tip
-
-For a complete example of **schema storage factory** implementation, see [BookKeeperSchemaStorageFactory](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java) class.
-
-:::
-
-### Deploy
-
-To use your custom schema storage implementation, perform the following steps.
-
-1. Package the implementation in a [JAR](https://docs.oracle.com/javase/tutorial/deployment/jar/basicsindex.html) file.
-   
-2. Add the JAR file to the `lib` folder in your Pulsar binary or source distribution.
-   
-3. Change the `schemaRegistryStorageClassName` configuration in `broker.conf` to your custom factory class.
-      
-4. Start Pulsar.
-
-## Set schema compatibility check strategy 
-
-You can set [schema compatibility check strategy](schema-evolution-compatibility.md#schema-compatibility-check-strategy) at the topic, namespace or broker level. 
-
-The schema compatibility check strategy set at different levels has priority: topic level > namespace level > broker level. 
-
-- If you set the strategy at both topic and namespace level, it uses the topic-level strategy. 
-
-- If you set the strategy at both namespace and broker level, it uses the namespace-level strategy.
-
-- If you do not set the strategy at any level, it uses the `FULL` strategy. For all available values, see [here](schema-evolution-compatibility.md#schema-compatibility-check-strategy).
-
-
-### Topic level
-
-To set a schema compatibility check strategy at the topic level, use one of the following methods.
-
-````mdx-code-block
-
-
-
-
-Use the [`pulsar-admin topicPolicies set-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
-
-```shell
-pulsar-admin topicPolicies set-schema-compatibility-strategy  
-```
-
-
-
-
-Send a `PUT` request to this endpoint: {@inject: endpoint|PUT|/admin/v2/topics/:tenant/:namespace/:topic|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
-
-
-
-
-```java
-void setSchemaCompatibilityStrategy(String topic, SchemaCompatibilityStrategy strategy)
-```
-
-Here is an example of setting a schema compatibility check strategy at the topic level.
-
-```java
-PulsarAdmin admin = …;
-
-admin.topicPolicies().setSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic", SchemaCompatibilityStrategy.ALWAYS_INCOMPATIBLE);
-```
-
-
-
-
-````
-
    
-To get the topic-level schema compatibility check strategy, use one of the following methods.
-
-````mdx-code-block
-
-
-
-
-Use the [`pulsar-admin topicPolicies get-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
-
-```shell
-pulsar-admin topicPolicies get-schema-compatibility-strategy 
-```
-
-
-
-
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
-
-
-
-
-```java
-SchemaCompatibilityStrategy getSchemaCompatibilityStrategy(String topic, boolean applied)
-```
-
-Here is an example of getting the topic-level schema compatibility check strategy.
-
-```java
-PulsarAdmin admin = …;
-
-// get the current applied schema compatibility strategy
-admin.topicPolicies().getSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic", true);
-
-// only get the schema compatibility strategy from topic policies
-admin.topicPolicies().getSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic", false);
-```
-
-
-
-
-````
-
    
-To remove the topic-level schema compatibility check strategy, use one of the following methods.
-
-````mdx-code-block
-
-
-
-
-Use the [`pulsar-admin topicPolicies remove-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
-
-```shell
-pulsar-admin topicPolicies remove-schema-compatibility-strategy 
-```
-
-
-
-
-Send a `DELETE` request to this endpoint: {@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
-
-
-
-
-```java
-void removeSchemaCompatibilityStrategy(String topic)
-```
-
-Here is an example of removing the topic-level schema compatibility check strategy.
-
-```java
-PulsarAdmin admin = …;
-
-admin.removeSchemaCompatibilityStrategy("my-tenant/my-ns/my-topic");
-```
-
-
-
-
-````
-
-
-### Namespace level
-
-You can set schema compatibility check strategy at namespace level using one of the following methods.
-
-````mdx-code-block
-
-
-
-
-Use the [`pulsar-admin namespaces set-schema-compatibility-strategy`](/tools/pulsar-admin/) command. 
-
-```shell
-pulsar-admin namespaces set-schema-compatibility-strategy options
-```
-
-
-
-
-Send a `PUT` request to this endpoint: {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/schemaCompatibilityStrategy?version=@pulsar:version_number@}
-
-
-
-
-Use the [`setSchemaCompatibilityStrategy`](/api/admin/)method.
-
-```java
-admin.namespaces().setSchemaCompatibilityStrategy("test", SchemaCompatibilityStrategy.FULL);
-```
-
-
-
-
-````
-
-### Broker level
-
-You can set schema compatibility check strategy at broker level by setting `schemaCompatibilityStrategy` in [`broker.conf`](https://github.com/apache/pulsar/blob/f24b4890c278f72a67fe30e7bf22dc36d71aac6a/conf/broker.conf#L1240) or [`standalone.conf`](https://github.com/apache/pulsar/blob/master/conf/standalone.conf) file.
-
-**Example**
-
-```conf
-schemaCompatibilityStrategy=ALWAYS_INCOMPATIBLE
-```
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from "@docusaurus/router";
 
+
+````
\ No newline at end of file
diff --git a/site2/docs/schema-overview.md b/site2/docs/schema-overview.md
new file mode 100644
index 0000000000000..9560a95443f63
--- /dev/null
+++ b/site2/docs/schema-overview.md
@@ -0,0 +1,154 @@
+---
+id: schema-overview
+title: Overview
+sidebar_label: "Overview"
+---
+
+This section introduces the following content:
+* [What is Pulsar Schema](#what-is-pulsar-schema)
+* [Why use it](#why-use-it)
+* [How it works](#how-it-works)
+* [Use case](#use-case)
+* [What's next?](#whats-next)
+
+## What is Pulsar Schema
+
+Pulsar messages are stored as unstructured byte arrays and the data structure (as known as schema) is applied to this data only when it's read. The schema serializes the bytes before they are published to a topic and deserializes them before they are delivered to the consumers, dictating which data types are recognized as valid for a given topic.
+
+Pulsar schema registry is a central repository to store the schema information, which enables producers/consumers to coordinate on the schema of a topic’s data through brokers.
+
+:::note
+
+Currently, Pulsar schema is only available for the [Java client](client-libraries-java.md), [Go client](client-libraries-go.md), [Python client](client-libraries-python.md), and [C++ client](client-libraries-cpp.md).
+
+:::
+
+## Why use it
+
+Type safety is extremely important in any application built around a messaging and streaming system. Raw bytes are flexible for data transfer, but the flexibility and neutrality come with a cost: you have to overlay data type checking and serialization/deserialization to ensure that the bytes fed into the system can be read and successfully consumed. In other words, you need to make sure the data intelligible and usable to applications.
+
+Pulsar schema resolves the pain points with the following capabilities:
+* enforces the data type safety when a topic has a schema defined. As a result, producers/consumers are only allowed to connect if they are using a “compatible” schema.
+* provides a central location for storing information about the schemas used within your organization, in turn greatly simplifies the sharing of this information across application teams.
+* serves as a single source of truth for all the message schemas used across all your services and development teams, which makes it easier for them to collaborate.
+* keeps data compatibility on-track between schema versions. When new schemas are uploaded, the new versions can be read by old consumers. 
+* stored in the existing storage layer BookKeeper, no additional system required.
+
+## How it works
+
+Pulsar schemas are applied and enforced at the **topic** level (schemas cannot be applied at the namespace or tenant level). 
+
+Producers and consumers upload schemas to brokers, so Pulsar schemas work on the producer side and the consumer side.
+
+### Producer side
+
+This diagram illustrates how schema works on the Producer side.
+
+![Schema works at the producer side](/assets/schema-producer.png)
+
+1. The application uses a schema instance to construct a producer instance. 
+
+   The schema instance defines the schema for the data being produced using the producer instance. 
+
+   Take AVRO as an example, Pulsar extracts schema definition from the POJO class and constructs the `SchemaInfo` that the producer needs to pass to a broker when it connects.
+
+2. The producer connects to the broker with the `SchemaInfo` extracted from the passed-in schema instance.
+   
+3. The broker looks up the schema in the schema storage to check if it is already a registered schema. 
+   
+4. If yes, the broker skips the schema validation since it is a known schema, and returns the schema version to the producer.
+
+5. If no, the broker verifies whether a schema can be automatically created in this namespace:
+
+   * If `isAllowAutoUpdateSchema` sets to **true**, then a schema can be created, and the broker validates the schema based on the schema compatibility check strategy defined for the topic.
+  
+   * If `isAllowAutoUpdateSchema` sets to **false**, then a schema can not be created, and the producer is rejected to connect to the broker.
+  
+   :::tip
+
+   `isAllowAutoUpdateSchema` can be set via **Pulsar admin API** or **REST API.** 
+
+   For how to set `isAllowAutoUpdateSchema` via Pulsar admin API, see [Manage AutoUpdate Strategy](admin-api-schemas.md#manage-autoupdate-strategy). 
+
+    :::
+
+6. If the schema is allowed to be updated, then the compatible strategy check is performed.
+  
+   * If the schema is compatible, the broker stores it and returns the schema version to the producer. All the messages produced by this producer are tagged with the schema version. 
+
+   * If the schema is incompatible, the broker rejects it.
+
+### Consumer side
+
+This diagram illustrates how schema works on the consumer side. 
+
+![Schema works at the consumer side](/assets/schema-consumer.png)
+
+1. The application uses a schema instance to construct a consumer instance.
+   
+   The schema instance defines the schema that the consumer uses for decoding messages received from a broker.
+
+2. The consumer connects to the broker with the `SchemaInfo` extracted from the passed-in schema instance.
+
+3. The broker determines whether the topic has one of them (a schema/data/a local consumer and a local producer).
+
+4. If a topic does not have all of them (a schema/data/a local consumer and a local producer):
+   
+     * If `isAllowAutoUpdateSchema` sets to **true**, then the consumer registers a schema and it is connected to a broker.
+       
+     * If `isAllowAutoUpdateSchema` sets to **false**, then the consumer is rejected to connect to a broker.
+       
+5. If a topic has one of them (a schema/data/a local consumer and a local producer), then the schema compatibility check is performed.
+   
+     * If the schema passes the compatibility check, then the consumer is connected to the broker.
+       
+     * If the schema does not pass the compatibility check, then the consumer is rejected to connect to the broker. 
+
+6. The consumer receives messages from the broker. 
+
+   If the schema used by the consumer supports schema versioning (for example, AVRO schema), the consumer fetches the `SchemaInfo` of the version tagged in messages and uses the passed-in schema and the schema tagged in messages to decode the messages.
+
+## Use case
+
+You can use language-specific types of data when constructing and handling messages from simple data types like `string` to more complex application-specific types.
+
+For example, you are using the _User_ class to define the messages sent to Pulsar topics.
+
+```java
+public class User {
+    String name;
+    int age;
+}
+```
+
+**Without a schema**
+
+If you construct a producer without specifying a schema, then the producer can only produce messages of type `byte[]`. If you have a POJO class, you need to serialize the POJO into bytes before sending messages.
+
+```java
+Producer producer = client.newProducer()
+        .topic(topic)
+        .create();
+User user = new User("Tom", 28);
+byte[] message = … // serialize the `user` by yourself;
+producer.send(message);
+```
+
+**With a schema**
+
+This example constructs a producer with the _JSONSchema_, and you can send the _User_ class to topics directly without worrying about how to serialize POJOs into bytes.
+
+```java
+Producer producer = client.newProducer(JSONSchema.of(User.class))
+        .topic(topic)
+        .create();
+User user = new User("Tom", 28);
+producer.send(user);
+```
+
+## What's next?
+
+* [Understand basic concepts](schema-understand.md)
+* [Schema evolution and compatibility](schema-evolution-compatibility.md)
+* [Get started](schema-get-started.md)
+* [Manage schema](admin-api-schemas.md)
diff --git a/site2/docs/schema-understand.md b/site2/docs/schema-understand.md
index ed65c619ecd1e..64cb6c9b6d8ea 100644
--- a/site2/docs/schema-understand.md
+++ b/site2/docs/schema-understand.md
@@ -10,22 +10,20 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-This chapter explains the basic concepts of Pulsar schema, focuses on the topics of particular importance, and provides additional background.
+This section explains the basic concepts of Pulsar schema and provides additional reference.
 
-## SchemaInfo
+## Schema definition
 
-Pulsar schema is defined in a data structure called `SchemaInfo`. 
-
-The `SchemaInfo` is stored and enforced on a per-topic basis and cannot be stored at the namespace or tenant level.
+Pulsar schema is defined in a data structure called `SchemaInfo`. It is stored and enforced on a per-topic basis and cannot be stored at the namespace or tenant level.
 
 A `SchemaInfo` consists of the following fields:
 
 |  Field  |   Description  | 
 | --- | --- |
 |  `name`  |   Schema name (a string).  | 
-|  `type`  |   Schema type, which determines how to interpret the schema data. 
  • Predefined schema: see [here](schema-understand.md#schema-type). 
  • Customized schema: it is left as an empty string. 
    •  | 
+|  `type`  |   Schema type, which determines how to interpret the schema data. 
  • Predefined schema: see [here](#schema-type). 
  • Customized schema: it is left as an empty string. 
    •  | 
 |  `schema`（`payload`)  |   Schema data, which is a sequence of 8-bit unsigned bytes and schema-type specific.  | 
-|  `properties`  |   It is a user defined properties as a string/string map. Applications can use this bag for carrying any application specific logics. Possible properties might be the Git hash associated with the schema, an environment string like `dev` or `prod`.  | 
+|  `properties`  |   It is a user-defined property as a string/string map. Applications can use this bag for carrying any application-specific logics. Possible properties might be the Git hash associated with the schema, and an environment string like `dev` or `prod`.  | 
 
 **Example**
 
@@ -43,74 +41,36 @@ This is the `SchemaInfo` of a string.
 ## Schema type
 
 Pulsar supports various schema types, which are mainly divided into two categories: 
-
-* Primitive type 
-
-* Complex type
+* [Primitive type](#primitive-type) 
+* [Complex type](#complex-type)
 
 ### Primitive type
 
-Currently, Pulsar supports the following primitive types:
-
-| Primitive Type | Description |
-|---|---|
-| `BOOLEAN` | A binary value |
-| `INT8` | A 8-bit signed integer |
-| `INT16` | A 16-bit signed integer |
-| `INT32` | A 32-bit signed integer |
-| `INT64` | A 64-bit signed integer |
-| `FLOAT` | A single precision (32-bit) IEEE 754 floating-point number |
-| `DOUBLE` | A double-precision (64-bit) IEEE 754 floating-point number |
-| `BYTES` | A sequence of 8-bit unsigned bytes |
-| `STRING` | A Unicode character sequence |
-| `TIMESTAMP` (`DATE`, `TIME`) |  A logic type represents a specific instant in time with millisecond precision. 
    It stores the number of milliseconds since `January 1, 1970, 00:00:00 GMT` as an `INT64` value | 
-| INSTANT | A single instantaneous point on the time-line with nanoseconds precision|
-| LOCAL_DATE | An immutable date-time object that represents a date, often viewed as year-month-day|
-| LOCAL_TIME | An immutable date-time object that represents a time, often viewed as hour-minute-second. Time is represented to nanosecond precision.|
-| LOCAL_DATE_TIME | An immutable date-time object that represents a date-time, often viewed as year-month-day-hour-minute-second |
-
-For primitive types, Pulsar does not store any schema data in `SchemaInfo`. The `type` in `SchemaInfo` is used to determine how to serialize and deserialize the data. 
+The following table outlines the primitive types that Pulsar schema supports, and the conversions between **schema types** and **language-specific primitive types**.
+
+| Primitive Type | Description | Java Type| Python Type | Go Type |
+|---|---|---|---|---|
+| `BOOLEAN` | A binary value | boolean | bool | bool |
+| `INT8` | A 8-bit signed integer | int | | int8 |
+| `INT16` | A 16-bit signed integer | int | | int16 |
+| `INT32` | A 32-bit signed integer | int | | int32 |
+| `INT64` | A 64-bit signed integer | int | | int64 |
+| `FLOAT` | A single precision (32-bit) IEEE 754 floating-point number | float | float | float32 |
+| `DOUBLE` | A double-precision (64-bit) IEEE 754 floating-point number | double | float | float64|
+| `BYTES` | A sequence of 8-bit unsigned bytes | byte[], ByteBuffer, ByteBuf | bytes | []byte |
+| `STRING` | A Unicode character sequence | string | str | string| 
+| `TIMESTAMP` (`DATE`, `TIME`) |  A logic type represents a specific instant in time with millisecond precision. 
    It stores the number of milliseconds since `January 1, 1970, 00:00:00 GMT` as an `INT64` value |  java.sql.Timestamp (java.sql.Time, java.util.Date) | | |
+| INSTANT | A single instantaneous point on the time-line with nanoseconds precision| java.time.Instant | | |
+| LOCAL_DATE | An immutable date-time object that represents a date, often viewed as year-month-day| java.time.LocalDate | | |
+| LOCAL_TIME | An immutable date-time object that represents a time, often viewed as hour-minute-second. Time is represented to nanosecond precision.| java.time.LocalDateTime | |
+| LOCAL_DATE_TIME | An immutable date-time object that represents a date-time, often viewed as year-month-day-hour-minute-second | java.time.LocalTime | |
+
+For primitive types, Pulsar does not store any schema data in `SchemaInfo`. The `type` in `SchemaInfo` determines how to serialize and deserialize the data. 
 
 Some of the primitive schema implementations can use `properties` to store implementation-specific tunable settings. For example, a `string` schema can use `properties` to store the encoding charset to serialize and deserialize strings.
 
-The conversions between **Pulsar schema types** and **language-specific primitive types** are as below.
-
-| Schema Type | Java Type| Python Type | Go Type |
-|---|---|---|---|
-| BOOLEAN | boolean | bool | bool |
-| INT8 | byte | | int8 |
-| INT16 | short | | int16 |
-| INT32 | int | | int32 |
-| INT64 | long | | int64 |
-| FLOAT | float | float | float32 |
-| DOUBLE | double | float | float64|
-| BYTES | byte[], ByteBuffer, ByteBuf | bytes | []byte |
-| STRING | string | str | string| 
-| TIMESTAMP | java.sql.Timestamp | | |
-| TIME | java.sql.Time | | |
-| DATE | java.util.Date | | |
-| INSTANT | java.time.Instant | | |
-| LOCAL_DATE | java.time.LocalDate | | |
-| LOCAL_TIME | java.time.LocalDateTime | |
-| LOCAL_DATE_TIME | java.time.LocalTime | |
-
-**Example**
-
-This example demonstrates how to use a string schema.
+For more instructions, see [Construct a string schema](schema-get-started.md#construct-a-string-schema).
 
-1. Create a producer with a string schema and send messages.
-
-   ```java
-   Producer producer = client.newProducer(Schema.STRING).create();
-   producer.newMessage().value("Hello Pulsar!").send();
-   ```
-
-2. Create a consumer with a string schema and receive messages.  
-
-   ```java
-   Consumer consumer = client.newConsumer(Schema.STRING).subscribe();
-   consumer.receive();
-   ```
 
 ### Complex type
 
@@ -118,319 +78,50 @@ Currently, Pulsar supports the following complex types:
 
 | Complex Type | Description |
 |---|---|
-| `keyvalue` | Represents a complex type of a key/value pair. |
-| `struct` | Handles structured data. It supports `AvroBaseStructSchema` and `ProtobufNativeSchema`. |
-
-#### keyvalue
+| `KeyValue` | Represents a complex type of a key/value pair. |
+| `Struct` | Handles structured data. It supports `AvroBaseStructSchema` and `ProtobufNativeSchema`. |
 
-`Keyvalue` schema helps applications define schemas for both key and value. 
+#### `KeyValue` schema
 
-For `SchemaInfo` of `keyvalue` schema, Pulsar stores the `SchemaInfo` of key schema and the `SchemaInfo` of value schema together.
+`KeyValue` schema helps applications define schemas for both key and value. Pulsar stores the `SchemaInfo` of key schema and the value schema together.
 
-Pulsar provides the following methods to encode a key/value pair in messages：
+You can choose the encoding type when constructing the key/value schema.：
+* `INLINE` - Key/value pairs are encoded together in the message payload.
+* `SEPARATED` - see [Construct a key/value schema](schema-get-started.md#construct-a-keyvalue-schema).
 
-* `INLINE`
-
-* `SEPARATED`
-
-You can choose the encoding type when constructing the key/value schema.
-
-````mdx-code-block
-
+#### `Struct` schema
 
-
-
-Key/value pairs are encoded together in the message payload.
-
-
-
-
-Key is encoded in the message key and the value is encoded in the message payload. 
-  
-**Example**
-    
-This example shows how to construct a key/value schema and then use it to produce and consume messages.
-
-1. Construct a key/value schema with `INLINE` encoding type.
-
-   ```java
-   Schema> kvSchema = Schema.KeyValue(
-   Schema.INT32,
-   Schema.STRING,
-   KeyValueEncodingType.INLINE
-   );
-   ```
-
-2. Optionally, construct a key/value schema with `SEPARATED` encoding type.
-
-   ```java
-   Schema> kvSchema = Schema.KeyValue(
-   Schema.INT32,
-   Schema.STRING,
-   KeyValueEncodingType.SEPARATED
-   );
-   ```
-
-3. Produce messages using a key/value schema.
-
-   ```java
-   Schema> kvSchema = Schema.KeyValue(
-   Schema.INT32,
-   Schema.STRING,
-   KeyValueEncodingType.SEPARATED
-   );
-
-   Producer> producer = client.newProducer(kvSchema)
-       .topic(TOPIC)
-       .create();
-
-   final int key = 100;
-   final String value = "value-100";
-
-   // send the key/value message
-   producer.newMessage()
-   .value(new KeyValue(key, value))
-   .send();
-   ```
-
-4. Consume messages using a key/value schema.
-
-   ```java
-   Schema> kvSchema = Schema.KeyValue(
-   Schema.INT32,
-   Schema.STRING,
-   KeyValueEncodingType.SEPARATED
-   );
-
-   Consumer> consumer = client.newConsumer(kvSchema)
-       ...
-       .topic(TOPIC)
-       .subscriptionName(SubscriptionName).subscribe();
-
-   // receive key/value pair
-   Message> msg = consumer.receive();
-   KeyValue kv = msg.getValue();
-   ```
-
-
-
-
-````
-
-#### struct
-
-This section describes the details of type and usage of the `struct` schema.
-
-##### Type
-
-`struct` schema supports `AvroBaseStructSchema` and `ProtobufNativeSchema`.
+`Struct` schema supports `AvroBaseStructSchema` and `ProtobufNativeSchema`.
 
 |Type|Description|
 ---|---|
 `AvroBaseStructSchema`|Pulsar uses [Avro Specification](http://avro.apache.org/docs/current/spec.html) to declare the schema definition for `AvroBaseStructSchema`, which supports  `AvroSchema`, `JsonSchema`, and `ProtobufSchema`. 

    This allows Pulsar:
    - to use the same tools to manage schema definitions
    - to use different serialization or deserialization methods to handle data|
 `ProtobufNativeSchema`|`ProtobufNativeSchema` is based on protobuf native Descriptor. 

    This allows Pulsar:
    - to use native protobuf-v3 to serialize or deserialize data
    - to use `AutoConsume` to deserialize data.
 
-##### Usage
-
-Pulsar provides the following methods to use the `struct` schema:
-
+Pulsar provides the following methods to use the `struct` schema. 
 * `static`
-
 * `generic`
-
 * `SchemaDefinition`
 
-````mdx-code-block
-
-
-
-
-You can predefine the `struct` schema, which can be a POJO in Java, a `struct` in Go, or classes generated by Avro or Protobuf tools. 
-
-**Example** 
-
-Pulsar gets the schema definition from the predefined `struct` using an Avro library. The schema definition is the schema data stored as a part of the `SchemaInfo`.
-
-1. Create the _User_ class to define the messages sent to Pulsar topics.
-
-   ```java
-   @Builder
-   @AllArgsConstructor
-   @NoArgsConstructor
-   public static class User {
-       String name;
-       int age;
-   }
-   ```
-
-2. Create a producer with a `struct` schema and send messages.
-
-   ```java
-   Producer producer = client.newProducer(Schema.AVRO(User.class)).create();
-   producer.newMessage().value(User.builder().name("pulsar-user").age(1).build()).send();
-   ```
-
-3. Create a consumer with a `struct` schema and receive messages
-
-   ```java
-   Consumer consumer = client.newConsumer(Schema.AVRO(User.class)).subscribe();
-   User user = consumer.receive().getValue();
-   ```
-
-
-
-
-Sometimes applications do not have pre-defined structs, and you can use this method to define schema and access data.
-
-You can define the `struct` schema using the `GenericSchemaBuilder`, generate a generic struct using `GenericRecordBuilder` and consume messages into `GenericRecord`.
-
-**Example** 
-
-1. Use `RecordSchemaBuilder` to build a schema.
-
-   ```java
-   RecordSchemaBuilder recordSchemaBuilder = SchemaBuilder.record("schemaName");
-   recordSchemaBuilder.field("intField").type(SchemaType.INT32);
-   SchemaInfo schemaInfo = recordSchemaBuilder.build(SchemaType.AVRO);
-
-   Producer producer = client.newProducer(Schema.generic(schemaInfo)).create();
-   ```
-
-2. Use `RecordBuilder` to build the struct records.
-
-   ```java
-   producer.newMessage().value(schema.newRecordBuilder()
-               .set("intField", 32)
-               .build()).send();
-   ```
-
-
-
-
-You can define the `schemaDefinition` to generate a `struct` schema.
-
-**Example** 
-
-1. Create the _User_ class to define the messages sent to Pulsar topics.
-
-   ```java
-   @Builder
-   @AllArgsConstructor
-   @NoArgsConstructor
-   public static class User {
-       String name;
-       int age;
-   }
-   ```
-
-2. Create a producer with a `SchemaDefinition` and send messages.
-
-   ```java
-   SchemaDefinition schemaDefinition = SchemaDefinition.builder().withPojo(User.class).build();
-   Producer producer = client.newProducer(Schema.AVRO(schemaDefinition)).create();
-   producer.newMessage().value(User.builder().name("pulsar-user").age(1).build()).send();
-   ```
-
-3. Create a consumer with a `SchemaDefinition` schema and receive messages
-
-   ```java
-   SchemaDefinition schemaDefinition = SchemaDefinition.builder().withPojo(User.class).build();
-   Consumer consumer = client.newConsumer(Schema.AVRO(schemaDefinition)).subscribe();
-   User user = consumer.receive().getValue();
-   ```
-
-
-
-
-````
+For more examples, see [Construct a struct schema](schema-get-started.md#construct-a-struct-schema).
 
 ### Auto Schema
 
 If you don't know the schema type of a Pulsar topic in advance, you can use AUTO schema to produce or consume generic records to or from brokers.
 
-| Auto Schema Type | Description |
-|---|---|
-| `AUTO_PRODUCE` | This is useful for transferring data **from a producer to a Pulsar topic that has a schema**. |
-| `AUTO_CONSUME` | This is useful for transferring data **from a Pulsar topic that has a schema to a consumer**. |
-
-#### AUTO_PRODUCE
-
-`AUTO_PRODUCE` schema helps a producer validate whether the bytes sent by the producer is compatible with the schema of a topic. 
-
-**Example**
-
-Suppose that:
-
-* You have a producer processing messages from a Kafka topic _K_. 
-
-* You have a Pulsar topic _P_, and you do not know its schema type.
-
-* Your application reads the messages from _K_ and writes the messages to _P_.  
-   
-In this case, you can use `AUTO_PRODUCE` to verify whether the bytes produced by _K_ can be sent to _P_ or not.
-
-```java
-Produce pulsarProducer = client.newProducer(Schema.AUTO_PRODUCE())
-    …
-    .create();
-
-byte[] kafkaMessageBytes = … ; 
-
-pulsarProducer.produce(kafkaMessageBytes);
-```
-
-#### AUTO_CONSUME
-
-`AUTO_CONSUME` schema helps a Pulsar topic validate whether the bytes sent by a Pulsar topic is compatible with a consumer, that is, the Pulsar topic deserializes messages into language-specific objects using the `SchemaInfo` retrieved from broker-side. 
-
-Currently, `AUTO_CONSUME` supports AVRO, JSON and ProtobufNativeSchema schemas. It deserializes messages into `GenericRecord`.
-
-**Example**
-
-Suppose that:
-
-* You have a Pulsar topic _P_.
-
-* You have a consumer (for example, MySQL) receiving messages from the topic _P_.
-
-* Your application reads the messages from _P_ and writes the messages to MySQL.
-   
-In this case, you can use `AUTO_CONSUME` to verify whether the bytes produced by _P_ can be sent to MySQL or not.
-
-```java
-Consumer pulsarConsumer = client.newConsumer(Schema.AUTO_CONSUME())
-    …
-    .subscribe();
-
-Message msg = consumer.receive() ; 
-GenericRecord record = msg.getValue();
-```
+Auto schema contains two categories:
+* `AUTO_PRODUCE` transfers data from a producer to a Pulsar topic that has a schema and helps the producer validate whether the out-bound bytes are compatible with the schema of the topic. For more instructions, see [Construct an AUTO_PRODUCE schema](schema-get-started.md#construct-an-auto_produce-schema).
+* `AUTO_CONSUME` transfers data from a Pulsar topic that has a schema to a consumer and helps the topic validate whether the out-bound bytes are compatible with the consumer. In other words, the topic deserializes messages into language-specific objects `GenericRecord` using the `SchemaInfo` retrieved from brokers. Currently, `AUTO_CONSUME` supports AVRO, JSON and ProtobufNativeSchema schemas. For more instructions, see [Construct an AUTO_CONSUME schema](schema-get-started.md#construct-an-auto_consume-schema).
 
 ### Native Avro Schema
 
 When migrating or ingesting event or message data from external systems (such as Kafka and Cassandra), the events are often already serialized in Avro format. The applications producing the data typically have validated the data against their schemas (including compatibility checks) and stored them in a database or a dedicated service (such as a schema registry). The schema of each serialized data record is usually retrievable by some metadata attached to that record. In such cases, a Pulsar producer doesn't need to repeat the schema validation step when sending the ingested events to a topic. All it needs to do is passing each message or event with its schema to Pulsar.
 
-Hence, we provide `Schema.NATIVE_AVRO` to wrap a native Avro schema of type `org.apache.avro.Schema`. The result is a schema instance of Pulsar that accepts a serialized Avro payload without validating it against the wrapped Avro schema.
+Hence, we provide `Schema.NATIVE_AVRO` to wrap a native Avro schema of type `org.apache.avro.Schema`. The result is a schema instance of Pulsar that accepts a serialized Avro payload without validating it against the wrapped Avro schema. See for more details.
 
-**Example**
+## Schema versioning
 
-```java
-org.apache.avro.Schema nativeAvroSchema = … ;
-
-Producer producer = pulsarClient.newProducer().topic("ingress").create();
-
-byte[] content = … ;
-
-producer.newMessage(Schema.NATIVE_AVRO(nativeAvroSchema)).value(content).send();
-```
-
-## Schema version
-
-Each `SchemaInfo` stored with a topic has a version. Schema version manages schema changes happening within a topic. 
+Each `SchemaInfo` stored with a topic has a version. The schema version manages schema changes happening within a topic. 
 
 Messages produced with a given `SchemaInfo` is tagged with a schema version, so when a message is consumed by a Pulsar client, the Pulsar client can use the schema version to retrieve the corresponding `SchemaInfo` and then use the `SchemaInfo` to deserialize data.
 
@@ -462,78 +153,60 @@ The table below lists the possible scenarios when this connection attempt occurs
 |  
  • No schema exists for the topic. 
    •  |   (1) The producer is created using the given schema. (2) Since no existing schema is compatible with the `SensorReading` schema, the schema is transmitted to the broker and stored. (3) Any consumer created using the same schema or topic can consume messages from the `sensor-data` topic.  | 
 |  
  • A schema already exists. 
  • The producer connects using the same schema that is already stored. 
    •  |   (1) The schema is transmitted to the broker. (2) The broker determines that the schema is compatible. (3) The broker attempts to store the schema in [BookKeeper](concepts-architecture-overview.md#persistent-storage) but then determines that it's already stored, so it is used to tag produced messages.  |   
  • A schema already exists. 
  • The producer connects using a new schema that is compatible. 
    •  |   (1) The schema is transmitted to the broker. (2) The broker determines that the schema is compatible and stores the new schema as the current version (with a new version number).  | 
 
-## How does schema work
-
-Pulsar schemas are applied and enforced at the **topic** level (schemas cannot be applied at the namespace or tenant level). 
+## Schema AutoUpdate
 
-Producers and consumers upload schemas to brokers, so Pulsar schemas work on the producer side and the consumer side.
+If a schema passes the schema compatibility check, Pulsar producer automatically updates this schema to the topic it produces by default. 
 
-### Producer side
+### AutoUpdate for producer
 
-This diagram illustrates how does schema work on the Producer side.
+For a producer, the `AutoUpdate` happens in the following cases:
 
-![Schema works at the producer side](/assets/schema-producer.png)
+* If a **topic doesn’t have a schema**, Pulsar registers a schema automatically.
 
-1. The application uses a schema instance to construct a producer instance. 
+* If a **topic has a schema**:
 
-   The schema instance defines the schema for the data being produced using the producer instance. 
+  * If a **producer doesn’t carry a schema**:
 
-   Take AVRO as an example, Pulsar extracts schema definition from the POJO class and constructs the `SchemaInfo` that the producer needs to pass to a broker when it connects.
-
-2. The producer connects to the broker with the `SchemaInfo` extracted from the passed-in schema instance.
-   
-3. The broker looks up the schema in the schema storage to check if it is already a registered schema. 
-   
-4. If yes, the broker skips the schema validation since it is a known schema, and returns the schema version to the producer.
-
-5. If no, the broker verifies whether a schema can be automatically created in this namespace:
+  * If `isSchemaValidationEnforced` or `schemaValidationEnforced` is **disabled** in the namespace to which the topic belongs, the producer is allowed to connect to the topic and produce data. 
+  
+  * If `isSchemaValidationEnforced` or `schemaValidationEnforced` is **enabled** in the namespace to which the topic belongs, the producer is rejected and disconnected.
 
-  * If `isAllowAutoUpdateSchema` sets to **true**, then a schema can be created, and the broker validates the schema based on the schema compatibility check strategy defined for the topic.
+  * If a **producer carries a schema**:
   
-  * If `isAllowAutoUpdateSchema` sets to **false**, then a schema can not be created, and the producer is rejected to connect to the broker.
+  A broker performs the compatibility check based on the configured compatibility check strategy of the namespace to which the topic belongs.
   
-:::tip
-
-`isAllowAutoUpdateSchema` can be set via **Pulsar admin API** or **REST API.** 
-
-For how to set `isAllowAutoUpdateSchema` via Pulsar admin API, see [Manage AutoUpdate Strategy](schema-manage.md/#manage-autoupdate-strategy). 
-
-:::
-
-6. If the schema is allowed to be updated, then the compatible strategy check is performed.
+  * If the schema is registered, a producer is connected to a broker. 
   
-  * If the schema is compatible, the broker stores it and returns the schema version to the producer. 
-
-   All the messages produced by this producer are tagged with the schema version. 
-
-  * If the schema is incompatible, the broker rejects it.
-
-### Consumer side
-
-This diagram illustrates how does Schema work on the consumer side. 
-
-![Schema works at the consumer side](/assets/schema-consumer.png)
-
-1. The application uses a schema instance to construct a consumer instance.
+  * If the schema is not registered:
+  
+     * If `isAllowAutoUpdateSchema` sets to **false**, the producer is rejected to connect to a broker.
+  
+      * If `isAllowAutoUpdateSchema` sets to **true**:
    
-   The schema instance defines the schema that the consumer uses for decoding messages received from a broker.
+          * If the schema passes the compatibility check, then the broker registers a new schema automatically for the topic and the producer is connected.
+      
+          * If the schema does not pass the compatibility check, then the broker does not register a schema and the producer is rejected to connect to a broker.
 
-2. The consumer connects to the broker with the `SchemaInfo` extracted from the passed-in schema instance.
+![AutoUpdate Producer](/assets/schema-producer.png)
 
-3. The broker determines whether the topic has one of them (a schema/data/a local consumer and a local producer).
+### AutoUpdate for consumer
 
-4. If a topic does not have all of them (a schema/data/a local consumer and a local producer):
-   
-     * If `isAllowAutoUpdateSchema` sets to **true**, then the consumer registers a schema and it is connected to a broker.
-       
-     * If `isAllowAutoUpdateSchema` sets to **false**, then the consumer is rejected to connect to a broker.
-       
-5. If a topic has one of them (a schema/data/a local consumer and a local producer), then the schema compatibility check is performed.
-   
-     * If the schema passes the compatibility check, then the consumer is connected to the broker.
-       
-     * If the schema does not pass the compatibility check, then the consumer is rejected to connect to the broker. 
+For a consumer, the `AutoUpdate` happens in the following cases:
 
-6. The consumer receives messages from the broker. 
+* If a **consumer connects to a topic without a schema** (which means the consumer receiving raw bytes), the consumer can connect to the topic successfully without doing any compatibility check.
 
-   If the schema used by the consumer supports schema versioning (for example, AVRO schema), the consumer fetches the `SchemaInfo` of the version tagged in messages and uses the passed-in schema and the schema tagged in messages to decode the messages.
+* If a **consumer connects to a topic with a schema**.
+
+  * If a topic does not have all of them (a schema/data/a local consumer and a local producer):
+  
+      * If `isAllowAutoUpdateSchema` sets to **true**, then the consumer registers a schema and it is connected to a broker.
+      
+      * If `isAllowAutoUpdateSchema` sets to **false**, then the consumer is rejected to connect to a broker.
+      
+  * If a topic has one of them (a schema/data/a local consumer and a local producer), then the schema compatibility check is performed.
+  
+      * If the schema passes the compatibility check, then the consumer is connected to the broker.
+      
+      * If the schema does not pass the compatibility check, then the consumer is rejected to connect to the broker.
+      
+![AutoUpdate Consumer](/assets/schema-consumer.png)
\ No newline at end of file
diff --git a/site2/docs/security-athenz.md b/site2/docs/security-athenz.md
index 86c67d3180c0f..5d10173dd0929 100644
--- a/site2/docs/security-athenz.md
+++ b/site2/docs/security-athenz.md
@@ -6,77 +6,79 @@ sidebar_label: "Authentication using Athenz"
 
 [Athenz](https://github.com/AthenZ/athenz) is a role-based authentication/authorization system. In Pulsar, you can use Athenz role tokens (also known as *z-tokens*) to establish the identity of the client.
 
-## Enable Athenz authentication
-
 A [decentralized Athenz system](https://github.com/AthenZ/athenz/blob/master/docs/decent_authz_flow.md) contains an [authori**Z**ation **M**anagement **S**ystem](https://github.com/AthenZ/athenz/blob/master/docs/setup_zms.md) (ZMS) server and an [authori**Z**ation **T**oken **S**ystem](https://github.com/AthenZ/athenz/blob/master/docs/setup_zts) (ZTS) server.
 
-To begin, you need to set up Athenz service access control. You need to create domains for the *provider* (which provides some resources to other services with some authentication/authorization policies) and the *tenant* (which is provisioned to access some resources in a provider). In this case, the provider corresponds to the Pulsar service itself and the tenant corresponds to each application using Pulsar (typically, a [tenant](reference-terminology.md#tenant) in Pulsar).
+## Prerequisites
+
+To begin, you need to set up Athenz service access control by creating domains for the *provider* (which provides some resources to other services with some authentication/authorization policies) and the *tenant* (which is provisioned to access some resources in a provider). In this case, the provider corresponds to the Pulsar service itself and the tenant corresponds to each application using Pulsar (typically, a [tenant](reference-terminology.md#tenant) in Pulsar).
 
-### Create the tenant domain and service
+### Create a tenant domain and service
 
-On the [tenant](reference-terminology.md#tenant) side, you need to do the following things:
+On the tenant side, do the followings:
 
-1. Create a domain, such as `shopping`
-2. Generate a private/public key pair
-3. Create a service, such as `some_app`, on the domain with the public key
+1. Create a domain, such as `shopping`.
+2. Generate a private/public key pair.
+3. Create a service, such as `some_app`, on the domain with the public key.
 
-Note that you need to specify the private key generated in step 2 when the Pulsar client connects to the [broker](reference-terminology.md#broker) (see client configuration examples for [Java](client-libraries-java.md#tls-authentication) and [C++](client-libraries-cpp.md#tls-authentication)).
+Note that you need to specify the private key generated in step 2 when the Pulsar client connects to the broker.
 
 For more specific steps involving the Athenz UI, refer to [Example Service Access Control Setup](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#client-tenant-domain).
 
-### Create the provider domain and add the tenant service to some role members
+### Create a provider domain and add the tenant service to role members
 
 On the provider side, you need to do the following things:
 
-1. Create a domain, such as `pulsar`
-2. Create a role
-3. Add the tenant service to members of the role
+1. Create a domain, such as `pulsar`.
+2. Create a role.
+3. Add the tenant service to the members of the role.
 
 Note that you can specify any action and resource in step 2 since they are not used on Pulsar. In other words, Pulsar uses the Athenz role token only for authentication, *not* for authorization.
 
-For more specific steps involving UI, refer to [Example Service Access Control Setup](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#server-provider-domain).
+For more specific steps involving the Athenz UI, refer to [Example Service Access Control Setup](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#server-provider-domain).
 
-## Enable Athenz authentication on brokers
+## Enable Athenz authentication on brokers/proxies
 
-> ### TLS encryption 
->
-> Note that when you are using Athenz as an authentication provider, you had better use TLS encryption 
-> as it can protect role tokens from being intercepted and reused. (for more details involving TLS encryption see [Architecture - Data Model](https://github.com/AthenZ/athenz/blob/master/docs/data_model)).
-
-In the `conf/broker.conf` configuration file in your Pulsar installation, you need to provide the class name of the Athenz authentication provider as well as a comma-separated list of provider domain names.
+To configure brokers/proxies to authenticate clients using Authenz, add the following parameters to the `conf/broker.conf` and the `conf/proxy.conf` files and provide the class name of the Athenz authentication provider as well as a comma-separated list of provider domain names. If you use a standalone Pulsar, you need to add these parameters to the `conf/standalone.conf` file.
 
 ```properties
 # Add the Athenz auth provider
 authenticationEnabled=true
-authorizationEnabled=true
 authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
 athenzDomainNames=pulsar
 
-# Enable TLS
-tlsEnabled=true
-tlsCertificateFilePath=/path/to/broker-cert.pem
-tlsKeyFilePath=/path/to/broker-key.pem
-
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
+# Authentication settings of the broker itself. Used when the broker connects to other brokers, or when the proxy connects to brokers, either in same or other clusters
 brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
 brokerClientAuthenticationParameters={"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}
 ```
 
-> A full listing of parameters is available in the `conf/broker.conf` file, you can also find the default
-> values for those parameters in [Broker Configuration](reference-configuration.md#broker).
-
 ## Configure Athenz authentication in Pulsar clients
 
-To use Athenz as an authentication provider, you need to [use TLS](#tls-authentication.md) and provide values for four parameters in a hash:
+To use Athenz as an authentication provider, you need to provide values for four parameters in a hash:
 * `tenantDomain`
 * `tenantService`
 * `providerDomain`
 * `privateKey`
 
+:::tip
+
+The `privateKey` parameter supports the following three pattern formats:
+* `file:///path/to/file`
+* `file:/path/to/file`
+* `data:application/x-pem-file;base64,`
+
+:::
+
 You can also set an optional `keyId`. The following is an example.
 
+````mdx-code-block
+
+
+
 ```java
 Map authParams = new HashMap();
+authParams.put("ztsUrl", "http://localhost:9998");
 authParams.put("tenantDomain", "shopping"); // Tenant domain name
 authParams.put("tenantService", "some_app"); // Tenant service name
 authParams.put("providerDomain", "pulsar"); // Provider domain name
@@ -87,35 +89,100 @@ Authentication athenzAuth = AuthenticationFactory
         .create(AuthenticationAthenz.class.getName(), authParams);
 
 PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar+ssl://my-broker.com:6651")
-        .tlsTrustCertsFilePath("/path/to/cacert.pem")
+        .serviceUrl("pulsar://my-broker.com:6650")
         .authentication(athenzAuth)
         .build();
 ```
 
-#### Supported pattern formats
-The `privateKey` parameter supports the following three pattern formats:
-* `file:///path/to/file`
-* `file:/path/to/file`
-* `data:application/x-pem-file;base64,`
+
+
+
+```python
+authPlugin = "athenz"
+authParams = """
+{
+"tenantDomain": "shopping",
+"tenantService": "some_app",
+"providerDomain": "pulsar",
+"privateKey": "file:///path/to/private.pem",
+"ztsUrl": "http://localhost:9998"
+}
+"""
+
+client = Client(
+    "pulsar://my-broker.com:6650",
+    authentication=Authentication(authPlugin, authParams),
+)
+```
+
+
+
+
+```cpp
+std::string params = R"({
+        "tenantDomain": "shopping",
+        "tenantService": "some_app",
+        "providerDomain": "pulsar",
+        "privateKey": "file:///path/to/private.pem",
+        "ztsUrl": "http://localhost:9998"
+    })";
+pulsar::AuthenticationPtr auth = pulsar::AuthAthenz::create(params);
+ClientConfiguration config = ClientConfiguration();
+config.setAuth(auth);
+Client client("pulsar://my-broker.com:6650", config);
+```
+
+
+
+
+```javascript
+const auth = new Pulsar.AuthenticationAthenz({
+    tenantDomain: "shopping",
+    tenantService: "some_app",
+    providerDomain: "pulsar",
+    privateKey: "file:///path/to/private.pem",
+    ztsUrl: "http://localhost:9998"
+});
+
+const client = new Pulsar.Client({
+    serviceUrl: 'pulsar://my-broker.com:6650',
+    authentication: auth
+});
+```
+
+
+
+
+```go
+provider := pulsar.NewAuthenticationAthenz(
+		"pulsar",
+		"shopping",
+		"some_app",
+		"file:///path/to/private.pem",
+		"v1",
+		"",
+		"http://localhost:9998")
+client, err := pulsarNewClient(ClientOptions{
+		URL:                   "pulsar://my-broker.com:6650",
+		Authentication:        basicAuth,
+	})
+```
+
+
+
+````
 
 ## Configure Athenz authentication in CLI tools
 
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
+[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md), and [`pulsar-client`](reference-cli-tools.md) use the `conf/client.conf` config file in a Pulsar installation.
 
 You need to add the following authentication parameters to the `conf/client.conf` config file to use Athenz with CLI tools of Pulsar:
 
 ```properties
 # URL for the broker
-serviceUrl=https://broker.example.com:8443/
+serviceUrl=http://broker.example.com:8080
 
 # Set Athenz auth plugin and its parameters
 authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
 authParams={"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}
-
-# Enable TLS
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/cacert.pem
-```
-
+```
\ No newline at end of file
diff --git a/site2/docs/security-basic-auth.md b/site2/docs/security-basic-auth.md
index 608a1281bef75..b6aad41114fac 100644
--- a/site2/docs/security-basic-auth.md
+++ b/site2/docs/security-basic-auth.md
@@ -55,9 +55,9 @@ cat path/to/.htpasswd
 superuser:$apr1$GBIYZYFZ$MzLcPrvoUky16mLcK6UtX/
 ```
 
-## Enable basic authentication on brokers
+## Enable basic authentication on brokers/proxies
 
-To configure brokers to authenticate clients, add the following parameters to the `conf/broker.conf` file. If you use a standalone Pulsar, you need to add these parameters to the `conf/standalone.conf` file:
+To configure brokers/proxies to authenticate clients using basic, add the following parameters to the `conf/broker.conf` and the `conf/proxy.conf` file. If you use a standalone Pulsar, you need to add these parameters to the `conf/standalone.conf` file:
 
 ```conf
 # Configuration to enable Basic authentication
@@ -70,43 +70,9 @@ basicAuthConf=file:///path/to/.htpasswd
 # basicAuthConf=data:;base64,YOUR-BASE64
 # basicAuthConf=YOUR-BASE64
 
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
+# Authentication settings of the broker itself. Used when the broker connects to other brokers, or when the proxy connects to brokers, either in same or other clusters
 brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationBasic
 brokerClientAuthenticationParameters={"userId":"superuser","password":"admin"}
-
-# If this flag is set then the broker authenticates the original Auth data
-# else it just accepts the originalPrincipal and authorizes it (if required).
-authenticateOriginalAuthData=true
-```
-
-:::note
-
-You can also set an environment variable named `PULSAR_EXTRA_OPTS` and the value is `-Dpulsar.auth.basic.conf=/path/to/.htpasswd`. Pulsar reads this environment variable to implement HTTP basic authentication.
-
-:::
-
-## Enable basic authentication on proxies
-
-To configure proxies to authenticate clients, add the following parameters to the `conf/proxy.conf` file:
-
-```conf
-# For clients connecting to the proxy
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderBasic
-
-basicAuthConf=file:///path/to/.htpasswd
-# basicAuthConf=/path/to/.htpasswd
-# When use the base64 format, you need to encode the .htpaswd content to bas64
-# basicAuthConf=data:;base64,YOUR-BASE64
-# basicAuthConf=YOUR-BASE64
-
-# For the proxy to connect to brokers
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationBasic
-brokerClientAuthenticationParameters={"userId":"superuser","password":"admin"}
-
-# Whether client authorization credentials are forwarded to the broker for re-authorization.
-# Authentication must be enabled via authenticationEnabled=true for this to take effect.
-forwardAuthorizationCredentials=true
 ```
 
 :::note
diff --git a/site2/docs/security-bouncy-castle.md b/site2/docs/security-bouncy-castle.md
index 6e95e05214fa0..4399c72940111 100644
--- a/site2/docs/security-bouncy-castle.md
+++ b/site2/docs/security-bouncy-castle.md
@@ -101,17 +101,17 @@ Pulsar module `bouncy-castle-bcfips`, which is defined by `bouncy-castle/bcfips/
 Similar to `bouncy-castle-bc`, `bouncy-castle-bcfips` is also packaged as a `jar-in-jar` package for easy include/exclude.
 
 ```xml
-    
-      org.bouncycastle
-      bc-fips
-      ${bouncycastlefips.version}
-    
-
-    
-      org.bouncycastle
-      bcpkix-fips
-      ${bouncycastlefips.version}
-    
+
+  org.bouncycastle
+  bc-fips
+  ${bouncycastle.bc-fips.version}
+
+
+
+  org.bouncycastle
+  bcpkix-fips
+  ${bouncycastle.bcpkix-fips.version}
+
 ```
 
 ### Exclude BC-non-FIPS and include BC-FIPS
diff --git a/site2/docs/security-extending.md b/site2/docs/security-extending.md
index 2955c44a92253..b3470307416d0 100644
--- a/site2/docs/security-extending.md
+++ b/site2/docs/security-extending.md
@@ -9,8 +9,8 @@ Pulsar provides a way to use custom authentication and authorization mechanisms.
 ## Authentication
 
 You can use a custom authentication mechanism by providing the implementation in the form of two plugins.
-* Client authentication plugin
-* Proxy/Broker authentication plugin
+* Client authentication plugin `org.apache.pulsar.client.api.AuthenticationDataProvider` provides the authentication data for broker/proxy.
+* Broker/Proxy authentication plugin `org.apache.pulsar.broker.authentication.AuthenticationProvider` authenticates the authentication data from clients.
 
 ### Client authentication plugin
 
@@ -37,9 +37,9 @@ You can find the following examples for different client authentication plugins:
  * [OAuth 2.0](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2.java)
  * [Basic auth](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationBasic.java)
 
-### Proxy/Broker authentication plugin
+### Broker/Proxy authentication plugin
 
-On the proxy/broker side, you need to configure the corresponding plugin to validate the credentials that the client sends. The proxy and broker can support multiple authentication providers at the same time.
+On the broker/proxy side, you need to configure the corresponding plugin to validate the credentials that the client sends. The proxy and broker can support multiple authentication providers at the same time.
 
 In `conf/broker.conf`, you can choose to specify a list of valid providers:
 
diff --git a/site2/docs/security-jwt.md b/site2/docs/security-jwt.md
index 374324a8d90ff..2ca2737db8d52 100644
--- a/site2/docs/security-jwt.md
+++ b/site2/docs/security-jwt.md
@@ -1,6 +1,6 @@
 ---
 id: security-jwt
-title: Client authentication using tokens based on JSON Web Tokens
+title: Authentication using tokens based on JSON Web Tokens
 sidebar_label: "Authentication using JWT"
 ---
 
@@ -9,43 +9,34 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 ````
 
+Pulsar supports authenticating clients using security tokens based on [JSON Web Tokens](https://jwt.io/introduction/) ([RFC-7519](https://tools.ietf.org/html/rfc7519)), including all the algorithms that the [Java JWT library](https://github.com/jwtk/jjwt#signature-algorithms-keys) supports.
 
-## Token authentication overview
+A token is a credential associated with a user. The association is done through a "principal" or "role". In the case of JWT tokens, it typically refers to a **subject**. You can use a token to identify a Pulsar client and associate it with a **subject** that is permitted to do specific actions, such as publish messages to a topic or consume messages from a topic. An alternative is to pass a "token supplier" (a function that returns the token when the client library needs one).
 
-Pulsar supports authenticating clients using security tokens that are based on [JSON Web Tokens](https://jwt.io/introduction/) ([RFC-7519](https://tools.ietf.org/html/rfc7519)).
-
-You can use tokens to identify a Pulsar client and associate with some "principal" (or "role") that
-is permitted to do some actions (eg: publish to a topic or consume from a topic).
-
-A user typically gets a token string from the administrator (or some automated service).
-
-The compact representation of a signed JWT is a string that looks like the following:
+The application specifies the token when you create the client instance. The user typically gets the token string from the administrator. The compact representation of a signed JWT is a string that looks like the following:
 
 ```
 eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJKb2UifQ.ipevRNuRP6HflG8cFKnmUPtypruRC4fb1DWtoLL62SY
 ```
 
-Application specifies the token when you create the client instance. An alternative is to pass a "token supplier" (a function that returns the token when the client library needs one).
-
 :::note
 
-Always use TLS transport encryption when you connect to the Pulsar service, because sending a token is equivalent to sending a password over the wire. See [Transport Encryption using TLS](security-tls-transport.md) for more details.
+Always use [TLS encryption](security-tls-transport.md) when connecting to the Pulsar service, because sending a token is equivalent to sending a password over the wire.
 
 :::
 
-## Enable token authentication
+## Create client certificates
 
-JWT supports two different kinds of keys to generate and validate the tokens:
+JWT authentication supports two different kinds of keys to generate and validate the tokens:
 
- * Symmetric:
-    - You can use a single ***Secret*** key to generate and validate tokens.
- * Asymmetric: A pair of keys consists of the Private key and the Public key.
-    - You can use ***Private*** key to generate tokens.
-    - You can use ***Public*** key to validate tokens.
+- Symmetric: A single ***secret*** key.
+- Asymmetric: A key pair, including:
+  - a ***private*** key to generate tokens.
+  - a ***public*** key to validate tokens.
 
 ### Create a secret key
 
-When you use a secret key, the administrator creates the key and uses the key to generate the client tokens. You can also configure this key to brokers to validate the clients.
+The administrators create the secret key and use it to generate the client tokens. You can also configure this key for brokers to validate the clients.
 
 The output file is generated in the root of your Pulsar installation directory. You can also provide an absolute path for the output file using the command below.
 
@@ -53,7 +44,7 @@ The output file is generated in the root of your Pulsar installation directory.
 bin/pulsar tokens create-secret-key --output my-secret.key
 ```
 
-Enter this command to generate a base64 encoded private key.
+To generate a base64-encoded private key, enter the following command.
 
 ```shell
 bin/pulsar tokens create-secret-key --output  /opt/my-secret.key --base64
@@ -61,72 +52,61 @@ bin/pulsar tokens create-secret-key --output  /opt/my-secret.key --base64
 
 ### Create a key pair
 
-With Public and Private keys, you need to create a pair of keys. Pulsar supports all algorithms that the Java JWT library (shown [here](https://github.com/jwtk/jjwt#signature-algorithms-keys)) supports.
-
-The output file is generated in the root of your Pulsar installation directory. You can also provide an absolute path for the output file using the command below.
+To use asymmetric key encryption, you need to create a pair of keys. The output file is generated in the root of your Pulsar installation directory. You can also provide an absolute path for the output file using the command below.
 
 ```shell
 bin/pulsar tokens create-key-pair --output-private-key my-private.key --output-public-key my-public.key
 ```
 
- * Store `my-private.key` in a safe location and only administrators can use `my-private.key` to generate new tokens.
- * `my-public.key` is distributed to all Pulsar brokers. You can publicly share this file without any security concerns.
+ * Store `my-private.key` in a safe location and only the administrators can use this private key to generate new tokens.
+ * The public key file `my-public.key` is distributed to all Pulsar brokers. You can publicly share it without any security concerns.
 
 ### Generate tokens
 
-A token is a credential associated with a user. The association is done through the "principal" or "role". In the case of JWT tokens, this field is typically referred as **subject**, though they are the same concept.
-
-Then, you need to use this command to require the generated token to have a **subject** fieldset.
-
-```shell
-bin/pulsar tokens create --secret-key file:///path/to/my-secret.key \
-            --subject test-user
-```
+1. Use this command to require the generated token to have a **subject** fieldset. This command prints the token string on `stdout`.
 
-This command prints the token string on stdout.
+   ```shell
+   bin/pulsar tokens create --secret-key file:///path/to/my-secret.key \
+               --subject test-user
+   ```
 
-Similarly, you can create a token by passing the "private" key using the command below:
+2. Create a token by passing the "private" key using the command below:
 
-```shell
-bin/pulsar tokens create --private-key file:///path/to/my-private.key \
-            --subject test-user
-```
+   ```shell
+   bin/pulsar tokens create --private-key file:///path/to/my-private.key \
+               --subject test-user
+   ```
 
-Finally, you can enter the following command to create a token with a pre-defined TTL. And then the token is automatically invalidated.
+3. Create a token with a pre-defined TTL. Then the token is automatically invalidated.
 
-```shell
-bin/pulsar tokens create --secret-key file:///path/to/my-secret.key \
-            --subject test-user \
-            --expiry-time 1y
-```
+   ```shell
+   bin/pulsar tokens create --secret-key file:///path/to/my-secret.key \
+               --subject test-user \
+               --expiry-time 1y
+   ```
 
 :::tip
 
-The token itself does not have any permission associated. The authorization engine determines whether the token can have permissions or not. You need to [enable authorization and assign superusers](security-authorization.md#enable-authorization-and-assign-superusers), and then use the `bin/pulsar-admin namespaces grant-permission` command to grant permissions for tokens.
+The token itself does not have any permission associated. You need to [enable authorization and assign superusers](security-authorization.md#enable-authorization-and-assign-superusers), and use the `bin/pulsar-admin namespaces grant-permission` command to grant permissions to the token.
 
 :::
 
-### Enable token authentication on brokers
+## Enable JWT authentication on brokers/proxies
 
-To configure brokers to authenticate clients, add the following parameters to the `conf/broker.conf` or `conf/standalone.conf` file.
+To configure brokers/proxies to authenticate clients using JWT, add the following parameters to the `conf/broker.conf` and the `conf/proxy.conf` file. If you use a standalone Pulsar, you need to add these parameters to the `conf/standalone.conf` file:
 
 ```properties
 # Configuration to enable authentication
 authenticationEnabled=true
 authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderToken
 
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
+# Authentication settings of the broker itself. Used when the broker connects to other brokers, or when the proxy connects to brokers, either in same or other clusters
 brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationToken
 brokerClientAuthenticationParameters={"token":"eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0LXVzZXIifQ.9OHgE9ZUDeBTZs7nSMEFIuGNEX18FLR3qvy8mqxSxXw"}
 # Either configure the token string or specify to read it from a file. The following three available formats are all valid:
 # brokerClientAuthenticationParameters={"token":"your-token-string"}
 # brokerClientAuthenticationParameters=token:your-token-string
 # brokerClientAuthenticationParameters=file:///path/to/token
-brokerClientTrustCertsFilePath=/path/my-ca/certs/ca.cert.pem
-
-# If this flag is set then the broker authenticates the original Auth data
-# else it just accepts the originalPrincipal and authorizes it (if required).
-authenticateOriginalAuthData=true
 
 # If using secret key (Note: key files must be DER-encoded)
 tokenSecretKey=file:///path/to/secret.key
@@ -137,41 +117,14 @@ tokenSecretKey=file:///path/to/secret.key
 # tokenPublicKey=file:///path/to/public.key
 ```
 
-:::note
-
-Equivalent to `brokerClientAuthenticationParameters`, you need to configure `authParams` in the `conf/client.conf` file.
-
-:::
+## Configure JWT authentication in CLI Tools
 
-### Enable token authentication on proxies
+[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md), and [`pulsar-client`](reference-cli-tools.md) use the `conf/client.conf` config file in a Pulsar installation.
 
-To configure proxies to authenticate clients, add the following parameters to the `conf/proxy.conf` file.
+You need to add the following parameters to the `conf/client.conf` config file to use the JWT authentication with CLI tools of Pulsar:
 
 ```properties
-# For clients connecting to the proxy
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderToken
-tokenSecretKey=file:///path/to/secret.key
-
-# For the proxy to connect to brokers
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationToken
-brokerClientAuthenticationParameters={"token":"eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0LXVzZXIifQ.9OHgE9ZUDeBTZs7nSMEFIuGNEX18FLR3qvy8mqxSxXw"}
-# Either configure the token string or specify to read it from a file. The following three available formats are all valid:
-# brokerClientAuthenticationParameters={"token":"your-token-string"}
-# brokerClientAuthenticationParameters=token:your-token-string
-# brokerClientAuthenticationParameters=file:///path/to/token
-```
-
-The proxy uses its own token when connecting to brokers. You need to configure the role token for this key pair in the `proxyRoles` of the brokers. For more details, see [authorization](security-authorization.md).
-
-### Configure JWT authentication in CLI Tools
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You need to add the following parameters to that file to use the token authentication with CLI tools of Pulsar:
-
-```conf
-webServiceUrl=http://broker.example.com:8080/
+webServiceUrl=https://broker.example.com:8443/
 brokerServiceUrl=pulsar://broker.example.com:6650/
 authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationToken
 authParams=token:eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJKb2UifQ.ipevRNuRP6HflG8cFKnmUPtypruRC4fb1DWtoLL62SY
@@ -179,11 +132,11 @@ authParams=token:eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJKb2UifQ.ipevRNuRP6HflG8cFKnmUPt
 
 The token string can also be read from a file, for example:
 
-```conf
+```properties
 authParams=file:///path/to/token/file
 ```
 
-### Configure JWT authentication in Pulsar clients
+## Configure JWT authentication in Pulsar clients
 
 You can use tokens to authenticate the following Pulsar clients.
 
diff --git a/site2/docs/security-kerberos.md b/site2/docs/security-kerberos.md
index 506dc1573c69b..150173bebaee1 100644
--- a/site2/docs/security-kerberos.md
+++ b/site2/docs/security-kerberos.md
@@ -4,28 +4,34 @@ title: Authentication using Kerberos
 sidebar_label: "Authentication using Kerberos"
 ---
 
-[Kerberos](https://web.mit.edu/kerberos/) is a network authentication protocol. By using secret-key cryptography, [Kerberos](https://web.mit.edu/kerberos/) is designed to provide strong authentication for client applications and server applications. 
+[Kerberos](https://web.mit.edu/kerberos/) is a network authentication protocol designed to provide strong authentication for client applications and server applications by using secret-key cryptography. 
 
-In Pulsar, you can use Kerberos with [SASL](https://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer) as a choice for authentication. And Pulsar uses the [Java Authentication and Authorization Service (JAAS)](https://en.wikipedia.org/wiki/Java_Authentication_and_Authorization_Service) for SASL configuration. You need to provide JAAS configurations for Kerberos authentication. 
+In Pulsar, you can use Kerberos with [SASL](https://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer) as a choice for authentication. Since Pulsar uses the [Java Authentication and Authorization Service (JAAS)](https://en.wikipedia.org/wiki/Java_Authentication_and_Authorization_Service) for SASL configuration, you need to provide JAAS configurations for Kerberos authentication. 
 
-This document introduces how to configure `Kerberos` with `SASL` between Pulsar clients and brokers and how to configure Kerberos for Pulsar proxy in detail.
+:::note
 
-## Configure Kerberos between client and broker
+Kerberos authentication uses the authenticated principal as the role token for [Pulsar authorization](security-authorization.md). If you've enabled `authorizationEnabled`, you need to set `superUserRoles` in `broker.conf` that corresponds to the name registered in KDC. For example:
 
-### Prerequisites
+```bash
+superUserRoles=client/{clientIp}@EXAMPLE.COM
+```
 
-To begin, you need to set up (or already have) a [Key Distribution Center(KDC)](https://en.wikipedia.org/wiki/Key_distribution_center). Also you need to configure and run the [Key Distribution Center(KDC)](https://en.wikipedia.org/wiki/Key_distribution_center)in advance. 
+:::
 
-If your organization already uses a Kerberos server (for example, by using `Active Directory`), you do not have to install a new server for Pulsar. If your organization does not use a Kerberos server, you need to install one. Your Linux vendor might have packages for `Kerberos`. On how to install and configure Kerberos, refer to [Ubuntu](https://help.ubuntu.com/community/Kerberos), 
+## Prerequisites
+
+- Set up and run a [Key Distribution Center(KDC)](https://en.wikipedia.org/wiki/Key_distribution_center).
+- Install a Kerberos server if your organization doesn't have one. Your Linux vendor might have packages for `Kerberos`. For how to install and configure Kerberos, see [Ubuntu](https://help.ubuntu.com/community/Kerberos) and 
 [Redhat](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Managing_Smart_Cards/installing-kerberos.html).
+- If you use Oracle Java, you need to download JCE policy files for your Java version and copy them to the `$JAVA_HOME/jre/lib/security` directory.
 
-Note that if you use Oracle Java, you need to download JCE policy files for your Java version and copy them to the `$JAVA_HOME/jre/lib/security` directory.
+## Enable Kerberos authentication on brokers
 
-#### Kerberos principals
+### Create Kerberos principals
 
-If you use the existing Kerberos system, ask your Kerberos administrator for a principal for each brokers in your cluster and for every operating system user that accesses Pulsar with Kerberos authentication(via clients and tools).
+If you use the existing Kerberos system, ask your Kerberos administrator to obtain a principal for each broker in your cluster and for every operating system user that accesses Pulsar with Kerberos authentication (via clients and CLI tools).
 
-If you have installed your own Kerberos system, you can create these principals with the following commands:
+If you have installed your own Kerberos system, you need to create these principals with the following commands:
 
 ```shell
 ### add Principals for broker
@@ -36,35 +42,32 @@ sudo /usr/sbin/kadmin.local -q 'addprinc -randkey client/{hostname}@{REALM}'
 sudo /usr/sbin/kadmin.local -q "ktadd -k /etc/security/keytabs/{client-keytabname}.keytab client/{hostname}@{REALM}"
 ```
 
-Note that *Kerberos* requires that all your hosts can be resolved with their FQDNs.
-
-The first part of broker principal (for example, `broker` in `broker/{hostname}@{REALM}`) is the `serverType` of each host. The suggested values of `serverType` are `broker` (host machine runs service Pulsar brokers) and `proxy` (host machine runs service Pulsar Proxy). 
+The first part of broker principal (for example, `broker` in `broker/{hostname}@{REALM}`) is the `serverType` of each host. The suggested values of `serverType` are `broker` (host machine runs Pulsar broker service) and `proxy` (host machine runs Pulsar Proxy service). 
 
-#### Connect to KDC
-
-You need to enter the command below to specify the path to the `krb5.conf` file for the client side and the broker side. The content of `krb5.conf` file indicates the default Realm and KDC information. See [JDK’s Kerberos Requirements](https://docs.oracle.com/javase/8/docs/technotes/guides/security/jgss/tutorials/KerberosReq.html) for more details.
-
-```shell
--Djava.security.krb5.conf=/etc/pulsar/krb5.conf
-```
+Note that *Kerberos* requires that all your hosts can be resolved with their FQDNs.
 
-Here is an example of the krb5.conf file. `EXAMPLE.COM` is the default realm; `kdc = localhost:62037` is the kdc server URL for realm `EXAMPLE.COM `.
+### Configure brokers
+ 
+In the `broker.conf` file, set Kerberos-related configurations. Here is an example:
 
 ```conf
-[libdefaults]
- default_realm = EXAMPLE.COM
+authenticationEnabled=true
+authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderSasl
+saslJaasClientAllowedIds=.*client.* ## regex for principals that are allowed to connect to brokers
+saslJaasServerSectionName=PulsarBroker ## corresponds to the section in the JAAS configuration file for brokers
 
-[realms]
- EXAMPLE.COM  = {
-  kdc = localhost:62037
- }
+# Authentication settings of the broker itself. Used when the broker connects to other brokers, or when the proxy connects to brokers, either in same or other clusters
+brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationSasl
+brokerClientAuthenticationParameters={"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}
 ```
 
-Usually machines configured with kerberos already have a system-wide configuration and this configuration is optional.
+To make Pulsar internal admin client work properly, you need to: 
+- Set `brokerClientAuthenticationPlugin` to client plugin `AuthenticationSasl`;
+- Set `brokerClientAuthenticationParameters` to value in JSON string `{"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}`, in which `PulsarClient` is the section name in the `pulsar_jaas.conf` file, and `"serverType":"broker"` indicates that the internal admin client connects to a broker.
 
-#### Configure JAAS configuration file
+### Configure JAAS
 
-You need the JAAS configuration file for the client side and the broker side. JAAS configuration file provides the section of information that is used to connect KDC. Here is an example named `pulsar_jaas.conf`:
+JAAS configuration file provides the information to connect KDC. Here is an example named `pulsar_jaas.conf`:
 
 ```conf
  PulsarBroker {
@@ -86,174 +89,90 @@ You need the JAAS configuration file for the client side and the broker side. JA
 };
 ```
 
-You need to set the `JAAS` configuration file path as JVM parameter for client and broker. For example:
+In the above example:
+- `PulsarBroker` is a section name in the JAAS file that each broker uses. This section tells the broker to use which principal inside Kerberos and the location of the keytab where the principal is stored. 
+- `PulsarClient` is a section name in the JASS file that each client uses. This section tells the client to use which principal inside Kerberos and the location of the keytab where the principal is stored.
+
+You need to set the `pulsar_jaas.conf` file path as a JVM parameter. For example:
 
 ```shell
     -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf
 ```
 
-In the `pulsar_jaas.conf` file above 
-
-1. `PulsarBroker` is a section name in the JAAS file that each broker uses. This section tells the broker to use which principal inside Kerberos and the location of the keytab where the principal is stored. `PulsarBroker` allows the broker to use the keytab specified in this section.
-2. `PulsarClient` is a section name in the JASS file that each broker uses. This section tells the client to use which principal inside Kerberos and the location of the keytab where the principal is stored. `PulsarClient` allows the client to use the keytab specified in this section.
-   The following example also reuses this `PulsarClient` section in both the Pulsar internal admin configuration and in CLI command of `bin/pulsar-client`, `bin/pulsar-perf` and `bin/pulsar-admin`. You can also add different sections for different use cases.
-
-You can have 2 separate JAAS configuration files: 
-* the file for a broker that has sections of both `PulsarBroker` and `PulsarClient`; 
-* the file for a client that only has a `PulsarClient` section.
-
-
-### Configure Kerberos authentication for brokers
-
-#### Configure the `broker.conf` file
- 
-In the `broker.conf` file, set Kerberos-related configurations.
+### Connect to KDC
 
-- Set `authenticationEnabled` to `true`;
-- Set `authenticationProviders` to choose `AuthenticationProviderSasl`;
-- Set `saslJaasClientAllowedIds` regex for principals that are allowed to connect to brokers;
-- Set `saslJaasServerSectionName` that corresponds to the section in the JAAS configuration file for brokers;
- 
-To make Pulsar internal admin client work properly, you need to set the configuration in the `broker.conf` file as below: 
-- Set `brokerClientAuthenticationPlugin` to client plugin `AuthenticationSasl`;
-- Set `brokerClientAuthenticationParameters` to value in JSON string `{"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}`, in which `PulsarClient` is the section name in the `pulsar_jaas.conf` file, and `"serverType":"broker"` indicates that the internal admin client connects to a Pulsar Broker;
+:::note
 
-Here is an example:
+If your machines configured with Kerberos already have a system-wide configuration, you can skip this configuration.
 
-```conf
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderSasl
-saslJaasClientAllowedIds=.*client.*
-saslJaasServerSectionName=PulsarBroker
+:::
 
-## Authentication settings of the broker itself. Used when the broker connects to other brokers
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationSasl
-brokerClientAuthenticationParameters={"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}
-```
+The content of `krb5.conf` file indicates the default Realm and KDC information. See [JDK’s Kerberos Requirements](https://docs.oracle.com/javase/8/docs/technotes/guides/security/jgss/tutorials/KerberosReq.html) for more details.
 
-#### Set broker JVM parameters
-
-Set JVM parameters for the JAAS configuration file and krb5 configuration file with additional options.
+To specify the path to the `krb5.conf` file for brokers, enter the command below. 
 
 ```shell
--Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf
+-Djava.security.krb5.conf=/etc/pulsar/krb5.conf
 ```
 
-You can add this at the end of `PULSAR_EXTRA_OPTS` in the file [`pulsar_env.sh`](https://github.com/apache/pulsar/blob/master/conf/pulsar_env.sh)
-
-You must ensure that the operating system user who starts broker can reach the keytabs configured in the `pulsar_jaas.conf` file and kdc server in the `krb5.conf` file.
-
-### Configure Kerberos authentication for clients
-
-#### Java Client and Java Admin Client
+Here is an example of the `krb5.conf` file. 
 
-In client applications, include `pulsar-client-auth-sasl` in your project dependency.
+```conf
+[libdefaults]
+ default_realm = EXAMPLE.COM
 
-```xml
-    
-      org.apache.pulsar
-      pulsar-client-auth-sasl
-      ${pulsar.version}
-    
+[realms]
+ EXAMPLE.COM  = {
+  kdc = localhost:62037
+ }
 ```
 
-Configure the authentication type to use `AuthenticationSasl`, and also provide the authentication parameters to it. 
-
-You need 2 parameters: 
-- `saslJaasClientSectionName`. This parameter corresponds to the section in the JAAS configuration file for clients; 
-- `serverType`. This parameter stands for whether this client connects to brokers or proxies. And client uses this parameter to know which server-side principal should be used. 
-
-When you authenticate between client and broker with the setting in the above JAAS configuration file, we need to set `saslJaasClientSectionName` to `PulsarClient` and set `serverType` to `broker`.
-
-The following is an example of creating a Java client:
+In the above example:
+- `EXAMPLE.COM` is the default Realm;
+- `kdc = localhost:62037` is the KDC server URL for the `EXAMPLE.COM` Realm.
 
- ```java
- System.setProperty("java.security.auth.login.config", "/etc/pulsar/pulsar_jaas.conf");
- System.setProperty("java.security.krb5.conf", "/etc/pulsar/krb5.conf");
+## Enable Kerberos authentication on proxies
 
- Map authParams = Maps.newHashMap();
- authParams.put("saslJaasClientSectionName", "PulsarClient");
- authParams.put("serverType", "broker");
+If you want to use proxies between brokers and clients, Pulsar proxies (as a SASL server in Kerberos) will authenticate clients (as a SASL client in Kerberos) before brokers authenticate proxies. 
 
- Authentication saslAuth = AuthenticationFactory
-         .create(org.apache.pulsar.client.impl.auth.AuthenticationSasl.class.getName(), authParams);
- 
- PulsarClient client = PulsarClient.builder()
-         .serviceUrl("pulsar://my-broker.com:6650")
-         .authentication(saslAuth)
-         .build();
- ```
+### Create Kerberos principals
 
-> The first two lines in the example above are hard-coded. Alternatively, you can set additional JVM parameters for JAAS and krb5 configuration file when you run the application like below:
+Add new principals for Pulsar proxies.
 
 ```shell
-java -cp -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf $APP-jar-with-dependencies.jar $CLASSNAME
+### add Principals for Pulsar Proxy
+sudo /usr/sbin/kadmin.local -q 'addprinc -randkey proxy/{hostname}@{REALM}'
+sudo /usr/sbin/kadmin.local -q "ktadd -k /etc/security/keytabs/{proxy-keytabname}.keytab proxy/{hostname}@{REALM}"
 ```
 
-You must ensure that the operating system user who starts Pulsar client can reach the keytabs configured in the `pulsar_jaas.conf` file and kdc server in the `krb5.conf` file.
-
-#### Configure CLI tools
+For principals set for brokers and clients, see [here](#create-kerberos-principals).
 
-If you use a command-line tool (such as `bin/pulsar-client`, `bin/pulsar-perf` and `bin/pulsar-admin`), you need to perform the following steps:
+### Configure proxies
 
-Step 1. Enter the command below to configure your `client.conf`.
+In the `proxy.conf` file, set Kerberos-related configuration. 
 
 ```shell
-authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationSasl
-authParams={"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}
-```
-
-Step 2. Enter the command below to set JVM parameters for the JAAS configuration file and krb5 configuration file with additional options.
-
-```shell
--Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf
-```
-
-You can add this at the end of `PULSAR_EXTRA_OPTS` in the file [`pulsar_tools_env.sh`](https://github.com/apache/pulsar/blob/master/conf/pulsar_tools_env.sh),
-or add this line `OPTS="$OPTS -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf "` directly to the CLI tool script.
-
-The meaning of configurations is the same as the meaning of configurations in Java client section.
-
-## Configure Kerberos authentication for proxies
-
-With the above configuration, clients and brokers can do authentication using Kerberos.  
-
-A client that connects to Pulsar Proxy is a little different. Pulsar Proxy (as a SASL Server in Kerberos) authenticates Client (as a SASL client in Kerberos) first, and then Pulsar broker authenticates Pulsar Proxy. 
-
-Now in comparison with the above configuration between client and broker, we show you how to configure Pulsar Proxy as follows. 
-
-### Create principals in Kerberos
-
-You need to add new principals for Pulsar proxy compared with the above configuration. If you already have principals for client and broker, you only need to add the proxy principal here.
+## related to authenticate client.
+authenticationEnabled=true
+authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderSasl
+saslJaasClientAllowedIds=.*client.*
+saslJaasServerSectionName=PulsarProxy
 
-```shell
-### add Principals for Pulsar Proxy
-sudo /usr/sbin/kadmin.local -q 'addprinc -randkey proxy/{hostname}@{REALM}'
-sudo /usr/sbin/kadmin.local -q "ktadd -k /etc/security/keytabs/{proxy-keytabname}.keytab proxy/{hostname}@{REALM}"
-### add Principals for broker
-sudo /usr/sbin/kadmin.local -q 'addprinc -randkey broker/{hostname}@{REALM}'
-sudo /usr/sbin/kadmin.local -q "ktadd -k /etc/security/keytabs/{broker-keytabname}.keytab broker/{hostname}@{REALM}"
-### add Principals for client
-sudo /usr/sbin/kadmin.local -q 'addprinc -randkey client/{hostname}@{REALM}'
-sudo /usr/sbin/kadmin.local -q "ktadd -k /etc/security/keytabs/{client-keytabname}.keytab client/{hostname}@{REALM}"
+## related to be authenticated by broker
+brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationSasl
+brokerClientAuthenticationParameters={"saslJaasClientSectionName":"PulsarProxy", "serverType":"broker"}
+forwardAuthorizationCredentials=true
 ```
 
-### Add a section in JAAS configuration file
+In the above example:
+- The first part relates to the authentication between clients and proxies. In this phase, clients work as SASL clients, while proxies work as SASL servers. 
+- The second part relates to the authentication between proxies and brokers. In this phase, proxies work as SASL clients, while brokers work as SASL servers.
 
-In comparison with the above configuration, add a new section for Pulsar Proxy in the JAAS configuration file.
+### Configure JAAS
 
-Here is an example named `pulsar_jaas.conf`:
+Add a new section for proxies in the `pulsar_jaas.conf` file. Here is an example:
 
 ```conf
- PulsarBroker {
-   com.sun.security.auth.module.Krb5LoginModule required
-   useKeyTab=true
-   storeKey=true
-   useTicketCache=false
-   keyTab="/etc/security/keytabs/pulsarbroker.keytab"
-   principal="broker/localhost@EXAMPLE.COM";
-};
-
  PulsarProxy {
    com.sun.security.auth.module.Krb5LoginModule required
    useKeyTab=true
@@ -262,133 +181,134 @@ Here is an example named `pulsar_jaas.conf`:
    keyTab="/etc/security/keytabs/pulsarproxy.keytab"
    principal="proxy/localhost@EXAMPLE.COM";
 };
-
- PulsarClient {
-   com.sun.security.auth.module.Krb5LoginModule required
-   useKeyTab=true
-   storeKey=true
-   useTicketCache=false
-   keyTab="/etc/security/keytabs/pulsarclient.keytab"
-   principal="client/localhost@EXAMPLE.COM";
-};
 ```
 
-### Configure proxy clients
+## Configure Kerberos authentication in Java clients
 
-Pulsar client configuration is similar to client and broker configuration, except that you need to set `serverType` to `proxy` instead of `broker`, for the reason that you need to do the Kerberos authentication between client and proxy.
+:::note
 
- ```java
- System.setProperty("java.security.auth.login.config", "/etc/pulsar/pulsar_jaas.conf");
- System.setProperty("java.security.krb5.conf", "/etc/pulsar/krb5.conf");
+Ensure that the operating system user who starts Pulsar clients can access the keytabs configured in the `pulsar_jaas.conf` file and the KDC server configured in the `krb5.conf` file.
 
- Map authParams = Maps.newHashMap();
- authParams.put("saslJaasClientSectionName", "PulsarClient");
- authParams.put("serverType", "proxy");        // ** here is the different **
+:::
 
- Authentication saslAuth = AuthenticationFactory
-         .create(org.apache.pulsar.client.impl.auth.AuthenticationSasl.class.getName(), authParams);
- 
- PulsarClient client = PulsarClient.builder()
-         .serviceUrl("pulsar://my-broker.com:6650")
-         .authentication(saslAuth)
-         .build();
- ```
+1. In client applications, include `pulsar-client-auth-sasl` in your project dependency.
 
-> The first two lines in the example above are hard coded, alternatively, you can set additional JVM parameters for JAAS and krb5 configuration file when you run the application like below:
+   ```xml
+       
+         org.apache.pulsar
+         pulsar-client-auth-sasl
+         ${pulsar.version}
+       
+   ```
 
-```shell
-java -cp -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf $APP-jar-with-dependencies.jar $CLASSNAME
-```
+2. Configure the authentication type to use `AuthenticationSasl` and provide the following parameters. 
+   - set `saslJaasClientSectionName` to `PulsarClient`;
+   - set `serverType` to `broker`. `serverType` stands for whether this client connects to brokers or proxies. Clients use this parameter to know which server-side principal should be used. 
 
-### Configure proxy service
+   The following is an example of configuring a Java client:
 
-In the `proxy.conf` file, set Kerberos-related configuration. Here is an example:
+    ```java
+    System.setProperty("java.security.auth.login.config", "/etc/pulsar/pulsar_jaas.conf");
+    System.setProperty("java.security.krb5.conf", "/etc/pulsar/krb5.conf");
 
-```shell
-## related to authenticate client.
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderSasl
-saslJaasClientAllowedIds=.*client.*
-saslJaasServerSectionName=PulsarProxy
+    Map authParams = Maps.newHashMap();
+    authParams.put("saslJaasClientSectionName", "PulsarClient");
+    authParams.put("serverType", "broker");
 
-## related to be authenticated by broker
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationSasl
-brokerClientAuthenticationParameters={"saslJaasClientSectionName":"PulsarProxy", "serverType":"broker"}
-forwardAuthorizationCredentials=true
-```
+    Authentication saslAuth = AuthenticationFactory
+            .create(org.apache.pulsar.client.impl.auth.AuthenticationSasl.class.getName(), authParams);
+ 
+    PulsarClient client = PulsarClient.builder()
+            .serviceUrl("pulsar://my-broker.com:6650")
+            .authentication(saslAuth)
+            .build();
+    ```
 
-The first part relates to authenticating between clients and Pulsar proxies. In this phase, client works as SASL client, while Pulsar Proxy works as SASL server. 
+   :::note
+   
+   - To configure clients for proxies, you need to set `serverType` to `proxy` instead of `broker`.
+   - The first two lines in the above example are hard-coded. Alternatively, you can set additional JVM parameters for `pulsar_jaas.conf` and `krb5.conf` files when you run the application like below:
 
-The second part relates to authenticating between Pulsar proxies and Pulsar brokers. In this phase, Pulsar Proxy works as SASL client, while Pulsar broker works as SASL server.
+   ```shell
+   java -cp -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf $APP-jar-with-dependencies.jar $CLASSNAME
+   ```
 
-### Configure brokers
+   :::
 
-The broker-side configuration file is the same as the above `broker.conf`, you do not need special configurations for Pulsar Proxy.
+## Configure Kerberos authentication in CLI tools
 
-```conf
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderSasl
-saslJaasClientAllowedIds=.*client.*
-saslJaasServerSectionName=PulsarBroker
-```
+[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` file in a Pulsar installation.
 
-## Authorization and role token
+When using command-line tools, you need to perform the following steps:
 
-For Kerberos authentication, we usually use the authenticated principal as the role token for Pulsar authorization. For more information on authorization in Pulsar, see [security authorization](security-authorization.md).
+1. Configure the `conf/client.conf` file.
 
-If you enable 'authorizationEnabled', you need to set `superUserRoles` in `broker.conf` that corresponds to the name registered in kdc.
+   ```shell
+   authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationSasl
+   authParams={"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}
+   ```
 
-For example:
+2. Set JVM parameters for the `pulsar_jaas.conf` file and `krb5.conf` files with additional options.
 
-```bash
-superUserRoles=client/{clientIp}@EXAMPLE.COM
-```
+   ```shell
+   -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf
+   ```
+
+   You can add this at the end of `PULSAR_EXTRA_OPTS` in the file [`pulsar_tools_env.sh`](https://github.com/apache/pulsar/blob/master/conf/pulsar_tools_env.sh), or add this line `OPTS="$OPTS -Djava.security.auth.login.config=/etc/pulsar/pulsar_jaas.conf -Djava.security.krb5.conf=/etc/pulsar/krb5.conf"` directly to the CLI tool script. The meaning of configurations is the same as the meaning of configurations in Java client section.
 
 ## Configure Kerberos authentication between ZooKeeper and broker
 
-Pulsar broker acts as a Kerberos client when you authenticate with Zookeeper. According to [ZooKeeper document](https://cwiki.apache.org/confluence/display/ZOOKEEPER/Client-Server+mutual+authentication), you need these settings in `conf/zookeeper.conf`:
+Pulsar broker acts as a Kerberos client when authenticating with Zookeeper.
 
-```conf
-authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider
-requireClientAuthScheme=sasl
-```
+1. Add the settings in `conf/zookeeper.conf`.
 
-Enter the following commands to add a section of `Client` configurations in the file `pulsar_jaas.conf`, which Pulsar broker uses:
+   ```conf
+   authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider
+   requireClientAuthScheme=sasl
+   ```
 
-```
- Client {
-   com.sun.security.auth.module.Krb5LoginModule required
-   useKeyTab=true
-   storeKey=true
-   useTicketCache=false
-   keyTab="/etc/security/keytabs/pulsarbroker.keytab"
-   principal="broker/localhost@EXAMPLE.COM";
-};
-```
+2. Enter the following commands to add a section of `Client` configurations in `pulsar_jaas.conf` that Pulsar broker uses:
 
-In this setting, the principal of Pulsar broker and keyTab file indicates the role of brokers when you authenticate with ZooKeeper.
+   ```
+    Client {
+      com.sun.security.auth.module.Krb5LoginModule required
+      useKeyTab=true
+      storeKey=true
+      useTicketCache=false
+      keyTab="/etc/security/keytabs/pulsarbroker.keytab"
+      principal="broker/localhost@EXAMPLE.COM";
+   };
+   ```
 
-## Configure Kerberos authentication between BookKeeper and broker
+   In this setting, the principal of Pulsar broker and keytab file indicates the role of brokers when you authenticate with ZooKeeper.
 
-Pulsar broker acts as a Kerberos client when you authenticate with Bookie. According to [BookKeeper document](https://bookkeeper.apache.org/docs/next/security/sasl/), you need to add `bookkeeperClientAuthenticationPlugin` parameter in `broker.conf`:
+For more information, see [ZooKeeper document](https://cwiki.apache.org/confluence/display/ZOOKEEPER/Client-Server+mutual+authentication)
 
-```conf
-bookkeeperClientAuthenticationPlugin=org.apache.bookkeeper.sasl.SASLClientProviderFactory
-```
+## Configure Kerberos authentication for BookKeeper and broker
 
-In this setting, `SASLClientProviderFactory` creates a BookKeeper SASL client in a broker, and the broker uses the created SASL client to authenticate with a Bookie node.
+Pulsar broker acts as a Kerberos client when authenticating with Bookie. 
 
-Enter the following commands to add a section of `BookKeeper` configurations in the `pulsar_jaas.conf` that Pulsar broker uses:
+1. Add the `bookkeeperClientAuthenticationPlugin` parameter in `broker.conf`.
 
-```conf
- BookKeeper {
-   com.sun.security.auth.module.Krb5LoginModule required
-   useKeyTab=true
-   storeKey=true
-   useTicketCache=false
-   keyTab="/etc/security/keytabs/pulsarbroker.keytab"
-   principal="broker/localhost@EXAMPLE.COM";
-};
-```
+   ```conf
+   bookkeeperClientAuthenticationPlugin=org.apache.bookkeeper.sasl.SASLClientProviderFactory
+   ```
+
+   `SASLClientProviderFactory` creates a BookKeeper SASL client in a broker, and the broker uses the created SASL client to authenticate with a Bookie node.
+
+2. Add a section of `BookKeeper` configurations in the `pulsar_jaas.conf` file that broker/proxy uses.
+
+   ```conf
+    BookKeeper {
+      com.sun.security.auth.module.Krb5LoginModule required
+      useKeyTab=true
+      storeKey=true
+      useTicketCache=false
+      keyTab="/etc/security/keytabs/pulsarbroker.keytab"
+      principal="broker/localhost@EXAMPLE.COM";
+   };
+   ```
+
+   In this setting, the principal of Pulsar broker and keytab file indicates the role of brokers when you authenticate with Bookie.
 
-In this setting, the principal of Pulsar broker and keytab file indicates the role of brokers when you authenticate with Bookie.
+For more information, see [BookKeeper document](https://bookkeeper.apache.org/docs/next/security/sasl/).
\ No newline at end of file
diff --git a/site2/docs/security-oauth2.md b/site2/docs/security-oauth2.md
index 88b1506398d57..bd994e2641981 100644
--- a/site2/docs/security-oauth2.md
+++ b/site2/docs/security-oauth2.md
@@ -1,74 +1,41 @@
 ---
 id: security-oauth2
-title: Client authentication using OAuth 2.0 access tokens
+title: Authentication using OAuth 2.0 access tokens
 sidebar_label: "Authentication using OAuth 2.0 access tokens"
 ---
 
-Pulsar supports authenticating clients using OAuth 2.0 access tokens. You can use OAuth 2.0 access tokens to identify a Pulsar client and associate the Pulsar client with some "principal" (or "role"), which is permitted to do some actions, such as publishing messages to a topic or consuming messages from a topic.
-
-This module is used to support the [Pulsar client authentication plugin](security-extending.md/#client-authentication-plugin) for OAuth 2.0. After communicating with the OAuth 2.0 server, the Pulsar client gets an `access token` from the OAuth 2.0 server, and passes this `access token` to the Pulsar broker to do the authentication. The broker can use the `org.apache.pulsar.broker.authentication.AuthenticationProviderToken`. Or, you can add your own `AuthenticationProvider` to make it with this module.
-
-## Authentication provider configuration
-
-This library allows you to authenticate the Pulsar client by using an access token that is obtained from an OAuth 2.0 authorization service, which acts as a _token issuer_.
-
-### Authentication types
-
-The authentication type determines how to obtain an access token through an OAuth 2.0 authorization flow.
-
-:::note
-
-Currently, the Pulsar Java client only supports the `client_credentials` authentication type.
-
-:::
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
 
-#### Client credentials
+Pulsar supports authenticating clients using OAuth 2.0 access tokens. Using an access token obtained from an OAuth 2.0 authorization service (acts as a token issuer), you can identify a Pulsar client and associate it with a "principal" (or "role") that is permitted to do some actions, such as publishing messages to a topic or consuming messages from a topic.
 
-The following table lists parameters supported for the `client credentials` authentication type.
+After communicating with the OAuth 2.0 server, the Pulsar client gets an access token from the server and passes this access token to brokers for authentication. By default, brokers can use the `org.apache.pulsar.broker.authentication.AuthenticationProviderToken`. Alternatively, you can customize the value of `AuthenticationProvider`.
 
-| Parameter | Description | Example | Required or not |
-| --- | --- | --- | --- |
-| `type` | OAuth 2.0 authentication type. |  `client_credentials` (default) | Optional |
-| `issuerUrl` | URL of the authentication provider which allows the Pulsar client to obtain an access token | `https://accounts.google.com` | Required |
-| `privateKey` | URL to a JSON credentials file  | Support the following pattern formats: 
     
  •  `file:///path/to/file` 
  • `file:/path/to/file` 
  •  `data:application/json;base64,` 
    • | Required |
-| `audience`  | An OAuth 2.0 "resource server" identifier for the Pulsar cluster | `https://broker.example.com` | Optional |
-| `scope` |  Scope of an access request. 
    For more information, see [access token scope](https://datatracker.ietf.org/doc/html/rfc6749#section-3.3). | api://pulsar-cluster-1/.default | Optional |
+## Enable OAuth2 authentication on brokers/proxies
 
-The credentials file contains service account credentials used with the client authentication type. The following shows an example of a credentials file `credentials_file.json`.
+To configure brokers/proxies to authenticate clients using OAuth2, add the following parameters to the `conf/broker.conf` and the `conf/proxy.conf` file. If you use a standalone Pulsar, you need to add these parameters to the `conf/standalone.conf` file:
 
-```json
-{
-  "type": "client_credentials",
-  "client_id": "d9ZyX97q1ef8Cr81WHVC4hFQ64vSlDK3",
-  "client_secret": "on1uJ...k6F6R",
-  "client_email": "1234567890-abcdefghijklmnopqrstuvwxyz@developer.gserviceaccount.com",
-  "issuer_url": "https://accounts.google.com"
-}
-```
-
-In the above example, the authentication type is set to `client_credentials` by default. And the fields "client_id" and "client_secret" are required.
+```properties
+# Configuration to enable authentication
+authenticationEnabled=true
+authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderToken
 
-### Typical original OAuth2 request mapping
+# Authentication settings of the broker itself. Used when the broker connects to other brokers, or when the proxy connects to brokers, either in same or other clusters
+brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.oauth2.AuthenticationOAuth2
+brokerClientAuthenticationParameters={"privateKey":"file:///path/to/privateKey","audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/","issuerUrl":"https://dev-kt-aa9ne.us.auth0.com"}
+# brokerClientAuthenticationParameters={"privateKey":"data:application/json;base64,privateKey-body-to-base64","audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/","issuerUrl":"https://dev-kt-aa9ne.us.auth0.com"}
 
-The following shows a typical original OAuth2 request, which is used to obtain the access token from the OAuth2 server.
+# If using secret key (Note: key files must be DER-encoded)
+tokenSecretKey=file:///path/to/secret.key
+# The key can also be passed inline:
+# tokenSecretKey=data:;base64,FLFyW0oLJ2Fi22KKCm21J18mbAdztfSHN/lAT5ucEKU=
 
-```bash
-curl --request POST \
-  --url https://dev-kt-aa9ne.us.auth0.com/oauth/token \
-  --header 'content-type: application/json' \
-  --data '{
-  "client_id":"Xd23RHsUnvUlP7wchjNYOaIfazgeHd9x",
-  "client_secret":"rT7ps7WY8uhdVuBTKWZkttwLdQotmdEliaM5rLfmgNibvqziZ-g07ZH52N_poGAb",
-  "audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/",
-  "grant_type":"client_credentials"}'
+# If using public/private (Note: key files must be DER-encoded)
+# tokenPublicKey=file:///path/to/public.key
 ```
 
-In the above example, the mapping relationship is shown as below.
-
-- The `issuerUrl` parameter in this plugin is mapped to `--url https://dev-kt-aa9ne.us.auth0.com`.
-- The `privateKey` file parameter in this plugin should at least contains the `client_id` and `client_secret` fields.
-- The `audience` parameter in this plugin is mapped to  `"audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/"`. This field is only used by some identity providers.
-
 ## Configure OAuth2 authentication in Pulsar clients
 
 You can use the OAuth2 authentication provider with the following Pulsar clients.
@@ -204,28 +171,15 @@ client, err := pulsar.NewClient(pulsar.ClientOptions{
 
 ````
 
-## Broker configuration
-To enable OAuth2 authentication in brokers, add the following parameters to the `broker.conf` or `standalone.conf` file.
-
-```properties
-# Configuration to enable authentication
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderToken
-tokenPublicKey=/path/to/publicKey
-# Authentication settings of the broker itself. Used when the broker connects to other brokers,
-# either in same or other clusters
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.oauth2.AuthenticationOAuth2
-brokerClientAuthenticationParameters={"privateKey":"/path/to/privateKey",\
-  "audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/","issuerUrl":"https://dev-kt-aa9ne.us.auth0.com"}
-```
-
 ## Configure OAuth2 authentication in CLI tools
 
 This section describes how to use Pulsar CLI tools to connect a cluster through OAuth2 authentication plugin.
 
-### pulsar-admin
-
-This example shows how to use pulsar-admin to connect to a cluster through OAuth2 authentication plugin.
+````mdx-code-block
+
+
 
 ```shell
 bin/pulsar-admin --admin-url https://streamnative.cloud:443 \
@@ -236,12 +190,8 @@ bin/pulsar-admin --admin-url https://streamnative.cloud:443 \
 tenants list
 ```
 
-Set the `admin-url` parameter to the Web service URL. A Web service URL is a combination of the protocol, hostname and port ID, such as `pulsar://localhost:6650`.
-Set the `privateKey`, `issuerUrl`, and `audience` parameters to the values based on the configuration in the key file. For details, see [authentication types](#authentication-types).
-
-### pulsar-client
-
-This example shows how to use pulsar-client to connect to a cluster through OAuth2 authentication plugin.
+
+
 
 ```shell
 bin/pulsar-client \
@@ -253,12 +203,8 @@ bin/pulsar-client \
 produce test-topic -m "test-message" -n 10
 ```
 
-Set the `admin-url` parameter to the Web service URL. A Web service URL is a combination of the protocol, hostname and port ID, such as `pulsar://localhost:6650`.
-Set the `privateKey`, `issuerUrl`, and `audience` parameters to the values based on the configuration in the key file. For details, see [authentication types](#authentication-types).
-
-### pulsar-perf
-
-This example shows how to use pulsar-perf to connect to a cluster through OAuth2 authentication plugin.
+
+
 
 ```shell
 bin/pulsar-perf produce --service-url pulsar+ssl://streamnative.cloud:6651 \
@@ -269,5 +215,53 @@ bin/pulsar-perf produce --service-url pulsar+ssl://streamnative.cloud:6651 \
 -r 1000 -s 1024 test-topic
 ```
 
-Set the `admin-url` parameter to the Web service URL. A Web service URL is a combination of the protocol, hostname and port ID, such as `pulsar://localhost:6650`.
-Set the `privateKey`, `issuerUrl`, and `audience` parameters to the values based on the configuration in the key file. For details, see [authentication types](#authentication-types).
+
+
+````
+
+* Set the `admin-url` parameter to the Web service URL. A Web service URL is a combination of the protocol, hostname and port ID, such as `pulsar://localhost:6650`.
+* Set the `privateKey`, `issuerUrl`, and `audience` parameters to the values based on the configuration in the key file. For details, see [authentication types](#authentication-types).
+
+#### Authentication types
+
+Currently, Pulsar clients only support the `client_credentials` authentication type. The authentication type determines how to obtain an access token through an OAuth 2.0 authorization service.
+
+The following table outlines the parameters of the `client_credentials` authentication type.
+
+| Parameter | Description | Example | Required or not |
+| --- | --- | --- | --- |
+| `type` | OAuth 2.0 authentication type. |  `client_credentials` (default) | Optional |
+| `issuerUrl` | The URL of the authentication provider which allows the Pulsar client to obtain an access token. | `https://accounts.google.com` | Required |
+| `privateKey` | The URL to the JSON credentials file.  | Support the following pattern formats: 
     
  •  `file:///path/to/file` 
  • `file:/path/to/file` 
  •  `data:application/json;base64,` 
    • | Required |
+| `audience`  | The OAuth 2.0 "resource server" identifier for a Pulsar cluster. | `https://broker.example.com` | Optional |
+| `scope` |  The scope of an access request. 
    For more information, see [access token scope](https://datatracker.ietf.org/doc/html/rfc6749#section-3.3). | api://pulsar-cluster-1/.default | Optional |
+
+The credentials file `credentials_file.json` contains the service account credentials used with the client authentication type. The following is an example of the credentials file. The authentication type is set to `client_credentials` by default. And the fields "client_id" and "client_secret" are required.
+
+```json
+{
+  "type": "client_credentials",
+  "client_id": "d9ZyX97q1ef8Cr81WHVC4hFQ64vSlDK3",
+  "client_secret": "on1uJ...k6F6R",
+  "client_email": "1234567890-abcdefghijklmnopqrstuvwxyz@developer.gserviceaccount.com",
+  "issuer_url": "https://accounts.google.com"
+}
+```
+
+The following is an example of a typical original OAuth2 request, which is used to obtain an access token from the OAuth2 server.
+
+```bash
+curl --request POST \
+  --url https://dev-kt-aa9ne.us.auth0.com/oauth/token \
+  --header 'content-type: application/json' \
+  --data '{
+  "client_id":"Xd23RHsUnvUlP7wchjNYOaIfazgeHd9x",
+  "client_secret":"rT7ps7WY8uhdVuBTKWZkttwLdQotmdEliaM5rLfmgNibvqziZ-g07ZH52N_poGAb",
+  "audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/",
+  "grant_type":"client_credentials"}'
+```
+
+In the above example, the mapping relationship is shown below.
+- The `issuerUrl` parameter is mapped to `--url https://dev-kt-aa9ne.us.auth0.com`.
+- The `privateKey` parameter should contain the `client_id` and `client_secret` fields at least.
+- The `audience` parameter is mapped to  `"audience":"https://dev-kt-aa9ne.us.auth0.com/api/v2/"`. This field is only used by some identity providers.
diff --git a/site2/docs/security-overview.md b/site2/docs/security-overview.md
index 3008e065f98cf..a5b88c21a389d 100644
--- a/site2/docs/security-overview.md
+++ b/site2/docs/security-overview.md
@@ -13,7 +13,7 @@ Pulsar security is based on the following core pillars.
 
 By default, Pulsar configures no encryption, authentication, or authorization. Any clients can communicate to Pulsar via plain text service URLs. So you must ensure that Pulsar accessing via these plain text service URLs is restricted to trusted clients only. In such cases, you can use network segmentation and/or authorization ACLs to restrict access to trusted IPs. If you use neither, the state of the cluster is wide open and anyone can access the cluster.
 
-Apache Pulsar uses an [Authentication Provider](#authentication) or an [Authentication Provider Chain](security-extending.md/#proxybroker-authentication-plugin) to establish the identity of a client and then assign a *role token* (a string like `admin` or `app1`) to that client. This role token can represent a single client or multiple clients and is then used for [Authorization](security-authorization.md) to determine what the client is authorized to do. You can use roles to control permission for clients to produce or consume from certain topics, administer the configuration for tenants, and so on.
+Apache Pulsar uses an [Authentication Provider](#authentication) or an [Authentication Provider Chain](security-extending.md#proxybroker-authentication-plugin) to establish the identity of a client and then assign a *role token* (a string like `admin` or `app1`) to that client. This role token can represent a single client or multiple clients and is then used for [Authorization](security-authorization.md) to determine what the client is authorized to do. You can use roles to control permission for clients to produce or consume from certain topics, administer the configuration for tenants, and so on.
 
 ## Encryption
 
@@ -21,32 +21,49 @@ Encryption ensures that if an attacker gets access to your data, the attacker ca
 
 **What's next?**
 
-* To configure end-to-end encryption, see [End-to-end encryption](security-encryption.md) for more details.
-* To configure transport layer encryption, see [TLS encryption](security-tls-transport.md) for more details.
+- To configure end-to-end encryption, see [End-to-end encryption](security-encryption.md) for more details.
+- To configure transport layer encryption, see [TLS encryption](security-tls-transport.md) for more details.
 
 ## Authentication
 
-Authentication is the process of verifying the identity of clients. In Pulsar, the authentication provider is responsible for properly identifying clients and associating the clients with role tokens. If you only enable authentication, an authenticated role token can access all resources in the cluster. 
+Authentication is the process of verifying the identity of clients. In Pulsar, the authentication provider is responsible for properly identifying clients and associating them with role tokens. Note that if you only enable authentication, an authenticated role token can access all resources in the cluster. 
 
-Pulsar supports a pluggable authentication mechanism, and Pulsar clients use this mechanism to authenticate with brokers and proxies. 
+### How it works in Pulsar
 
-Pulsar broker validates the authentication credentials when a connection is established. After the initial connection is authenticated, the "principal" token is stored for authorization though the connection is not re-authenticated. The broker periodically checks the expiration status of every `ServerCnx` object. By default, the `authenticationRefreshCheckSeconds` is set to 60s. When the authentication is expired, the broker re-authenticates the connection. If the re-authentication fails, the broker disconnects the client.
+Pulsar provides a pluggable authentication framework, and Pulsar brokers/proxies use this mechanism to authenticate clients.
 
-Pulsar broker supports learning whether a particular client supports authentication refreshing. If a client supports authentication refreshing and the credential is expired, the authentication provider calls the `refreshAuthentication` method to initiate the refreshing process. If a client does not support authentication refreshing and the credential is expired, the broker disconnects the client.
+The way how each client passes its authentication data to brokers varies depending on the protocols it uses. Brokers validate the authentication credentials when a connection is established and check whether the authentication data is expired.
+- When using HTTP/HTTPS protocol for cluster management, each client passes the authentication data based on the HTTP/HTTPS request header, and brokers check the data upon request.
+- When using [Pulsar protocol](developing-binary-protocol.md) for productions/consumptions, each client passes the authentication data by sending the `CommandConnect` command when connecting to brokers. Brokers cache the data and periodically check whether the data has expired and learn whether the client supports authentication refreshing. By default, the `authenticationRefreshCheckSeconds` is set to 60s.
+  - If a client supports authentication refreshing and the credential is expired, brokers send the `CommandAuthChallenge` command to exchange the authentication data with the client. If the next check finds that the previous authentication exchange has not been returned, brokers disconnect the client.
+  - If a client does not support authentication refreshing and the credential is expired, brokers disconnect the client.
+
+### Authentication data limitations on the proxies
+
+When you use proxies between clients and brokers, there are two authentication data:
+* authentication data from proxies that brokers default to authenticate - known as **self-authentication**.
+* authentication data from clients that proxies forward to brokers for authenticating - known as **original authentication**.
+
+**Important:** If your authentication data contains an expiration time, or your authorization provider depends on the authentication data, you must:
+
+1. Ensure your authentication data of proxies has no expiration time since brokers don't support refreshing this authentication data.
+2. Set `forwardAuthorizationCredentials` to `true` in the `conf/proxy.conf` file.
+3. Set `authenticateOriginalAuthData` to `true` in the `conf/broker.conf` file, which ensures that brokers recheck the client authentication.
 
 **What's next?**
 
-Pulsar supports the following authentication providers, and you can configure multiple authentication providers.
-- [TLS authentication](security-tls-authentication.md)
-- [Athenz authentication](security-athenz.md)
-- [Kerberos authentication](security-kerberos.md)
-- [JSON Web Token (JWT) authentication](security-jwt.md)
-- [OAuth 2.0 authentication](security-oauth2.md)
-- [HTTP basic authentication](security-basic-auth.md)
+- To configure built-in authentication plugins, read:
+  - [TLS authentication](security-tls-authentication.md)
+  - [Athenz authentication](security-athenz.md)
+  - [Kerberos authentication](security-kerberos.md)
+  - [JSON Web Token (JWT) authentication](security-jwt.md)
+  - [OAuth 2.0 authentication](security-oauth2.md)
+  - [HTTP basic authentication](security-basic-auth.md)
+- To customize an authentication plugin, read [extended authentication](security-extending).
 
 :::note
 
-Starting from 2.11.0, [TLS authentication](security-tls-authentication.md) includes [TLS encryption](security-tls-transport.md) by default. If you configure TLS authentication first, then TLS encryption automatically applies; if you configure TLS encryption first, you can select any one of the above authentication providers.
+Starting from 2.11.0, you can configure [Mutual TLS](security-tls-transport.md) with any one of the above authentication providers.
 
 :::
 
diff --git a/site2/docs/security-tls-authentication.md b/site2/docs/security-tls-authentication.md
index ad8aa2f50c999..f37d5db1fb300 100644
--- a/site2/docs/security-tls-authentication.md
+++ b/site2/docs/security-tls-authentication.md
@@ -13,101 +13,38 @@ import TabItem from '@theme/TabItem';
 
 TLS authentication is an extension of [TLS transport encryption](security-tls-transport.md). Not only servers have keys and certs that the client uses to verify the identity of servers, clients also have keys and certs that the server uses to verify the identity of clients. You must have TLS transport encryption configured on your cluster before you can use TLS authentication. This guide assumes you already have TLS transport encryption configured.
 
-## Create client certificates
+## Enable TLS authentication on brokers/proxies
 
-Client certificates are generated using the certificate authority. Server certificates are also generated with the same certificate authority.
-
-The biggest difference between client certs and server certs is that the **common name** for the client certificate is the **role token** that the client is authenticated as.
-
-To use client certificates, you need to set `tlsRequireTrustedClientCertOnConnect=true` at the broker side. For details, refer to [TLS broker configuration](security-tls-transport.md#configure-brokers).
-
-First, you need to enter the following command to generate the key :
-
-```bash
-openssl genrsa -out admin.key.pem 2048
-```
-
-Similar to the broker, the client expects the key to be in [PKCS 8](https://en.wikipedia.org/wiki/PKCS_8) format, so you need to convert it by entering the following command:
-
-```bash
-openssl pkcs8 -topk8 -inform PEM -outform PEM \
-    -in admin.key.pem -out admin.key-pk8.pem -nocrypt
-```
-
-Next, enter the command below to generate the certificate request. When you are asked for a **common name**, enter the **role token** that you want this key pair to authenticate a client as.
-
-```bash
-openssl req -config openssl.cnf \
-    -key admin.key.pem -new -sha256 -out admin.csr.pem
-```
-
-:::note
-
-If `openssl.cnf` is not specified, read [Certificate authority](security-tls-transport.md#create-a-certificate-authority) to get `openssl.cnf`.
-
-:::
-
-Then, enter the command below to sign with a request with the certificate authority. Note that the client certs use the **usr_cert** extension, which allows the cert to be used for client authentication.
-
-```bash
-openssl ca -config openssl.cnf -extensions usr_cert \
-    -days 1000 -notext -md sha256 \
-    -in admin.csr.pem -out admin.cert.pem
-```
-
-You can get a cert, `admin.cert.pem`, and a key, `admin.key-pk8.pem` from this command. With `ca.cert.pem`, clients can use this cert and this key to authenticate themselves to brokers and proxies as the role token ``admin``.
-
-:::note
-
-If the "unable to load CA private key" error occurs and the reason for this error is "No such file or directory: /etc/pki/CA/private/cakey.pem" in this step. Try the command below to generate `cakey.pem`.
-
-```bash
-cd /etc/pki/tls/misc/CA
-./CA -newca
-```
-
-:::
-
-## Enable TLS authentication on brokers
-
-To configure brokers to authenticate clients, add the following parameters to `broker.conf`, alongside [the configuration to enable TLS transport](security-tls-transport.md#configure-brokers):
+To configure brokers/proxies to authenticate clients using Mutual TLS, add the following parameters to the `conf/broker.conf` and the `conf/proxy.conf` file. If you use a standalone Pulsar, you need to add these parameters to the `conf/standalone.conf` file:
 
 ```properties
 # Configuration to enable authentication
 authenticationEnabled=true
 authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-tlsRequireTrustedClientCertOnConnect=true
 
 brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-brokerClientAuthenticationParameters={"tlsCertFile":"/path/my-ca/admin.cert.pem","tlsKeyFile":"/path/my-ca/admin.key-pk8.pem"}
-brokerClientTrustCertsFilePath=/path/my-ca/certs/ca.cert.pem
-```
-
-## Enable TLS authentication on proxies
-
-To configure proxies to authenticate clients, add the following parameters to `proxy.conf`, alongside [the configuration to enable TLS transport](security-tls-transport.md#configure-proxies):
+brokerClientAuthenticationParameters={"tlsCertFile":"/path/to/admin.cert.pem","tlsKeyFile":"/path/to/admin.key-pk8.pem"}
+brokerClientTrustCertsFilePath=/path/to/ca.cert.pem
 
-The proxy should have its own client key pair for connecting to brokers. You need to configure the role token for this key pair in the `proxyRoles` of the brokers. See the [authorization guide](security-authorization.md) for more details.
+tlsCertificateFilePath=/path/to/broker.cert.pem
+tlsKeyFilePath=/path/to/broker.key-pk8.pem
+tlsTrustCertsFilePath=/path/to/ca.cert.pem
 
-```properties
-# For clients connecting to the proxy
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
 tlsRequireTrustedClientCertOnConnect=true
+tlsAllowInsecureConnection=false
 
-# For the proxy to connect to brokers
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-brokerClientAuthenticationParameters=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+# Tls cert refresh duration in seconds (set 0 to check on every new connection)
+tlsCertRefreshCheckDurationSec=300
 ```
 
 ## Configure TLS authentication in Pulsar clients
 
-When you use TLS authentication, client connects via TLS transport. You need to configure the client to use `https://` and 8443 port for the web service URL, `pulsar+ssl://` and 6651 port for the broker service URL.
+When using TLS authentication, clients connect via TLS transport. You need to configure clients to use `https://` and the `8443` port for the web service URL, use `pulsar+ssl://` and the `6651` port for the broker service URL.
 
 ````mdx-code-block
 
+  values={[{"label":"Java","value":"Java"},{"label":"Python","value":"Python"},{"label":"C++","value":"C++"},{"label":"Node.js","value":"Node.js"},{"label":"Go","value":"Go"},{"label":"C#","value":"C#"}]}>
 
 
 ```java
@@ -172,6 +109,17 @@ const Pulsar = require('pulsar-client');
 })();
 ```
 
+
+
+
+```go
+client, err := pulsar.NewClient(ClientOptions{
+		URL:                   "pulsar+ssl://broker.example.com:6651/",
+		TLSTrustCertsFilePath: "/path/to/ca.cert.pem",
+		Authentication:        pulsar.NewAuthenticationTLS("/path/to/my-role.cert.pem", "/path/to/my-role.key-pk8.pem"),
+	})
+```
+
 
 
 
@@ -188,7 +136,7 @@ var client = PulsarClient.Builder()
 
 ## Configure TLS authentication in CLI tools
 
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
+[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](/tools/pulsar-admin/), [`pulsar-perf`](reference-cli-tools.md), and [`pulsar-client`](reference-cli-tools.md) use the `conf/client.conf` config file in a Pulsar installation.
 
 To use TLS authentication with the CLI tools of Pulsar, you need to add the following parameters to the `conf/client.conf` file, alongside [the configuration to enable TLS encryption](security-tls-transport.md#configure-tls-encryption-in-cli-tools):
 
@@ -212,7 +160,6 @@ authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationPr
 
 # Enable KeyStore type
 tlsEnabledWithKeyStore=true
-tlsRequireTrustedClientCertOnConnect=true
 
 # key store
 tlsKeyStoreType=JKS
@@ -233,6 +180,9 @@ brokerClientTlsTrustStorePassword=clientpw
 # internal auth config
 brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationKeyStoreTls
 brokerClientAuthenticationParameters={"keyStoreType":"JKS","keyStorePath":"/var/private/tls/client.keystore.jks","keyStorePassword":"clientpw"}
+
+tlsRequireTrustedClientCertOnConnect=true
+tlsAllowInsecureConnection=false
 ```
 
 ### Configure clients
diff --git a/site2/docs/security-tls-transport.md b/site2/docs/security-tls-transport.md
index 57e0dcaa96d25..87749959f3ee8 100644
--- a/site2/docs/security-tls-transport.md
+++ b/site2/docs/security-tls-transport.md
@@ -377,7 +377,7 @@ asyncio.run(test())
 
 ### Configure CLI tools
 
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-cli-tools.md#pulsar-admin), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
+[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-cli-tools.md), [`pulsar-perf`](reference-cli-tools.md), and [`pulsar-client`](reference-cli-tools.md) use the `conf/client.conf` config file in a Pulsar installation.
 
 To use TLS encryption with Pulsar CLI tools, you need to add the following parameters to the `conf/client.conf` file.
 
diff --git a/site2/docs/standalone.md b/site2/docs/standalone.md
index d1658b84cc27e..0ddc3cd1617ae 100644
--- a/site2/docs/standalone.md
+++ b/site2/docs/standalone.md
@@ -5,7 +5,8 @@ sidebar_label: "Run Pulsar locally"
 ---
 
 ````mdx-code-block
-import {Redirect} from '@docusaurus/router';
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from "@docusaurus/router";
 
-
+
 ````
diff --git a/site2/docs/tiered-storage-aliyun.md b/site2/docs/tiered-storage-aliyun.md
index c14ef0e93b912..8a18c28a5b967 100644
--- a/site2/docs/tiered-storage-aliyun.md
+++ b/site2/docs/tiered-storage-aliyun.md
@@ -16,7 +16,7 @@ Follow the steps below to install the Aliyun OSS offloader.
 
 ### Steps
 
-1. [Download the Pulsar tarball](getting-started-standalone.md#step-1-download-pulsar-distribution).
+1. [Download the Pulsar tarball](getting-started-standalone.md#download-pulsar-distribution).
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar offloaders as `offloaders` in the Pulsar directory. See [Install tiered storage offloaders](tiered-storage-overview.md#how-to-install-tiered-storage-offloaders).
 
 ## Configuration
diff --git a/site2/docs/tiered-storage-aws.md b/site2/docs/tiered-storage-aws.md
index f13248bf8acf1..919e66f00827f 100644
--- a/site2/docs/tiered-storage-aws.md
+++ b/site2/docs/tiered-storage-aws.md
@@ -16,7 +16,7 @@ Follow the steps below to install the AWS S3 offloader.
 
 ### Steps
 
-1. [Download the Pulsar tarball](getting-started-standalone.md#step-1-download-pulsar-distribution).
+1. [Download the Pulsar tarball](getting-started-standalone.md#download-pulsar-distribution).
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar offloaders as `offloaders` in the Pulsar directory. See [Install tiered storage offloaders](tiered-storage-overview.md#how-to-install-tiered-storage-offloaders).
 
 ## Configuration
diff --git a/site2/docs/tiered-storage-azure.md b/site2/docs/tiered-storage-azure.md
index 8c68a24a3146c..9d57abcb12fca 100644
--- a/site2/docs/tiered-storage-azure.md
+++ b/site2/docs/tiered-storage-azure.md
@@ -16,7 +16,7 @@ Follow the steps below to install the Azure BlobStore offloader.
 
 ### Steps
 
-1. [Download the Pulsar tarball](getting-started-standalone.md#step-1-download-pulsar-distribution).
+1. [Download the Pulsar tarball](getting-started-standalone.md#download-pulsar-distribution).
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar offloaders as `offloaders` in the Pulsar directory. See [Install tiered storage offloaders](tiered-storage-overview.md#how-to-install-tiered-storage-offloaders).
 
 ## Configuration
diff --git a/site2/docs/tiered-storage-filesystem.md b/site2/docs/tiered-storage-filesystem.md
index 56fadd90368c8..1a332e7a0b8c9 100644
--- a/site2/docs/tiered-storage-filesystem.md
+++ b/site2/docs/tiered-storage-filesystem.md
@@ -22,7 +22,7 @@ This section describes how to install the filesystem offloader.
 
 ### Steps
 
-1. [Download the Pulsar tarball](getting-started-standalone.md#step-1-download-pulsar-distribution).
+1. [Download the Pulsar tarball](getting-started-standalone.md#download-pulsar-distribution).
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar offloaders as `offloaders` in the Pulsar directory. See [Install tiered storage offloaders](tiered-storage-overview.md#how-to-install-tiered-storage-offloaders).
 
 ## Configuration
@@ -301,7 +301,7 @@ Execute the following commands in the repository where you download Pulsar tarba
    bin/pulsar standalone -a 127.0.0.1
    ```
 
-2. To ensure the data generated is not deleted immediately, it is recommended to set the [retention policy](cookbooks-retention-expiry.md/#retention-policies), which can be either a **size** limit or a **time** limit. The larger value you set for the retention policy, the longer the data can be retained.
+2. To ensure the data generated is not deleted immediately, it is recommended to set the [retention policy](cookbooks-retention-expiry.md#retention-policies), which can be either a **size** limit or a **time** limit. The larger value you set for the retention policy, the longer the data can be retained.
 
    ```shell
    bin/pulsar-admin namespaces set-retention public/default --size 100M --time 2d
diff --git a/site2/docs/tiered-storage-gcs.md b/site2/docs/tiered-storage-gcs.md
index bcc59a1f7e9e0..9783b9bc23977 100644
--- a/site2/docs/tiered-storage-gcs.md
+++ b/site2/docs/tiered-storage-gcs.md
@@ -16,7 +16,7 @@ Follow the steps below to install the GCS offloader.
 
 ### Steps
 
-1. [Download the Pulsar tarball](getting-started-standalone.md#step-1-download-pulsar-distribution).
+1. [Download the Pulsar tarball](getting-started-standalone.md#download-pulsar-distribution).
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar offloaders as `offloaders` in the Pulsar directory. See [Install tiered storage offloaders](tiered-storage-overview.md#how-to-install-tiered-storage-offloaders).
 
 ## Configuration
diff --git a/site2/docs/tiered-storage-overview.md b/site2/docs/tiered-storage-overview.md
index a317f09313043..d0afd3689d389 100644
--- a/site2/docs/tiered-storage-overview.md
+++ b/site2/docs/tiered-storage-overview.md
@@ -6,7 +6,7 @@ sidebar_label: "Overview"
 
 Pulsar's **Tiered Storage** feature allows older backlog data to be moved from BookKeeper to long-term and cheaper storage, while still allowing clients to access the backlog as if nothing has changed.
 
-* Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support [Amazon S3](https://aws.amazon.com/s3/), [GCS (Google Cloud Storage)](https://cloud.google.com/storage/), [Azure](https://azure.microsoft.com/en-us/services/storage/blobs/) and [Aliyun OSS](https://www.aliyun.com/product/oss) for long term storage.
+* Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support [Amazon S3](https://aws.amazon.com/s3/), [GCS (Google Cloud Storage)](https://cloud.google.com/storage/), [Azure](https://azure.microsoft.com/en-us/services/storage/blobs/) and [Aliyun OSS](https://www.aliyun.com/product/oss) for long-term storage.
   * Read how to [Use AWS S3 offloader with Pulsar](tiered-storage-aws.md);
   * Read how to [Use GCS offloader with Pulsar](tiered-storage-gcs.md);
   * Read how to [Use Azure BlobStore offloader with Pulsar](tiered-storage-azure.md);
@@ -15,6 +15,13 @@ Pulsar's **Tiered Storage** feature allows older backlog data to be moved from B
 * Tiered storage uses [Apache Hadoop](http://hadoop.apache.org/) to support filesystems for long-term storage.
   * Read how to [Use filesystem offloader with Pulsar](tiered-storage-filesystem.md).
 
+:::tip
+
+The [AWS S3 offloader](tiered-storage-aws.md) registers specific AWS metadata, such as regions and service URLs and requests bucket location before performing any operations. If you cannot access the Amazon service, you can use the [S3 offloader](tiered-storage-s3.md) instead since it is an S3 compatible API without the metadata.
+
+:::
+
+
 ## When to use tiered storage?
 
 Tiered storage should be used when you have a topic for which you want to keep a very long backlog for a long time.
@@ -57,12 +64,10 @@ A topic in Pulsar is backed by a **log**, known as a **managed ledger**. This lo
 
 The tiered storage offloading mechanism takes advantage of the segment-oriented architecture. When offloading is requested, the segments of the log are copied one by one to tiered storage. All segments of the log (apart from the current segment) written to tiered storage can be offloaded.
 
-Data written to BookKeeper is replicated to 3 physical machines by default. However, once a segment is sealed in BookKeeper, it becomes immutable and can be copied to long-term storage. Long-term storage can achieve cost savings by using mechanisms such as [Reed-Solomon error correction](https://en.wikipedia.org/wiki/Reed%E2%80%93Solomon_error_correction) to require fewer physical copies of data.
+Data written to BookKeeper is replicated to 3 physical machines by default. However, once a segment is sealed in BookKeeper, it becomes immutable and can be copied to long-term storage. Long-term storage has the potential to achieve significant cost savings.
 
 Before offloading ledgers to long-term storage, you need to configure buckets, credentials, and other properties for the cloud storage service. Additionally, Pulsar uses multi-part objects to upload the segment data and brokers may crash while uploading the data. It is recommended that you add a life cycle rule for your bucket to expire incomplete multi-part upload after a day or two days to avoid getting charged for incomplete uploads. Moreover, you can trigger the offloading operation manually (via REST API or CLI) or automatically (via CLI).
 
 After offloading ledgers to long-term storage, you can still query data in the offloaded ledgers with Pulsar SQL.
 
-For more information about tiered storage for Pulsar topics, see [here](https://github.com/apache/pulsar/wiki/PIP-17:-Tiered-storage-for-Pulsar-topics).
-
-For more information about offload metrics, see [here](reference-metrics.md#offload-metrics).
+For more information about tiered storage for Pulsar topics, see [PIP-17](https://github.com/apache/pulsar/wiki/PIP-17:-Tiered-storage-for-Pulsar-topics) and [offload metrics](reference-metrics.md#offload-metrics).
\ No newline at end of file
diff --git a/site2/docs/tiered-storage-s3.md b/site2/docs/tiered-storage-s3.md
index 5f8c675960e79..43b55367dfe47 100644
--- a/site2/docs/tiered-storage-s3.md
+++ b/site2/docs/tiered-storage-s3.md
@@ -18,7 +18,7 @@ Follow the steps below to install the S3 offloader.
 
 ### Steps
 
-1. [Download the Pulsar tarball](getting-started-standalone.md#step-1-download-pulsar-distribution).
+1. [Download the Pulsar tarball](getting-started-standalone.md#download-pulsar-distribution).
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar offloaders as `offloaders` in the Pulsar directory. See [Install tiered storage offloaders](tiered-storage-overview.md#how-to-install-tiered-storage-offloaders).
 
 ## Configuration
diff --git a/site2/docs/tutorials-namespace.md b/site2/docs/tutorials-namespace.md
new file mode 100644
index 0000000000000..6caa4e784fb4a
--- /dev/null
+++ b/site2/docs/tutorials-namespace.md
@@ -0,0 +1,44 @@
+---
+Id: tutorials-namespace
+title: How to create a namespace
+sidebar_label: “Tutorials”
+---
+
+
+Pulsar namespaces are logical groupings of topics.
+
+Namespaces can be managed via:
+
+- The namespaces command of the pulsar-admin tool
+- The /admin/v2/namespaces endpoint of the admin {@inject: rest:REST:/} API
+- The namespaces method of the PulsarAdmin object in the Java API
+
+In this tutorial, we create a namespace called pulsar in the tenant apache. Then we list namespaces of tenant apache to see if the namespace is created successfully.
+
+Create the namespace.
+
+```bash
+bin/pulsar-admin namespaces create apache/pulsar
+```
+
+Verify the namespace.
+
+```bash
+bin/pulsar-admin namespaces list apache
+```
+
+You should see similar output to show the namespace apache/pulsar has been successfully created.
+
+#### Related Topics
+
+- [Set up a tenant](tutorials-tenant.md)
+- [Create a topic](tutorials-topic.md)
+- [Produce and consume messages](tutorials-produce-consume.md)
+- [Manage clusters](admin-api-clusters.md)
+
+
+
+
+
+
+
diff --git a/site2/docs/tutorials-produce-consume.md b/site2/docs/tutorials-produce-consume.md
new file mode 100644
index 0000000000000..dd333f5c73d56
--- /dev/null
+++ b/site2/docs/tutorials-produce-consume.md
@@ -0,0 +1,77 @@
+---
+Id: tutorials-produce-consume
+title: Produce and consume messages
+sidebar_label: “Tutorials”
+---
+
+In this tutorial, we will:
+- Configure the Pulsar client
+- Create a subscription
+- Create a producer
+- Send test messages
+- Verify the results
+
+## Prerequisites
+
+- [Create tenant](tutorials-tenant.md)
+- [Create namespace](tutorials-namespace.md)
+- [Create topic](tutorials-topic.md)
+
+## Produce and consume messages
+
+1. In the `${PULSAR_HOME}/conf/client.conf` file, replace `webServiceUrl` and `brokerServiceUrl` with your service URL.
+
+2. Create a subscription to consume messages from `apache/pulsar/test-topic`.
+
+   ```bash
+   bin/pulsar-client consume -s sub apache/pulsar/test-topic  -n 0
+   ```
+
+3. In a new terminal, create a producer and send 10 messages to test-topic.
+
+   ```bash
+   bin/pulsar-client produce apache/pulsar/test-topic  -m "---------hello apache pulsar-------" -n 10
+   ```
+
+4. Verify the results.
+
+   ```
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+   ----- got message -----
+   ---------hello apache pulsar-------
+
+   Output from the producer side shows the messages have been produced successfully:
+   18:15:15.489 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 10 messages successfully produced.
+   ```
+
+#### Related Topics
+- [Set up a tenant](tutorials-tenant.md)
+- [Create a topic](tutorials-topic.md)
+- [Create a namespace](tutorials-namespace.md)
+- [Manage clusters](admin-api-clusters.md)
+
+
+
+
+
+
+
+
+
diff --git a/site2/docs/tutorials-tenant.md b/site2/docs/tutorials-tenant.md
new file mode 100644
index 0000000000000..92192797d893c
--- /dev/null
+++ b/site2/docs/tutorials-tenant.md
@@ -0,0 +1,54 @@
+---
+Id: tutorials-tenant
+title: How to set up a tenant
+sidebar_label: “Tutorials”
+---
+
+
+Pulsar is a powerful messaging system you can use to process and route high volumes of data. Each tenant provides a distinct unit of isolation with its own set of roles, permissions, configuration settings, and bookmarks. 
+
+In this tutorial, you will create a new tenant, named “apache” in your Pulsar cluster, hosted in K8s helm. 
+
+To create a tenant:
+
+1. Enter the toolset container.
+
+   ```bash
+   kubectl exec -it -n pulsar pulsar-mini-toolset-0 -- /bin/bash
+   ```
+
+2. In the toolset container, create a tenant named apache.
+
+   ```bash
+   bin/pulsar-admin tenants create apache
+   ```
+
+3. List the tenants to see if the tenant is created successfully.
+
+   ```bash
+   bin/pulsar-admin tenants list
+   ```
+
+   You should see a similar output as below. 
+
+   ```
+   The tenant apache has been successfully created.
+   "apache"
+   "public"
+   "pulsar"
+   ```
+
+#### Related Topics
+
+- [How to create a namespace](tutorials-namespace.md)
+- [How to create a topic](tutorials-topic.md)
+- [Run a standalone cluster in Kubernetes](getting-started-helm.md)
+
+
+
+
+
+
+
+
+
diff --git a/site2/docs/tutorials-topic.md b/site2/docs/tutorials-topic.md
new file mode 100644
index 0000000000000..e0ebc8fbfea9b
--- /dev/null
+++ b/site2/docs/tutorials-topic.md
@@ -0,0 +1,39 @@
+---
+Id: tutorials-topic
+title: How to create a topic
+sidebar_label: “Tutorials”
+---
+
+
+Apache Pulsar is a distributed messaging system that supports high performance and low latency. Topics are the primary way to structure data in Apache Pulsar. A Pulsar topic is a unit of storage that organizes messages into a stream. Each message in a topic has an offset, which uniquely identifies the message within the topic. 
+
+## Prerequisites
+[Publish to partitioned topics](admin-api-topics.md#publish-to-partitioned-topics)
+
+## Create a topic
+
+1. Create `test-topic` with 4 partitions in the namespace `apache/pulsar`.
+
+   ```bash
+   bin/pulsar-admin topics create-partitioned-topic apache/pulsar/test-topic -p 4
+   ```
+
+2. List all the partitioned topics in the namespace `apache/pulsar`.
+
+   ```bash
+   bin/pulsar-admin topics list-partitioned-topics apache/pulsar
+   ```
+
+#### Related Topics
+
+- [How to set up a tenant](tutorials-tenant.md)
+- [How to create a namespace](tutorials-namespace.md)
+- [How to produce and consume messages](tutorial-produce-consume.md)
+
+
+
+
+
+
+
+
diff --git a/site2/website/releases.json b/site2/website/releases.json
index a57a75134fed2..83ebcd0c86cbe 100644
--- a/site2/website/releases.json
+++ b/site2/website/releases.json
@@ -1,4 +1,5 @@
 [
+  "2.10.2",
   "2.10.1",
   "2.10.0",
   "2.9.3",
diff --git a/site2/website/sidebars.json b/site2/website/sidebars.json
index fa21f2fbceac2..630ce31f8a968 100644
--- a/site2/website/sidebars.json
+++ b/site2/website/sidebars.json
@@ -38,10 +38,10 @@
       "type": "category",
       "label": "Pulsar Schema",
       "items": [
-        "schema-get-started",
+        "schema-overview",
         "schema-understand",
-        "schema-evolution-compatibility",
-        "schema-manage"
+        "schema-get-started",
+        "schema-evolution-compatibility"
       ]
     },
     {
@@ -102,7 +102,8 @@
                 "functions-deploy-cluster-resource",
                 "functions-deploy-cluster-parallelism",
                 "functions-deploy-cluster-encryption",
-                "functions-deploy-cluster-package"
+                "functions-deploy-cluster-package",
+                "functions-deploy-cluster-builtin"
               ]
             },
             "functions-deploy-trigger"
@@ -207,24 +208,28 @@
         "txn-monitor"
       ]
     },
-    {
-      "type": "category",
-      "label": "Kubernetes (Helm)",
-      "items": [
-        "helm-overview",
-        "helm-prepare",
-        "helm-install",
-        "helm-deploy",
-        "helm-upgrade",
-        "helm-tools"
-      ]
-    },
     {
       "type": "category",
       "label": "Deployment",
+      "link": {
+        "type": "doc",
+        "id": "install-deploy-upgrade-landing"
+      },
       "items": [
         "deploy-aws",
-        "deploy-kubernetes",
+        {
+          "type": "category",
+          "label": "Kubernetes",
+          "link": {
+            "type": "doc",
+            "id": "deploy-kubernetes"
+          },
+          "items": [
+            "helm-prepare",
+            "helm-deploy",
+            "helm-upgrade"
+          ]
+        },
         "deploy-bare-metal",
         "deploy-bare-metal-multi-cluster",
         "deploy-docker",
@@ -324,6 +329,7 @@
         "admin-api-topics",
         "admin-api-functions",
         "admin-api-packages",
+        "admin-api-schemas",
         "admin-api-transactions"
       ]
     },
@@ -365,14 +371,14 @@
     {
       "type": "category",
       "label": "Reference",
+      "link": {
+        "type": "doc",
+        "id": "reference-landing"
+      },
       "items": [
         "reference-terminology",
         "reference-cli-tools",
-        {
-          "type": "link",
-          "href": "https://pulsar.apache.org/reference",
-          "label": "Pulsar configuration"
-        },
+        "reference-configuration",
         "reference-metrics",
         "reference-rest-api-overview",
         {
diff --git a/site2/website/static/swagger/2.10.2/swagger.json b/site2/website/static/swagger/2.10.2/swagger.json
new file mode 100644
index 0000000000000..ca97ff1ba210f
--- /dev/null
+++ b/site2/website/static/swagger/2.10.2/swagger.json
@@ -0,0 +1,26128 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for admin operations",
+    "version" : "v2",
+    "title" : "Pulsar Admin REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v2",
+  "tags" : [ {
+    "name" : "bookies"
+  }, {
+    "name" : "broker-stats"
+  }, {
+    "name" : "brokers"
+  }, {
+    "name" : "clusters"
+  }, {
+    "name" : "namespaces"
+  }, {
+    "name" : "non-persistent topic"
+  }, {
+    "name" : "persistent topic"
+  }, {
+    "name" : "resource-quotas"
+  }, {
+    "name" : "resourcegroups"
+  }, {
+    "name" : "schemas"
+  }, {
+    "name" : "tenants"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/bookies/all" : {
+      "get" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Gets raw information for all the bookies in the cluster",
+        "description" : "",
+        "operationId" : "getAllBookies",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BookiesClusterInfo"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/bookies/racks-info" : {
+      "get" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Gets the rack placement information for all the bookies in the cluster",
+        "description" : "",
+        "operationId" : "getBookiesRackInfo",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object",
+                "additionalProperties" : {
+                  "$ref" : "#/definitions/BookieInfo"
+                }
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/bookies/racks-info/{bookie}" : {
+      "get" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Gets the rack placement information for a specific bookie in the cluster",
+        "description" : "",
+        "operationId" : "getBookieRackInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "bookie",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BookieInfo"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Updates the rack placement information for a specific bookie in the cluster (note. bookie address format:`address:port`)",
+        "description" : "",
+        "operationId" : "updateBookieRackInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "bookie",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "group",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Removed the rack placement information for a specific bookie in the cluster",
+        "description" : "",
+        "operationId" : "deleteBookieRackInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "bookie",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/allocator-stats/{allocator}" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get the stats for the Netty allocator. Available allocators are 'default' and 'ml-cache'",
+        "description" : "",
+        "operationId" : "getAllocatorStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "allocator",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/AllocatorStats"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/bookieops" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get pending bookie client op stats by namesapce",
+        "description" : "",
+        "operationId" : "getPendingBookieOpsStats",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/PendingBookieOpsStats"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/broker-resource-availability/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Broker availability report",
+        "description" : "This API gives the current broker availability in percent, each resource percentage usage is calculated and thensum of all of the resource usage percent is called broker-resource-availability

    THIS API IS ONLY FOR USE BY TESTING FOR CONFIRMING NAMESPACE ALLOCATION ALGORITHM",
+        "operationId" : "getBrokerResourceAvailability",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/ResourceUnit"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Load-manager doesn't support operation"
+          }
+        }
+      }
+    },
+    "/broker-stats/load-report" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get Load for this broker",
+        "description" : "consists of topics stats & systemResourceUsage",
+        "operationId" : "getLoadReport",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LoadReport"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/mbeans" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get all the mbean details of this broker JVM",
+        "description" : "",
+        "operationId" : "getMBeans",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/Metrics"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/metrics" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Gets the metrics for Monitoring",
+        "description" : "Requested should be executed by Monitoring agent on each broker to fetch the metrics",
+        "operationId" : "getMetrics",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/Metrics"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/topics" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get all the topic stats by namespace",
+        "description" : "",
+        "operationId" : "getTopics2",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/OutputStream"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/brokers/backlog-quota-check" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "An REST endpoint to trigger backlogQuotaCheck",
+        "description" : "",
+        "operationId" : "backlogQuotaCheck",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Everything is OK"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/configuration" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get all updatable dynamic configurations's name",
+        "description" : "",
+        "operationId" : "getDynamicConfigurationName",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "You don't have admin permission to get configuration"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/runtime" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get all runtime configurations. This operation requires Pulsar super-user privileges.",
+        "description" : "",
+        "operationId" : "getRuntimeConfiguration",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/values" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get value of all dynamic configurations' value overridden on local config",
+        "description" : "",
+        "operationId" : "getAllDynamicConfigurations",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "You don't have admin permission to view configuration"
+          },
+          "404" : {
+            "description" : "Configuration not found"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/{configName}" : {
+      "delete" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Delete dynamic ServiceConfiguration into metadata only. This operation requires Pulsar super-user privileges.",
+        "description" : "",
+        "operationId" : "deleteDynamicConfiguration",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "configName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Service configuration updated successfully"
+          },
+          "403" : {
+            "description" : "You don't have admin permission to update service-configuration"
+          },
+          "412" : {
+            "description" : "Invalid dynamic-config value"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/{configName}/{configValue}" : {
+      "post" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Update dynamic serviceconfiguration into zk only. This operation requires Pulsar super-user privileges.",
+        "description" : "",
+        "operationId" : "updateDynamicConfiguration",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "configName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "configValue",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Service configuration updated successfully"
+          },
+          "403" : {
+            "description" : "You don't have admin permission to update service-configuration"
+          },
+          "404" : {
+            "description" : "Configuration not found"
+          },
+          "412" : {
+            "description" : "Invalid dynamic-config value"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/health" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Run a healthCheck against the broker",
+        "description" : "",
+        "operationId" : "healthCheck",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "topicVersion",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "V1", "V2" ]
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Everything is OK"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/internal-configuration" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the internal configuration data",
+        "description" : "",
+        "operationId" : "getInternalConfigurationData",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/InternalConfigurationData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/brokers/leaderBroker" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the information of the leader broker.",
+        "description" : "",
+        "operationId" : "getLeaderBroker",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BrokerInfo"
+            }
+          },
+          "401" : {
+            "description" : "Authentication required"
+          },
+          "403" : {
+            "description" : "This operation requires super-user access"
+          },
+          "404" : {
+            "description" : "Leader broker not found"
+          }
+        }
+      }
+    },
+    "/brokers/ready" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Check if the broker is fully initialized",
+        "description" : "",
+        "operationId" : "isReady",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Broker is ready"
+          },
+          "500" : {
+            "description" : "Broker is not ready"
+          }
+        }
+      }
+    },
+    "/brokers/shutdown" : {
+      "post" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Shutdown broker gracefully.",
+        "description" : "",
+        "operationId" : "shutDownBrokerGracefully",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "maxConcurrentUnloadPerSec",
+          "in" : "query",
+          "description" : "if the value absent(value=0) means no concurrent limitation.",
+          "required" : false,
+          "type" : "integer",
+          "format" : "int32"
+        }, {
+          "name" : "forcedTerminateTopic",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : true
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Execute shutdown command successfully"
+          },
+          "403" : {
+            "description" : "You don't have admin permission to update service-configuration"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/version" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get version of current broker",
+        "description" : "",
+        "operationId" : "version",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Everything is OK",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/{clusterName}/{broker-webserviceurl}/ownedNamespaces" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the list of namespaces served by the specific broker",
+        "description" : "",
+        "operationId" : "getOwnedNamespaces",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "clusterName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "broker-webserviceurl",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/NamespaceOwnershipStatus"
+              }
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the cluster"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist"
+          }
+        }
+      }
+    },
+    "/brokers/{cluster}" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the list of active brokers (web service addresses) in the cluster.If authorization is not enabled, any cluster name is valid.",
+        "description" : "",
+        "operationId" : "getActiveBrokers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve this cluster"
+          },
+          "401" : {
+            "description" : "Authentication required"
+          },
+          "403" : {
+            "description" : "This operation requires super-user access"
+          },
+          "404" : {
+            "description" : "Cluster does not exist: cluster={clustername}"
+          }
+        }
+      }
+    },
+    "/clusters" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the list of all the Pulsar clusters.",
+        "description" : "",
+        "operationId" : "getClusters",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Return a list of clusters.",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the configuration for the specified cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Return the cluster data.",
+            "schema" : {
+              "$ref" : "#/definitions/ClusterData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Update the configuration for a cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "updateCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The cluster data",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/ClusterData"
+          },
+          "x-examples" : {
+            "application/json" : "{\n   'serviceUrl': 'http://pulsar.example.com:8080',\n   'brokerServiceUrl': 'pulsar://pulsar.example.com:6651'\n}"
+          }
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been updated."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Create a new cluster.",
+        "description" : "This operation requires Pulsar superuser privileges, and the name cannot contain the '/' characters.",
+        "operationId" : "createCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The cluster data",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/ClusterData"
+          },
+          "x-examples" : {
+            "application/json" : "{\n   'serviceUrl': 'http://pulsar.example.com:8080',\n   'brokerServiceUrl': 'pulsar://pulsar.example.com:6651',\n}"
+          }
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been created."
+          },
+          "403" : {
+            "description" : "You don't have admin permission to create the cluster."
+          },
+          "409" : {
+            "description" : "Cluster already exists."
+          },
+          "412" : {
+            "description" : "Cluster name is not valid."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Delete an existing cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "deleteCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been deleted."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster is not empty."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/failureDomains" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the cluster failure domains.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getFailureDomains",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/FailureDomain"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/failureDomains/{domainName}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get a domain in a cluster",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getDomain",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "domainName",
+          "in" : "path",
+          "description" : "The failure domain name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FailureDomain"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "FailureDomain doesn't exist"
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Set the failure domain of the cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "setFailureDomain",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "domainName",
+          "in" : "path",
+          "description" : "The failure domain name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The configuration data of a failure domain",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/FailureDomain"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Failure domain doesn't exist."
+          },
+          "409" : {
+            "description" : "Broker already exists in another domain."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Delete the failure domain of the cluster",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "deleteFailureDomain",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "domainName",
+          "in" : "path",
+          "description" : "The failure domain name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission or policy is read only"
+          },
+          "404" : {
+            "description" : "FailureDomain doesn't exist"
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the namespace isolation policies assigned to the cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getNamespaceIsolationPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/NamespaceIsolationData"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies/brokers" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get list of brokers with namespace-isolation policies attached to them.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getBrokersWithNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "$ref" : "#/definitions/BrokerNamespaceIsolationData"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Namespace-isolation policies not found."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies/brokers/{broker}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get a broker with namespace-isolation policies attached to it.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getBrokerWithNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "broker",
+          "in" : "path",
+          "description" : "The broker name (:)",
+          "required" : true,
+          "type" : "string",
+          "x-example" : "broker1:8080"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BrokerNamespaceIsolationData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Namespace-isolation policies/ Broker not found."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies/{policyName}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the single namespace isolation policy assigned to the cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "description" : "The name of the namespace isolation policy",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/NamespaceIsolationData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Policy doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Set namespace isolation policy.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "setNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "description" : "The namespace isolation policy name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The namespace isolation policy data",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/NamespaceIsolationData"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Namespace isolation policy data is invalid."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Namespace isolation policy doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Delete namespace isolation policy.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "deleteNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "description" : "The namespace isolation policy name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission or policies are read only."
+          },
+          "404" : {
+            "description" : "Namespace isolation policy doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/peers" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the peer-cluster data for the specified cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getPeerCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Update peer-cluster-list for a cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "setPeerClusterNames",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The list of peer cluster names",
+          "required" : true,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          },
+          "x-examples" : {
+            "application/json" : "[\n   'cluster-a',\n   'cluster-b'\n]"
+          }
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been updated."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "412" : {
+            "description" : "Peer cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/namespaces/{cluster}/antiAffinity/{group}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get all namespaces that are grouped by given anti-affinity group in a given cluster. api can be only accessed by admin of any of the existing tenant",
+        "description" : "",
+        "operationId" : "getAntiAffinityNamespaces",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "group",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "412" : {
+            "description" : "Cluster not exist/Anti-affinity group can't be empty."
+          }
+        }
+      }
+    },
+    "/namespaces/{property}/{namespace}/persistence/bookieAffinity" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the bookie-affinity-group from namespace-local policy.",
+        "description" : "",
+        "operationId" : "getBookieAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "property",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BookieAffinityGroupData"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete the bookie-affinity-group from namespace-local policy.",
+        "description" : "",
+        "operationId" : "deleteBookieAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "property",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the list of all the namespaces for a certain tenant.",
+        "description" : "",
+        "operationId" : "getTenantNamespaces",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the dump all the policies specified for a namespace.",
+        "description" : "",
+        "operationId" : "getPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/Policies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Creates a new namespace with the specified policies",
+        "description" : "",
+        "operationId" : "createNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Policies for the namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/Policies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace already exists"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete a namespace and all the topics under it.",
+        "description" : "",
+        "operationId" : "deleteNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "405" : {
+            "description" : "Broker doesn't allow forced deletion of namespaces"
+          },
+          "409" : {
+            "description" : "Namespace is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/antiAffinity" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get anti-affinity group of a namespace.",
+        "description" : "",
+        "operationId" : "getNamespaceAntiAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set anti-affinity group for a namespace",
+        "description" : "",
+        "operationId" : "setNamespaceAntiAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Anti-affinity group for the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid antiAffinityGroup"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove anti-affinity group of a namespace.",
+        "description" : "",
+        "operationId" : "removeNamespaceAntiAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/autoSubscriptionCreation" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get autoSubscriptionCreation info in a namespace",
+        "description" : "",
+        "operationId" : "getAutoSubscriptionCreation",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/AutoSubscriptionCreationOverride"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Override broker's allowAutoSubscriptionCreation setting for a namespace",
+        "description" : "",
+        "operationId" : "setAutoSubscriptionCreation",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Settings for automatic subscription creation",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/AutoSubscriptionCreationOverride"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid autoSubscriptionCreation override"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove override of broker's allowAutoSubscriptionCreation in a namespace",
+        "description" : "",
+        "operationId" : "removeAutoSubscriptionCreation",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/autoTopicCreation" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get autoTopicCreation info in a namespace",
+        "description" : "",
+        "operationId" : "getAutoTopicCreation",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/AutoTopicCreationOverride"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Override broker's allowAutoTopicCreation setting for a namespace",
+        "description" : "",
+        "operationId" : "setAutoTopicCreation",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Settings for automatic topic creation",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/AutoTopicCreationOverride"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid autoTopicCreation override"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be less than or equal to maxNumPartitionsPerPartitionedTopic"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove override of broker's allowAutoTopicCreation in a namespace",
+        "description" : "",
+        "operationId" : "removeAutoTopicCreation",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/backlogQuota" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set a backlog quota for all the topics on a namespace.",
+        "description" : "",
+        "operationId" : "setBacklogQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Backlog quota for all topics of the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/BacklogQuota"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Specified backlog quota exceeds retention quota. Increase retention quota and retry request"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove a backlog quota policy from a namespace.",
+        "description" : "",
+        "operationId" : "removeBacklogQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/backlogQuotaMap" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get backlog quota map on a namespace.",
+        "description" : "",
+        "operationId" : "getBacklogQuotaMap",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/BacklogQuota"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/bundles" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the bundles split data.",
+        "description" : "",
+        "operationId" : "getBundlesData",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BundlesData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace is not setup to split in bundles"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/clearBacklog" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for all topics on a namespace.",
+        "description" : "",
+        "operationId" : "clearNamespaceBacklog",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/clearBacklog/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for a given subscription on all topics on a namespace.",
+        "description" : "",
+        "operationId" : "clearNamespaceBacklogForSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/compactionThreshold" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Maximum number of uncompacted bytes in topics before compaction is triggered.",
+        "description" : "The backlog size is compared to the threshold periodically. A threshold of 0 disabled automatic compaction",
+        "operationId" : "getCompactionThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int64"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set maximum number of uncompacted bytes in a topic before compaction is triggered.",
+        "description" : "The backlog size is compared to the threshold periodically. A threshold of 0 disabled automatic compaction",
+        "operationId" : "setCompactionThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Maximum number of uncompacted bytes in a topic of the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "compactionThreshold value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete maximum number of uncompacted bytes in a topic before compaction is triggered.",
+        "description" : "The backlog size is compared to the threshold periodically. A threshold of 0 disabled automatic compaction",
+        "operationId" : "deleteCompactionThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/deduplication" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get broker side deduplication for all topics in a namespace",
+        "description" : "",
+        "operationId" : "getDeduplication",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Enable or disable broker side deduplication for all topics in a namespace",
+        "description" : "",
+        "operationId" : "modifyDeduplication",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Flag for disabling or enabling broker side deduplication for all topics in the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove broker side deduplication for all topics in a namespace",
+        "description" : "",
+        "operationId" : "removeDeduplication",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/deduplicationSnapshotInterval" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get deduplicationSnapshotInterval config on a namespace.",
+        "description" : "",
+        "operationId" : "getDeduplicationSnapshotInterval",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set deduplicationSnapshotInterval config on a namespace.",
+        "description" : "",
+        "operationId" : "setDeduplicationSnapshotInterval",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Interval to take deduplication snapshot per topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/delayedDelivery" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get delayed delivery messages config on a namespace.",
+        "description" : "",
+        "operationId" : "getDelayedDeliveryPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DelayedDeliveryPolicies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set delayed delivery messages config on a namespace.",
+        "description" : "",
+        "operationId" : "setDelayedDeliveryPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Delayed delivery policies for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DelayedDeliveryPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete delayed delivery messages config on a namespace.",
+        "description" : "",
+        "operationId" : "removeDelayedDeliveryPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/dispatchRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get dispatch-rate configured for the namespace, null means dispatch-rate not configured, -1 means msg-dispatch-rate or byte-dispatch-rate not configured in dispatch-rate yet",
+        "description" : "",
+        "operationId" : "getDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DispatchRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for all topics of the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "deleteDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/encryptionRequired" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get message encryption required status in a namespace",
+        "description" : "",
+        "operationId" : "getEncryptionRequired",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Message encryption is required or not for all topics in a namespace",
+        "description" : "",
+        "operationId" : "modifyEncryptionRequired",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Flag defining if message encryption is required",
+          "required" : true,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/inactiveTopicPolicies" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get inactive topic policies config on a namespace.",
+        "description" : "",
+        "operationId" : "getInactiveTopicPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/InactiveTopicPolicies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set inactive topic policies config on a namespace.",
+        "description" : "",
+        "operationId" : "setInactiveTopicPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Inactive topic policies for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/InactiveTopicPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove inactive topic policies from a namespace.",
+        "description" : "",
+        "operationId" : "removeInactiveTopicPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/isAllowAutoUpdateSchema" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The flag of whether allow auto update schema",
+        "description" : "",
+        "operationId" : "getIsAllowAutoUpdateSchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update flag of whether allow auto update schema",
+        "description" : "",
+        "operationId" : "setIsAllowAutoUpdateSchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Flag of whether to allow auto update schema",
+          "required" : true,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxConsumersPerSubscription" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxConsumersPerSubscription config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxConsumersPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxConsumersPerSubscription configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxConsumersPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum consumers per subscription",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxConsumersPerSubscription value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxConsumersPerSubscription configuration on a namespace.",
+        "description" : "",
+        "operationId" : "removeMaxConsumersPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxConsumersPerSubscription value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxConsumersPerTopic" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxConsumersPerTopic config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxConsumersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxConsumersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxConsumersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum consumers per topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxConsumersPerTopic value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove maxConsumersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "removeMaxConsumersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxProducersPerTopic" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxProducersPerTopic config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxProducersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxProducersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxProducersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum producers per topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxProducersPerTopic value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove maxProducersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "removeMaxProducersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxSubscriptionsPerTopic" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxSubscriptionsPerTopic config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxSubscriptionsPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxSubscriptionsPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxSubscriptionsPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum subscriptions per topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxUnackedMessagesPerSubscription value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove maxSubscriptionsPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "removeMaxSubscriptionsPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxTopicsPerNamespace" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxTopicsPerNamespace config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxTopicsPerNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set maxTopicsPerNamespace config on a namespace.",
+        "description" : "",
+        "operationId" : "setInactiveTopicPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum topics for specific namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set maxTopicsPerNamespace config on a namespace.",
+        "description" : "",
+        "operationId" : "setInactiveTopicPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxUnackedMessagesPerConsumer" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxUnackedMessagesPerConsumer config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxUnackedMessagesPerConsumer",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxConsumersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxUnackedMessagesPerConsumer",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum unacked messages per consumer",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxUnackedMessagesPerConsumer value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove maxUnackedMessagesPerConsumer config on a namespace.",
+        "description" : "",
+        "operationId" : "removeMaxUnackedmessagesPerConsumer",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxUnackedMessagesPerSubscription" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxUnackedMessagesPerSubscription config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxUnackedmessagesPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxUnackedMessagesPerSubscription configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxUnackedMessagesPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Number of maximum unacked messages per subscription",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxUnackedMessagesPerSubscription value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove maxUnackedMessagesPerSubscription config on a namespace.",
+        "description" : "",
+        "operationId" : "removeMaxUnackedmessagesPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/messageTTL" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the message TTL for the namespace",
+        "description" : "",
+        "operationId" : "getNamespaceMessageTTL",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set message TTL in seconds for namespace",
+        "description" : "",
+        "operationId" : "setNamespaceMessageTTL",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "TTL in seconds for the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid TTL"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set message TTL in seconds for namespace",
+        "description" : "",
+        "operationId" : "removeNamespaceMessageTTL",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid TTL"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/offloadDeletionLagMs" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Number of milliseconds to wait before deleting a ledger segment which has been offloaded from the Pulsar cluster's local storage (i.e. BookKeeper)",
+        "description" : "A negative value denotes that deletion has been completely disabled. 'null' denotes that the topics in the namespace will fall back to the broker default for deletion lag.",
+        "operationId" : "getOffloadDeletionLag",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int64"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set number of milliseconds to wait before deleting a ledger segment which has been offloaded from the Pulsar cluster's local storage (i.e. BookKeeper)",
+        "description" : "A negative value disables the deletion completely.",
+        "operationId" : "setOffloadDeletionLag",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "New number of milliseconds to wait before deleting a ledger segment which has been offloaded",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "offloadDeletionLagMs value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear the namespace configured offload deletion lag. The topics in the namespace will fallback to using the default configured deletion lag for the broker",
+        "description" : "",
+        "operationId" : "clearOffloadDeletionLag",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/offloadPolicies" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get offload configuration on a namespace.",
+        "description" : "",
+        "operationId" : "getOffloadPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/OffloadPoliciesImpl"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set offload configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setOffloadPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Offload policies for the specified namespace",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/OffloadPoliciesImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "OffloadPolicies is empty or driver is not supported or bucket is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/offloadThreshold" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Maximum number of bytes stored on the pulsar cluster for a topic, before the broker will start offloading to longterm storage",
+        "description" : "A negative value disables automatic offloading",
+        "operationId" : "getOffloadThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int64"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set maximum number of bytes stored on the pulsar cluster for a topic, before the broker will start offloading to longterm storage",
+        "description" : "-1 will revert to using the cluster default. A negative value disables automatic offloading. ",
+        "operationId" : "setOffloadThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Maximum number of bytes stored on the pulsar cluster for a topic of the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "offloadThreshold value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/permissions" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Retrieve the permissions for a namespace.",
+        "description" : "",
+        "operationId" : "getPermissions",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "array",
+                "uniqueItems" : true,
+                "items" : {
+                  "type" : "string",
+                  "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+                }
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/permissions/subscription" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Retrieve the permissions for a subscription.",
+        "description" : "",
+        "operationId" : "getPermissionOnSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "array",
+                "uniqueItems" : true,
+                "items" : {
+                  "type" : "string"
+                }
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/permissions/{role}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Grant a new permission to a role on a namespace.",
+        "description" : "",
+        "operationId" : "grantPermissionOnNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "List of permissions for the specified role",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "501" : {
+            "description" : "Authorization is not enabled"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Revoke all permissions to a role on a namespace.",
+        "description" : "",
+        "operationId" : "revokePermissionsOnNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/persistence" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the persistence configuration for a namespace.",
+        "description" : "",
+        "operationId" : "getPersistence",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistencePolicies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set the persistence configuration for all the topics on a namespace.",
+        "description" : "",
+        "operationId" : "setPersistence",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Persistence policies for the specified namespace",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/PersistencePolicies"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid persistence policies"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete the persistence configuration for all topics on a namespace",
+        "description" : "",
+        "operationId" : "deletePersistence",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/persistence/bookieAffinity" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set the bookie-affinity-group to namespace-persistent policy.",
+        "description" : "",
+        "operationId" : "setBookieAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Bookie affinity group for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/BookieAffinityGroupData"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/properties" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get key value pair properties for a given namespace.",
+        "description" : "",
+        "operationId" : "getProperties",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Put key value pairs property on a namespace.",
+        "description" : "",
+        "operationId" : "setProperties",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Key value pair properties for the namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get property value for a given key on a namespace.",
+        "description" : "",
+        "operationId" : "clearProperties",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/property/{key}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get property value for a given key on a namespace.",
+        "description" : "",
+        "operationId" : "getProperty",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get property value for a given key on a namespace.",
+        "description" : "",
+        "operationId" : "removeProperty",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/property/{key}/{value}" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Put a key value pair property on a namespace.",
+        "description" : "",
+        "operationId" : "setProperty",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "value",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/removeOffloadPolicies" : {
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set offload configuration on a namespace.",
+        "description" : "",
+        "operationId" : "removeOffloadPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "OffloadPolicies is empty or driver is not supported or bucket is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/replication" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the replication clusters for a namespace.",
+        "description" : "",
+        "operationId" : "getNamespaceReplicationClusters",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace is not global"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set the replication clusters for a namespace.",
+        "description" : "",
+        "operationId" : "setNamespaceReplicationClusters",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "List of replication clusters",
+          "required" : true,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Peer-cluster can't be part of replication-cluster"
+          },
+          "412" : {
+            "description" : "Namespace is not global or invalid cluster ids"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/replicatorDispatchRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get replicator dispatch-rate configured for the namespace, null means replicator dispatch-rate not configured, -1 means msg-dispatch-rate or byte-dispatch-rate not configured in dispatch-rate yet",
+        "description" : "",
+        "operationId" : "getReplicatorDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DispatchRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set replicator dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setReplicatorDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Replicator dispatch rate for all topics of the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove replicator dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "removeReplicatorDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/resourcegroup" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the resourcegroup attached to the namespace",
+        "description" : "",
+        "operationId" : "getNamespaceResourceGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete resourcegroup for a namespace",
+        "description" : "",
+        "operationId" : "removeNamespaceResourceGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid resourcegroup"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/resourcegroup/{resourcegroup}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set resourcegroup for a namespace",
+        "description" : "",
+        "operationId" : "setNamespaceResourceGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "resourcegroup",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid resourcegroup"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/retention" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get retention config on a namespace.",
+        "description" : "",
+        "operationId" : "getRetention",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/RetentionPolicies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set retention configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setRetention",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Retention policies for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/RetentionPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Remove retention configuration on a namespace.",
+        "description" : "",
+        "operationId" : "removeRetention",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Retention policies for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/RetentionPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/schemaAutoUpdateCompatibilityStrategy" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The strategy used to check the compatibility of new schemas, provided by producers, before automatically updating the schema",
+        "description" : "The value AutoUpdateDisabled prevents producers from updating the schema.  If set to AutoUpdateDisabled, schemas must be updated through the REST api",
+        "operationId" : "getSchemaAutoUpdateCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "AutoUpdateDisabled", "Backward", "Forward", "Full", "AlwaysCompatible", "BackwardTransitive", "ForwardTransitive", "FullTransitive" ]
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update the strategy used to check the compatibility of new schemas, provided by producers, before automatically updating the schema",
+        "description" : "The value AutoUpdateDisabled prevents producers from updating the schema.  If set to AutoUpdateDisabled, schemas must be updated through the REST api",
+        "operationId" : "setSchemaAutoUpdateCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Strategy used to check the compatibility of new schemas",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/schemaCompatibilityStrategy" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The strategy of the namespace schema compatibility ",
+        "description" : "",
+        "operationId" : "getSchemaCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "UNDEFINED", "ALWAYS_INCOMPATIBLE", "ALWAYS_COMPATIBLE", "BACKWARD", "FORWARD", "FULL", "BACKWARD_TRANSITIVE", "FORWARD_TRANSITIVE", "FULL_TRANSITIVE" ]
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update the strategy used to check the compatibility of new schema",
+        "description" : "",
+        "operationId" : "setSchemaCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Strategy used to check the compatibility of new schema",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/schemaValidationEnforced" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get schema validation enforced flag for namespace.",
+        "description" : "If the flag is set to true, when a producer without a schema attempts to produce to a topic with schema in this namespace, the producer will be failed to connect. PLEASE be carefully on using this, since non-java clients don't support schema.if you enable this setting, it will cause non-java clients failed to produce.",
+        "operationId" : "getSchemaValidtionEnforced",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenants or Namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set schema validation enforced flag on namespace.",
+        "description" : "If the flag is set to true, when a producer without a schema attempts to produce to a topic with schema in this namespace, the producer will be failed to connect. PLEASE be carefully on using this, since non-java clients don't support schema.if you enable this setting, it will cause non-java clients failed to produce.",
+        "operationId" : "setSchemaValidtionEnforced",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Flag of whether validation is enforced on the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "schemaValidationEnforced value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscribeRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get subscribe-rate configured for the namespace",
+        "description" : "",
+        "operationId" : "getSubscribeRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SubscribeRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set subscribe-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setSubscribeRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscribe rate for all topics of the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete subscribe-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "deleteSubscribeRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscriptionAuthMode" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get subscription auth mode in a namespace",
+        "description" : "",
+        "operationId" : "getSubscriptionAuthMode",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "None", "Prefix" ]
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set a subscription auth mode for all the topics on a namespace.",
+        "description" : "",
+        "operationId" : "setSubscriptionAuthMode",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscription auth mode for all topics of the specified namespace",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscriptionDispatchRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get subscription dispatch-rate configured for the namespace, null means subscription dispatch-rate not configured, -1 means msg-dispatch-rate or byte-dispatch-rate not configured in dispatch-rate yet",
+        "description" : "",
+        "operationId" : "getSubscriptionDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DispatchRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set Subscription dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setSubscriptionDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscription dispatch rate for all topics of the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete Subscription dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "deleteSubscriptionDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscriptionExpirationTime" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the subscription expiration time for the namespace",
+        "description" : "",
+        "operationId" : "getSubscriptionExpirationTime",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set subscription expiration time in minutes for namespace",
+        "description" : "",
+        "operationId" : "setSubscriptionExpirationTime",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Expiration time in minutes for the specified namespace",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid expiration time"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove subscription expiration time for namespace",
+        "description" : "",
+        "operationId" : "removeSubscriptionExpirationTime",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscriptionTypesEnabled" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The set of whether allow subscription types",
+        "description" : "",
+        "operationId" : "getSubscriptionTypesEnabled",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string",
+                "enum" : [ "Exclusive", "Shared", "Failover", "Key_Shared" ]
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update set of whether allow share sub type",
+        "description" : "",
+        "operationId" : "setSubscriptionTypesEnabled",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Set of whether allow subscription types",
+          "required" : true,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "Exclusive", "Shared", "Failover", "Key_Shared" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Remove subscription types enabled on a namespace.",
+        "description" : "",
+        "operationId" : "removeSubscriptionTypesEnabled",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/topics" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the list of all the topics under a certain namespace.",
+        "description" : "",
+        "operationId" : "getTopics",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "mode",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "default" : "PERSISTENT",
+          "enum" : [ "PERSISTENT", "NON_PERSISTENT", "ALL" ]
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/unload" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unload namespace",
+        "description" : "Unload an active namespace from the current broker serving it. Performing this operation will let the brokerremoves all producers, consumers, and connections using this namespace, and close all topics (includingtheir persistent store). During that operation, the namespace is marked as tentatively unavailable until thebroker completes the unloading action. This operation requires strictly super user privileges, since it wouldresult in non-persistent message loss and unexpected connection closure to the clients.",
+        "operationId" : "unloadNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace is already unloaded or Namespace has bundles activated"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/unsubscribe/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unsubscribes the given subscription on all topics on a namespace.",
+        "description" : "",
+        "operationId" : "unsubscribeNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespacen"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}" : {
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete a namespace bundle and all the topics under it.",
+        "description" : "",
+        "operationId" : "deleteNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace bundle is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/clearBacklog" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for all topics on a namespace bundle.",
+        "description" : "",
+        "operationId" : "clearNamespaceBundleBacklog",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/clearBacklog/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for a given subscription on all topics on a namespace bundle.",
+        "description" : "",
+        "operationId" : "clearNamespaceBundleBacklogForSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/split" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Split a namespace bundle",
+        "description" : "",
+        "operationId" : "splitNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "unload",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "splitAlgorithmName",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/unload" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unload a namespace bundle",
+        "description" : "",
+        "operationId" : "unloadNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/unsubscribe/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unsubscribes the given subscription on all topics on a namespace bundle.",
+        "description" : "",
+        "operationId" : "unsubscribeNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of non-persistent topics under a namespace.",
+        "description" : "",
+        "operationId" : "getList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "query",
+          "description" : "Specify the bundle name",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace does not exist"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/partitioned" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of partitioned topics under a namespace.",
+        "description" : "",
+        "operationId" : "getPartitionedTopicList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{bundle}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of non-persistent topics under a namespace bundle.",
+        "description" : "",
+        "operationId" : "getListFromBundle",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "description" : "Bundle range of a topic",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Create a non-partitioned topic.",
+        "description" : "This is the only REST endpoint from which non-partitioned topics could be created.",
+        "operationId" : "createNonPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Key value pair properties for the topic metadata",
+          "required" : false,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete a topic.",
+        "description" : "The topic cannot be deleted if delete is not forcefully and there's any active subscription or producer connected to the it. Force delete ignores connected clients and deletes topic by explicitly closing them.",
+        "operationId" : "deleteTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "deleteSchema",
+          "in" : "query",
+          "description" : "Delete the topic's schema storage",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic has active producers/subscriptions"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/all_subscription/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Expiry messages on all subscriptions of topic.",
+        "description" : "",
+        "operationId" : "expireMessagesForAllSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/backlog" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get estimated backlog for offline topic.",
+        "description" : "",
+        "operationId" : "getBacklog",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentOfflineTopicStats"
+            }
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/backlogQuota" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set a backlog quota for a topic.",
+        "description" : "",
+        "operationId" : "setBacklogQuota",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Specified backlog quota exceeds retention quota. Increase retention quota and retry request"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove a backlog quota policy from a topic.",
+        "description" : "",
+        "operationId" : "removeBacklogQuota",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/backlogQuotaMap" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get backlog quota map on a topic.",
+        "description" : "",
+        "operationId" : "getBacklogQuotaMap",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic policy does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/backlogSize" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Calculate backlog size by a message ID (in bytes).",
+        "description" : "",
+        "operationId" : "getBacklogSizeByMessageId",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/compaction" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the status of a compaction operation for a topic.",
+        "description" : "",
+        "operationId" : "compactionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongRunningProcessStatus"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist, or compaction hasn't run"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Trigger a compaction operation on a topic.",
+        "description" : "",
+        "operationId" : "compact",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Compaction already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/compactionThreshold" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get compaction threshold configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getCompactionThreshold",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set compaction threshold configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setCompactionThreshold",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove compaction threshold configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeCompactionThreshold",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/createMissedPartitions" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Create missed partitions of an existing partitioned topic.",
+        "description" : "",
+        "operationId" : "createMissedPartitions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/deduplicationEnabled" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get deduplication configuration of a topic.",
+        "description" : "",
+        "operationId" : "getDeduplication",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set deduplication enabled on a topic.",
+        "description" : "",
+        "operationId" : "setDeduplication",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "DeduplicationEnabled policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove deduplication configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeDeduplication",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/deduplicationSnapshotInterval" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get deduplicationSnapshotInterval config on a topic.",
+        "description" : "",
+        "operationId" : "getDeduplicationSnapshotInterval",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set deduplicationSnapshotInterval config on a topic.",
+        "description" : "",
+        "operationId" : "setDeduplicationSnapshotInterval",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Interval to take deduplication snapshot for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete deduplicationSnapshotInterval config on a topic.",
+        "description" : "",
+        "operationId" : "deleteDeduplicationSnapshotInterval",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/delayedDelivery" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get delayed delivery messages config on a topic.",
+        "description" : "",
+        "operationId" : "getDelayedDeliveryPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set delayed delivery messages config on a topic.",
+        "description" : "",
+        "operationId" : "setDelayedDeliveryPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Delayed delivery policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DelayedDeliveryPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set delayed delivery messages config on a topic.",
+        "description" : "",
+        "operationId" : "deleteDelayedDeliveryPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/dispatchRate" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/examinemessage" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Examine a specific message on a topic by position relative to the earliest or the latest message.",
+        "description" : "",
+        "operationId" : "examineMessage",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "initialPosition",
+          "in" : "query",
+          "description" : "Relative start position to examine message.It can be 'latest' or 'earliest'",
+          "required" : false,
+          "type" : "string",
+          "default" : "latest",
+          "enum" : [ "latest", "earliest" ]
+        }, {
+          "name" : "messagePosition",
+          "in" : "query",
+          "description" : "The position of messages (default 1)",
+          "required" : false,
+          "type" : "integer",
+          "default" : 1,
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, the message position does not exist"
+          },
+          "405" : {
+            "description" : "If given partitioned topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/inactiveTopicPolicies" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get inactive topic policies on a topic.",
+        "description" : "",
+        "operationId" : "getInactiveTopicPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set inactive topic policies on a topic.",
+        "description" : "",
+        "operationId" : "setInactiveTopicPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "inactive topic policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/InactiveTopicPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete inactive topic policies on a topic.",
+        "description" : "",
+        "operationId" : "deleteInactiveTopicPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/internal-info" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the stored topic metadata.",
+        "description" : "",
+        "operationId" : "getManagedLedgerInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/internalStats" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the internal stats for the topic.",
+        "description" : "",
+        "operationId" : "getInternalStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "metadata",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentTopicInternalStats"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/lastMessageId" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Return the last commit message id of topic",
+        "description" : "",
+        "operationId" : "getLastMessageId",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/ledger/{ledgerId}/entry/{entryId}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get message by its messageId.",
+        "description" : "",
+        "operationId" : "getMessageById",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "ledgerId",
+          "in" : "path",
+          "description" : "The ledger id",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "entryId",
+          "in" : "path",
+          "description" : "The entry id",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, subscription or the message position does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxConsumers" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get maxConsumers config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxConsumers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set maxConsumers config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxConsumers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max consumers of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxConsumers"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove maxConsumers config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxConsumers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxConsumersPerSubscription" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get max consumers per subscription configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxConsumersPerSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set max consumers per subscription configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxConsumersPerSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove max consumers per subscription configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxConsumersPerSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxMessageSize" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get maxMessageSize config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxMessageSize",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set maxMessageSize config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxMessageSize",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max message size of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxConsumers"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove maxMessageSize config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxMessageSize",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxProducers" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get maxProducers config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxProducers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set maxProducers config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxProducers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max producers of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxProducers"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove maxProducers config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxProducers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxSubscriptionsPerTopic" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get maxSubscriptionsPerTopic config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxSubscriptionsPerTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set maxSubscriptionsPerTopic config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxSubscriptionsPerTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max subscriptions of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxSubscriptionsPerTopic"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove maxSubscriptionsPerTopic config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxSubscriptionsPerTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxUnackedMessagesOnConsumer" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get max unacked messages per consumer config on a topic.",
+        "description" : "",
+        "operationId" : "getMaxUnackedMessagesOnConsumer",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set max unacked messages per consumer config on a topic.",
+        "description" : "",
+        "operationId" : "setMaxUnackedMessagesOnConsumer",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Max unacked messages on consumer policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete max unacked messages per consumer config on a topic.",
+        "description" : "",
+        "operationId" : "deleteMaxUnackedMessagesOnConsumer",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/maxUnackedMessagesOnSubscription" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get max unacked messages per subscription config on a topic.",
+        "description" : "",
+        "operationId" : "getMaxUnackedMessagesOnSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set max unacked messages per subscription config on a topic.",
+        "description" : "",
+        "operationId" : "setMaxUnackedMessagesOnSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Max unacked messages on subscription policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete max unacked messages per subscription config on a topic.",
+        "description" : "",
+        "operationId" : "deleteMaxUnackedMessagesOnSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/messageTTL" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get message TTL in seconds for a topic",
+        "description" : "",
+        "operationId" : "getMessageTTL",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set message TTL in seconds for a topic",
+        "description" : "",
+        "operationId" : "setMessageTTL",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "messageTTL",
+          "in" : "query",
+          "description" : "TTL in seconds for the specified namespace",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int32"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Not authenticate to perform the request or policy is read only"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          },
+          "412" : {
+            "description" : "Invalid message TTL value"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove message TTL in seconds for a topic",
+        "description" : "",
+        "operationId" : "removeMessageTTL",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Not authenticate to perform the request or policy is read only"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          },
+          "412" : {
+            "description" : "Invalid message TTL value"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/messageid/{timestamp}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get message ID published at or just after this absolute timestamp (in ms).",
+        "description" : "",
+        "operationId" : "getMessageIdByTimestamp",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "timestamp",
+          "in" : "path",
+          "description" : "Specify the timestamp",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic is not non-partitioned and persistent"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/offload" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "offloadStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "triggerOffload",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "400" : {
+            "description" : "Message ID is null"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Offload already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/offloadPolicies" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get offload policies on a topic.",
+        "description" : "",
+        "operationId" : "getOffloadPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set offload policies on a topic.",
+        "description" : "",
+        "operationId" : "setOffloadPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Offload policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/OffloadPoliciesImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete offload policies on a topic.",
+        "description" : "",
+        "operationId" : "removeOffloadPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/partitioned-stats" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the stats for the partitioned topic.",
+        "description" : "",
+        "operationId" : "getPartitionedStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "perPartition",
+          "in" : "query",
+          "description" : "Get per partition stats",
+          "required" : false,
+          "type" : "boolean",
+          "default" : true
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getPreciseBacklog",
+          "in" : "query",
+          "description" : "If return precise backlog or imprecise backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "subscriptionBacklogSize",
+          "in" : "query",
+          "description" : "If return backlog size for each subscription, require locking on ledger so be careful not to use when there's heavy traffic.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getEarliestTimeInBacklog",
+          "in" : "query",
+          "description" : "If return the earliest time in backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/partitions" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get partitioned topic metadata.",
+        "description" : "",
+        "operationId" : "getPartitionedMetadata",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "checkAllowAutoCreation",
+          "in" : "query",
+          "description" : "Is check configuration required to automatically create topic",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PartitionedTopicMetadata"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate cluster configuration"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Increment partitions of an existing partitioned topic.",
+        "description" : "It only increments partitions of existing non-global partitioned-topic",
+        "operationId" : "updatePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "updateLocalTopicOnly",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be more than 0 and less than or equal to maxNumPartitionsPerPartitionedTopic"
+          },
+          "409" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Create a partitioned topic.",
+        "description" : "It needs to be called before creating a producer on a partitioned topic.",
+        "operationId" : "createPartitionedTopic",
+        "consumes" : [ "application/vnd.partitioned-topic-metadata+json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The metadata for the topic",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/PartitionedTopicMetadata"
+          }
+        }, {
+          "name" : "createLocalTopicOnly",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be more than 0 and less than or equal to maxNumPartitionsPerPartitionedTopic"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete a partitioned topic.",
+        "description" : "It will also delete all the partitions of the topic if it exists.",
+        "operationId" : "deletePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "deleteSchema",
+          "in" : "query",
+          "description" : "Delete the topic's schema storage",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/permissions" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get permissions on a topic.",
+        "description" : "Retrieve the effective permissions for a topic. These permissions are defined by the permissions set at thenamespace level combined (union) with any eventual specific permission set on the topic.",
+        "operationId" : "getPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "array",
+                "uniqueItems" : true,
+                "items" : {
+                  "type" : "string",
+                  "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+                }
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/permissions/{role}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Grant a new permission to a role on a single topic.",
+        "description" : "",
+        "operationId" : "grantPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Actions to be granted (produce,functions,consume)",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Revoke permissions on a topic.",
+        "description" : "Revoke permissions to a role on a single topic. If the permission was not set at the topiclevel, but rather at the namespace level, this operation will return an error (HTTP status code 412).",
+        "operationId" : "revokePermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Permissions are not set at the topic level"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/persistence" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get configuration of persistence policies for specified topic.",
+        "description" : "",
+        "operationId" : "getPersistence",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set configuration of persistence policies for specified topic.",
+        "description" : "",
+        "operationId" : "setPersistence",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Bookkeeper persistence policies for specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PersistencePolicies"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid persistence policies"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove configuration of persistence policies for specified topic.",
+        "description" : "",
+        "operationId" : "removePersistence",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/properties" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get topic properties.",
+        "description" : "",
+        "operationId" : "getProperties",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/publishRate" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get publish rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getPublishRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set message publish rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setPublishRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PublishRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove message publish rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removePublishRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/replication" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the replication clusters for a topic",
+        "description" : "",
+        "operationId" : "getReplicationClusters",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set the replication clusters for a topic.",
+        "description" : "",
+        "operationId" : "setReplicationClusters",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "List of replication clusters",
+          "required" : true,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic is not global or invalid cluster ids"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove the replication clusters from a topic.",
+        "description" : "",
+        "operationId" : "removeReplicationClusters",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/replicatorDispatchRate" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get replicatorDispatchRate config for specified topic.",
+        "description" : "",
+        "operationId" : "getReplicatorDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set replicatorDispatchRate config for specified topic.",
+        "description" : "",
+        "operationId" : "setReplicatorDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Replicator dispatch rate of the topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of replicatorDispatchRate"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove replicatorDispatchRate config for specified topic.",
+        "description" : "",
+        "operationId" : "removeReplicatorDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/retention" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get retention configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getRetention",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set retention configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setRetention",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Retention policies for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/RetentionPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove retention configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeRetention",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/schemaCompatibilityStrategy" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get schema compatibility strategy on a topic",
+        "description" : "",
+        "operationId" : "getSchemaCompatibilityStrategy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the cluster",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on persistent topic"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set schema compatibility strategy on a topic",
+        "description" : "",
+        "operationId" : "setSchemaCompatibilityStrategy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Strategy used to check the compatibility of new schema",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on persistent topic"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove schema compatibility strategy on a topic",
+        "description" : "",
+        "operationId" : "removeSchemaCompatibilityStrategy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Strategy used to check the compatibility of new schema",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on persistent topic"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/stats" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the stats for the topic.",
+        "description" : "",
+        "operationId" : "getStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getPreciseBacklog",
+          "in" : "query",
+          "description" : "If return precise backlog or imprecise backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "subscriptionBacklogSize",
+          "in" : "query",
+          "description" : "If return backlog size for each subscription, require locking on ledger so be careful not to use when there's heavy traffic.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getEarliestTimeInBacklog",
+          "in" : "query",
+          "description" : "If return time of the earliest message in backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/NonPersistentTopicStats"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscribeRate" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get subscribe rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getSubscribeRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set subscribe rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setSubscribeRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscribe rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove subscribe rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeSubscribeRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscribe rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}" : {
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete a subscription.",
+        "description" : "The subscription cannot be deleted if delete is not forcefully and there are any active consumers attached to it. Force delete ignores connected consumers and deletes subscription by explicitly closing them.",
+        "operationId" : "deleteSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be deleted",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Disconnect and close all consumers and delete subscription forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Subscription has active consumers"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Expiry messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "expireTopicMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be Expiry messages on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId to reset back to (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResetCursorData"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Expiry messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "expireTopicMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be Expiry messages on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/position/{messagePosition}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Peek nth message on a topic subscription.",
+        "description" : "",
+        "operationId" : "peekNthMessage",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscribed message expired",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "messagePosition",
+          "in" : "path",
+          "description" : "The number of messages (default 1)",
+          "required" : true,
+          "type" : "integer",
+          "default" : 1,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, subscription or the message position does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/properties" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Replaces all the properties on the given subscription",
+        "description" : "",
+        "operationId" : "updateSubscriptionProperties",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to update",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The new properties",
+          "required" : false,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Method Not Allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/replicatedSubscriptionStatus" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get replicated subscription status on a topic.",
+        "description" : "",
+        "operationId" : "getReplicatedSubscriptionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Enable or disable a replicated subscription on a topic.",
+        "description" : "",
+        "operationId" : "setReplicatedSubscriptionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Whether to enable replicated subscription",
+          "required" : true,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant or subscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on this topic"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Reset subscription to message position closest to given position.",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursorOnPosition",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId to reset back to (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResetCursorData"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "412" : {
+            "description" : "Unable to find position for position specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor/{timestamp}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Reset subscription to message position closest to absolute timestamp (in ms).",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursor",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "timestamp",
+          "in" : "path",
+          "description" : "the timestamp to reset back",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Method Not Allowed"
+          },
+          "412" : {
+            "description" : "Failed to reset cursor on subscription or Unable to find position for timestamp specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip/{numMessages}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Skipping messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "skipMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "numMessages",
+          "in" : "path",
+          "description" : "The number of messages to skip",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a partitioned topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip_all" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Skip all messages on a topic subscription.",
+        "description" : "Completely clears the backlog on the subscription.",
+        "operationId" : "skipAllMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on non-persistent topic"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subscriptionName}" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Create a subscription on the topic.",
+        "description" : "Creates a subscription on the topic at the specified message id",
+        "operationId" : "createSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscriptionName",
+          "in" : "path",
+          "description" : "Subscription to create position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId where to create the subscription. It can be 'latest', 'earliest' or (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResetCursorData"
+          }
+        }, {
+          "name" : "replicated",
+          "in" : "query",
+          "description" : "Is replicated required to perform this operation",
+          "required" : false,
+          "type" : "boolean"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "400" : {
+            "description" : "Create subscription on non persistent topic is not supported"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscriptionDispatchRate" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get subscription message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getSubscriptionDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set subscription message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setSubscriptionDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscription message dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove subscription message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeSubscriptionDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscriptionTypesEnabled" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get is enable sub type fors specified topic.",
+        "description" : "",
+        "operationId" : "getSubscriptionTypesEnabled",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Set is enable sub types for specified topic",
+        "description" : "",
+        "operationId" : "setSubscriptionTypesEnabled",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Enable sub types for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "Exclusive", "Shared", "Failover", "Key_Shared" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Remove subscription types enabled for specified topic.",
+        "description" : "",
+        "operationId" : "removeSubscriptionTypesEnabled",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscriptions" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of persistent subscriptions for a given topic.",
+        "description" : "",
+        "operationId" : "getSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/terminate" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Terminate a topic. A topic that is terminated will not accept any more messages to be published and will let consumer to drain existing messages in backlog",
+        "description" : "",
+        "operationId" : "terminate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/MessageId"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Termination of a partitioned topic is not allowed"
+          },
+          "406" : {
+            "description" : "Need to provide a persistent topic name"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/terminate/partitions" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Terminate all partitioned topic. A topic that is terminated will not accept any more messages to be published and will let consumer to drain existing messages in backlog",
+        "description" : "",
+        "operationId" : "terminatePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Termination of a non-partitioned topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/truncate" : {
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Truncate a topic.",
+        "description" : "NonPersistentTopic does not support truncate.",
+        "operationId" : "truncateTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "412" : {
+            "description" : "NonPersistentTopic does not support truncate."
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/unload" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Unload a topic",
+        "description" : "",
+        "operationId" : "unloadTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "This operation requires super-user access"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the list of topics under a namespace.",
+        "description" : "",
+        "operationId" : "getList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "query",
+          "description" : "Specify the bundle name",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespacee"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/partitioned" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the list of partitioned topics under a namespace.",
+        "description" : "",
+        "operationId" : "getPartitionedTopicList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin or operate permission on the namespace"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Create a non-partitioned topic.",
+        "description" : "This is the only REST endpoint from which non-partitioned topics could be created.",
+        "operationId" : "createNonPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Key value pair properties for the topic metadata",
+          "required" : false,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete a topic.",
+        "description" : "The topic cannot be deleted if delete is not forcefully and there's any active subscription or producer connected to the it. Force delete ignores connected clients and deletes topic by explicitly closing them.",
+        "operationId" : "deleteTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "deleteSchema",
+          "in" : "query",
+          "description" : "Delete the topic's schema storage",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic has active producers/subscriptions"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/all_subscription/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Expiry messages on all subscriptions of topic.",
+        "description" : "",
+        "operationId" : "expireMessagesForAllSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/backlog" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get estimated backlog for offline topic.",
+        "description" : "",
+        "operationId" : "getBacklog",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentOfflineTopicStats"
+            }
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/backlogQuota" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set a backlog quota for a topic.",
+        "description" : "",
+        "operationId" : "setBacklogQuota",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Specified backlog quota exceeds retention quota. Increase retention quota and retry request"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove a backlog quota policy from a topic.",
+        "description" : "",
+        "operationId" : "removeBacklogQuota",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/backlogQuotaMap" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get backlog quota map on a topic.",
+        "description" : "",
+        "operationId" : "getBacklogQuotaMap",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic policy does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/backlogSize" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Calculate backlog size by a message ID (in bytes).",
+        "description" : "",
+        "operationId" : "getBacklogSizeByMessageId",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/compaction" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the status of a compaction operation for a topic.",
+        "description" : "",
+        "operationId" : "compactionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongRunningProcessStatus"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist, or compaction hasn't run"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Trigger a compaction operation on a topic.",
+        "description" : "",
+        "operationId" : "compact",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Compaction already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/compactionThreshold" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get compaction threshold configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getCompactionThreshold",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set compaction threshold configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setCompactionThreshold",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove compaction threshold configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeCompactionThreshold",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/createMissedPartitions" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Create missed partitions of an existing partitioned topic.",
+        "description" : "",
+        "operationId" : "createMissedPartitions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/deduplicationEnabled" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get deduplication configuration of a topic.",
+        "description" : "",
+        "operationId" : "getDeduplication",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set deduplication enabled on a topic.",
+        "description" : "",
+        "operationId" : "setDeduplication",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "DeduplicationEnabled policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove deduplication configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeDeduplication",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/deduplicationSnapshotInterval" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get deduplicationSnapshotInterval config on a topic.",
+        "description" : "",
+        "operationId" : "getDeduplicationSnapshotInterval",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set deduplicationSnapshotInterval config on a topic.",
+        "description" : "",
+        "operationId" : "setDeduplicationSnapshotInterval",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Interval to take deduplication snapshot for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete deduplicationSnapshotInterval config on a topic.",
+        "description" : "",
+        "operationId" : "deleteDeduplicationSnapshotInterval",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/delayedDelivery" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get delayed delivery messages config on a topic.",
+        "description" : "",
+        "operationId" : "getDelayedDeliveryPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set delayed delivery messages config on a topic.",
+        "description" : "",
+        "operationId" : "setDelayedDeliveryPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Delayed delivery policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DelayedDeliveryPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set delayed delivery messages config on a topic.",
+        "description" : "",
+        "operationId" : "deleteDelayedDeliveryPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/dispatchRate" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/examinemessage" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Examine a specific message on a topic by position relative to the earliest or the latest message.",
+        "description" : "",
+        "operationId" : "examineMessage",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "initialPosition",
+          "in" : "query",
+          "description" : "Relative start position to examine message.It can be 'latest' or 'earliest'",
+          "required" : false,
+          "type" : "string",
+          "default" : "latest",
+          "enum" : [ "latest", "earliest" ]
+        }, {
+          "name" : "messagePosition",
+          "in" : "query",
+          "description" : "The position of messages (default 1)",
+          "required" : false,
+          "type" : "integer",
+          "default" : 1,
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, the message position does not exist"
+          },
+          "405" : {
+            "description" : "If given partitioned topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/inactiveTopicPolicies" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get inactive topic policies on a topic.",
+        "description" : "",
+        "operationId" : "getInactiveTopicPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set inactive topic policies on a topic.",
+        "description" : "",
+        "operationId" : "setInactiveTopicPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "inactive topic policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/InactiveTopicPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete inactive topic policies on a topic.",
+        "description" : "",
+        "operationId" : "deleteInactiveTopicPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/internal-info" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the stored topic metadata.",
+        "description" : "",
+        "operationId" : "getManagedLedgerInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/internalStats" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the internal stats for the topic.",
+        "description" : "",
+        "operationId" : "getInternalStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "metadata",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentTopicInternalStats"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/lastMessageId" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Return the last commit message id of topic",
+        "description" : "",
+        "operationId" : "getLastMessageId",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/ledger/{ledgerId}/entry/{entryId}" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get message by its messageId.",
+        "description" : "",
+        "operationId" : "getMessageById",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "ledgerId",
+          "in" : "path",
+          "description" : "The ledger id",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "entryId",
+          "in" : "path",
+          "description" : "The entry id",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, subscription or the message position does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxConsumers" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get maxConsumers config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxConsumers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set maxConsumers config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxConsumers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max consumers of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxConsumers"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove maxConsumers config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxConsumers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxConsumersPerSubscription" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get max consumers per subscription configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxConsumersPerSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set max consumers per subscription configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxConsumersPerSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove max consumers per subscription configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxConsumersPerSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxMessageSize" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get maxMessageSize config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxMessageSize",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set maxMessageSize config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxMessageSize",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max message size of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxConsumers"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove maxMessageSize config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxMessageSize",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxProducers" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get maxProducers config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxProducers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set maxProducers config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxProducers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max producers of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxProducers"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove maxProducers config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxProducers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxSubscriptionsPerTopic" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get maxSubscriptionsPerTopic config for specified topic.",
+        "description" : "",
+        "operationId" : "getMaxSubscriptionsPerTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set maxSubscriptionsPerTopic config for specified topic.",
+        "description" : "",
+        "operationId" : "setMaxSubscriptionsPerTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The max subscriptions of the topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of maxSubscriptionsPerTopic"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove maxSubscriptionsPerTopic config for specified topic.",
+        "description" : "",
+        "operationId" : "removeMaxSubscriptionsPerTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxUnackedMessagesOnConsumer" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get max unacked messages per consumer config on a topic.",
+        "description" : "",
+        "operationId" : "getMaxUnackedMessagesOnConsumer",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set max unacked messages per consumer config on a topic.",
+        "description" : "",
+        "operationId" : "setMaxUnackedMessagesOnConsumer",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Max unacked messages on consumer policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete max unacked messages per consumer config on a topic.",
+        "description" : "",
+        "operationId" : "deleteMaxUnackedMessagesOnConsumer",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/maxUnackedMessagesOnSubscription" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get max unacked messages per subscription config on a topic.",
+        "description" : "",
+        "operationId" : "getMaxUnackedMessagesOnSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set max unacked messages per subscription config on a topic.",
+        "description" : "",
+        "operationId" : "setMaxUnackedMessagesOnSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Max unacked messages on subscription policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete max unacked messages per subscription config on a topic.",
+        "description" : "",
+        "operationId" : "deleteMaxUnackedMessagesOnSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/messageTTL" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get message TTL in seconds for a topic",
+        "description" : "",
+        "operationId" : "getMessageTTL",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set message TTL in seconds for a topic",
+        "description" : "",
+        "operationId" : "setMessageTTL",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "messageTTL",
+          "in" : "query",
+          "description" : "TTL in seconds for the specified namespace",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int32"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Not authenticate to perform the request or policy is read only"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          },
+          "412" : {
+            "description" : "Invalid message TTL value"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove message TTL in seconds for a topic",
+        "description" : "",
+        "operationId" : "removeMessageTTL",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Not authenticate to perform the request or policy is read only"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          },
+          "412" : {
+            "description" : "Invalid message TTL value"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/messageid/{timestamp}" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get message ID published at or just after this absolute timestamp (in ms).",
+        "description" : "",
+        "operationId" : "getMessageIdByTimestamp",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "timestamp",
+          "in" : "path",
+          "description" : "Specify the timestamp",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic is not non-partitioned and persistent"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/offload" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "offloadStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "triggerOffload",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "400" : {
+            "description" : "Message ID is null"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Offload already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/offloadPolicies" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get offload policies on a topic.",
+        "description" : "",
+        "operationId" : "getOffloadPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set offload policies on a topic.",
+        "description" : "",
+        "operationId" : "setOffloadPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Offload policies for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/OffloadPoliciesImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete offload policies on a topic.",
+        "description" : "",
+        "operationId" : "removeOffloadPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace or topic doesn't exist"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/partitioned-stats" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the stats for the partitioned topic.",
+        "description" : "",
+        "operationId" : "getPartitionedStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "perPartition",
+          "in" : "query",
+          "description" : "Get per partition stats",
+          "required" : false,
+          "type" : "boolean",
+          "default" : true
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getPreciseBacklog",
+          "in" : "query",
+          "description" : "If return precise backlog or imprecise backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "subscriptionBacklogSize",
+          "in" : "query",
+          "description" : "If return backlog size for each subscription, require locking on ledger so be careful not to use when there's heavy traffic.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getEarliestTimeInBacklog",
+          "in" : "query",
+          "description" : "If return the earliest time in backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/partitions" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get partitioned topic metadata.",
+        "description" : "",
+        "operationId" : "getPartitionedMetadata",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "checkAllowAutoCreation",
+          "in" : "query",
+          "description" : "Is check configuration required to automatically create topic",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PartitionedTopicMetadata"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Increment partitions of an existing partitioned topic.",
+        "description" : "It only increments partitions of existing non-global partitioned-topic",
+        "operationId" : "updatePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "updateLocalTopicOnly",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be more than 0 and less than or equal to maxNumPartitionsPerPartitionedTopic"
+          },
+          "409" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Create a partitioned topic.",
+        "description" : "It needs to be called before creating a producer on a partitioned topic.",
+        "operationId" : "createPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        }, {
+          "name" : "createLocalTopicOnly",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be more than 0 and less than or equal to maxNumPartitionsPerPartitionedTopic"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete a partitioned topic.",
+        "description" : "It will also delete all the partitions of the topic if it exists.",
+        "operationId" : "deletePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "deleteSchema",
+          "in" : "query",
+          "description" : "Delete the topic's schema storage",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/permissions" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get permissions on a topic.",
+        "description" : "Retrieve the effective permissions for a topic. These permissions are defined by the permissions set at thenamespace level combined (union) with any eventual specific permission set on the topic.",
+        "operationId" : "getPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "array",
+                "uniqueItems" : true,
+                "items" : {
+                  "type" : "string",
+                  "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+                }
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/permissions/{role}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Grant a new permission to a role on a single topic.",
+        "description" : "",
+        "operationId" : "grantPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Actions to be granted (produce,functions,consume)",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Revoke permissions on a topic.",
+        "description" : "Revoke permissions to a role on a single topic. If the permission was not set at the topiclevel, but rather at the namespace level, this operation will return an error (HTTP status code 412).",
+        "operationId" : "revokePermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Permissions are not set at the topic level"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/persistence" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get configuration of persistence policies for specified topic.",
+        "description" : "",
+        "operationId" : "getPersistence",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set configuration of persistence policies for specified topic.",
+        "description" : "",
+        "operationId" : "setPersistence",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Bookkeeper persistence policies for specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PersistencePolicies"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid persistence policies"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove configuration of persistence policies for specified topic.",
+        "description" : "",
+        "operationId" : "removePersistence",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/properties" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get topic properties.",
+        "description" : "",
+        "operationId" : "getProperties",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/publishRate" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get publish rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getPublishRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set message publish rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setPublishRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PublishRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove message publish rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removePublishRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/replication" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the replication clusters for a topic",
+        "description" : "",
+        "operationId" : "getReplicationClusters",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, enable the topic level policy and retry"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set the replication clusters for a topic.",
+        "description" : "",
+        "operationId" : "setReplicationClusters",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "List of replication clusters",
+          "required" : true,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic is not global or invalid cluster ids"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove the replication clusters from a topic.",
+        "description" : "",
+        "operationId" : "removeReplicationClusters",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage", "message_age" ]
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/replicatorDispatchRate" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get replicatorDispatchRate config for specified topic.",
+        "description" : "",
+        "operationId" : "getReplicatorDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set replicatorDispatchRate config for specified topic.",
+        "description" : "",
+        "operationId" : "setReplicatorDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Replicator dispatch rate of the topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Invalid value of replicatorDispatchRate"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove replicatorDispatchRate config for specified topic.",
+        "description" : "",
+        "operationId" : "removeReplicatorDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/retention" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get retention configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getRetention",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set retention configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setRetention",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Retention policies for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/RetentionPolicies"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove retention configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeRetention",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/schemaCompatibilityStrategy" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get schema compatibility strategy on a topic",
+        "description" : "",
+        "operationId" : "getSchemaCompatibilityStrategy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the cluster",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on persistent topic"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set schema compatibility strategy on a topic",
+        "description" : "",
+        "operationId" : "setSchemaCompatibilityStrategy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Strategy used to check the compatibility of new schema",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on persistent topic"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove schema compatibility strategy on a topic",
+        "description" : "",
+        "operationId" : "removeSchemaCompatibilityStrategy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Strategy used to check the compatibility of new schema",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on persistent topic"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/stats" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the stats for the topic.",
+        "description" : "",
+        "operationId" : "getStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getPreciseBacklog",
+          "in" : "query",
+          "description" : "If return precise backlog or imprecise backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "subscriptionBacklogSize",
+          "in" : "query",
+          "description" : "If return backlog size for each subscription, require locking on ledger so be careful not to use when there's heavy traffic.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "getEarliestTimeInBacklog",
+          "in" : "query",
+          "description" : "If return time of the earliest message in backlog",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/TopicStats"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscribeRate" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get subscribe rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getSubscribeRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set subscribe rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setSubscribeRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscribe rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove subscribe rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeSubscribeRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscribe rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}" : {
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete a subscription.",
+        "description" : "The subscription cannot be deleted if delete is not forcefully and there are any active consumers attached to it. Force delete ignores connected consumers and deletes subscription by explicitly closing them.",
+        "operationId" : "deleteSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be deleted",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Disconnect and close all consumers and delete subscription forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Subscription has active consumers"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Expiry messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "expireTopicMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be Expiry messages on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId to reset back to (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResetCursorData"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Expiry messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "expireTopicMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be Expiry messages on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/position/{messagePosition}" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Peek nth message on a topic subscription.",
+        "description" : "",
+        "operationId" : "peekNthMessage",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscribed message expired",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "messagePosition",
+          "in" : "path",
+          "description" : "The number of messages (default 1)",
+          "required" : true,
+          "type" : "integer",
+          "default" : 1,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, subscription or the message position does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/properties" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Replaces all the properties on the given subscription",
+        "description" : "",
+        "operationId" : "updateSubscriptionProperties",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to update",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The new properties",
+          "required" : false,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Method Not Allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/replicatedSubscriptionStatus" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get replicated subscription status on a topic.",
+        "description" : "",
+        "operationId" : "getReplicatedSubscriptionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Enable or disable a replicated subscription on a topic.",
+        "description" : "",
+        "operationId" : "setReplicatedSubscriptionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Whether to enable replicated subscription",
+          "required" : true,
+          "schema" : {
+            "type" : "boolean"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant or subscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on this topic"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Reset subscription to message position closest to given position.",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursorOnPosition",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId to reset back to (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResetCursorData"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "412" : {
+            "description" : "Unable to find position for position specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor/{timestamp}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Reset subscription to message position closest to absolute timestamp (in ms).",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursor",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "timestamp",
+          "in" : "path",
+          "description" : "the timestamp to reset back",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Method Not Allowed"
+          },
+          "412" : {
+            "description" : "Failed to reset cursor on subscription or Unable to find position for timestamp specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip/{numMessages}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Skipping messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "skipMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "numMessages",
+          "in" : "path",
+          "description" : "The number of messages to skip",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a partitioned topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip_all" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Skip all messages on a topic subscription.",
+        "description" : "Completely clears the backlog on the subscription.",
+        "operationId" : "skipAllMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on non-persistent topic"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subscriptionName}" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Create a subscription on the topic.",
+        "description" : "Creates a subscription on the topic at the specified message id",
+        "operationId" : "createSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscriptionName",
+          "in" : "path",
+          "description" : "Subscription to create position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId where to create the subscription. It can be 'latest', 'earliest' or (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResetCursorData"
+          }
+        }, {
+          "name" : "replicated",
+          "in" : "query",
+          "description" : "Is replicated required to perform this operation",
+          "required" : false,
+          "type" : "boolean"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "400" : {
+            "description" : "Create subscription on non persistent topic is not supported"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscriptionDispatchRate" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get subscription message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "getSubscriptionDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "applied",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set subscription message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "setSubscriptionDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Subscription message dispatch rate for the specified topic",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove subscription message dispatch rate configuration for specified topic.",
+        "description" : "",
+        "operationId" : "removeSubscriptionDispatchRate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscriptionTypesEnabled" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get is enable sub type fors specified topic.",
+        "description" : "",
+        "operationId" : "getSubscriptionTypesEnabled",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Set is enable sub types for specified topic",
+        "description" : "",
+        "operationId" : "setSubscriptionTypesEnabled",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Enable sub types for the specified topic",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "Exclusive", "Shared", "Failover", "Key_Shared" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, please enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Remove subscription types enabled for specified topic.",
+        "description" : "",
+        "operationId" : "removeSubscriptionTypesEnabled",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "isGlobal",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Topic level policy is disabled, to enable the topic level policy and retry"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscriptions" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the list of persistent subscriptions for a given topic.",
+        "description" : "",
+        "operationId" : "getSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/terminate" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Terminate a topic. A topic that is terminated will not accept any more messages to be published and will let consumer to drain existing messages in backlog",
+        "description" : "",
+        "operationId" : "terminate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/MessageId"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Termination of a partitioned topic is not allowed"
+          },
+          "406" : {
+            "description" : "Need to provide a persistent topic name"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/terminate/partitions" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Terminate all partitioned topic. A topic that is terminated will not accept any more messages to be published and will let consumer to drain existing messages in backlog",
+        "description" : "",
+        "operationId" : "terminatePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Termination of a non-partitioned topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/truncate" : {
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Truncate a topic.",
+        "description" : "The truncate operation will move all cursors to the end of the topic and delete all inactive ledgers.",
+        "operationId" : "truncateTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/unload" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Unload a topic",
+        "description" : "",
+        "operationId" : "unloadTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Whether leader broker redirected this call to this broker. For internal use.",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is not valid or can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/resource-quotas" : {
+      "get" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Get the default quota",
+        "description" : "",
+        "operationId" : "getDefaultResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Set the default quota",
+        "description" : "",
+        "operationId" : "setDefaultResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Default resource quota",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResourceQuota"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/resource-quotas/{tenant}/{namespace}/{bundle}" : {
+      "get" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Get resource quota of a namespace bundle.",
+        "description" : "",
+        "operationId" : "getNamespaceBundleResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Namespace name within the specified tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "description" : "Namespace bundle range",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/ResourceQuota"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Set resource quota on a namespace.",
+        "description" : "",
+        "operationId" : "setNamespaceBundleResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Namespace name within the specified tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "description" : "Namespace bundle range",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Resource quota for the specified namespace",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResourceQuota"
+          }
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Remove resource quota for a namespace.",
+        "description" : "",
+        "operationId" : "removeNamespaceBundleResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Namespace name within the specified tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "description" : "Namespace bundle range",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/resourcegroups" : {
+      "get" : {
+        "tags" : [ "resourcegroups" ],
+        "summary" : "Get the list of all the resourcegroups.",
+        "description" : "",
+        "operationId" : "getResourceGroups",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/resourcegroups/{resourcegroup}" : {
+      "get" : {
+        "tags" : [ "resourcegroups" ],
+        "summary" : "Get the rate limiters specified for a resourcegroup.",
+        "description" : "",
+        "operationId" : "getResourceGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "resourcegroup",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/ResourceGroup"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "ResourceGroup doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "resourcegroups" ],
+        "summary" : "Creates a new resourcegroup with the specified rate limiters",
+        "description" : "",
+        "operationId" : "createOrUpdateResourceGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "resourcegroup",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Rate limiters for the resourcegroup",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/ResourceGroup"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "cluster doesn't exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "resourcegroups" ],
+        "summary" : "Delete a resourcegroup.",
+        "description" : "",
+        "operationId" : "deleteResourceGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "resourcegroup",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "ResourceGroup doesn't exist"
+          },
+          "409" : {
+            "description" : "ResourceGroup is in use"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/compatibility" : {
+      "post" : {
+        "tags" : [ "schemas" ],
+        "summary" : "test the schema compatibility",
+        "description" : "",
+        "operationId" : "testCompatibility",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting a schema payload. An example of the expected schema can be found down here.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PostSchemaPayload"
+          },
+          "x-examples" : {
+            "application/json" : "{\"type\": \"STRING\", \"schema\": \"\", \"properties\": { \"key1\" : \"value1\" + } }"
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/IsCompatibilityResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/schema" : {
+      "get" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Get the schema of a topic",
+        "description" : "",
+        "operationId" : "getSchema",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/GetSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist; or Schema is not found for this topic"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Update the schema of a topic",
+        "description" : "",
+        "operationId" : "postSchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting a schema payload. An example of the expected schema can be found down here.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PostSchemaPayload"
+          },
+          "x-examples" : {
+            "application/json" : "{\"type\": \"STRING\", \"schema\": \"\", \"properties\": { \"key1\" : \"value1\" + } }"
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PostSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "409" : {
+            "description" : "Incompatible schema"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "422" : {
+            "description" : "Invalid schema data"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Delete the schema of a topic",
+        "description" : "",
+        "operationId" : "deleteSchema",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DeleteSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/schema/{version}" : {
+      "get" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Get the schema of a topic at a given version",
+        "description" : "",
+        "operationId" : "getSchema",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/GetSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist; or Schema is not found for this topic"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/schemas" : {
+      "get" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Get the all schemas of a topic",
+        "description" : "",
+        "operationId" : "getAllSchemas",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/GetAllVersionsSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist; or Schema is not found for this topic"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/version" : {
+      "post" : {
+        "tags" : [ "schemas" ],
+        "summary" : "get the version of the schema",
+        "description" : "",
+        "operationId" : "getVersionBySchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting a schema payload. An example of the expected schema can be found down here.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PostSchemaPayload"
+          },
+          "x-examples" : {
+            "application/json" : "{\"type\": \"STRING\", \"schema\": \"\", \"properties\": { \"key1\" : \"value1\" + } }"
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongSchemaVersion"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "422" : {
+            "description" : "Invalid schema data"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/tenants" : {
+      "get" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Get the list of existing tenants.",
+        "description" : "",
+        "operationId" : "getTenants",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant doesn't exist"
+          }
+        }
+      }
+    },
+    "/tenants/{tenant}" : {
+      "get" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Get the admin configuration for a given tenant.",
+        "description" : "",
+        "operationId" : "getTenantAdmin",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Update the admins for a tenant.",
+        "description" : "This operation requires Pulsar super-user privileges.",
+        "operationId" : "updateTenant",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "TenantInfo",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/TenantInfo"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Tenant already exists"
+          },
+          "412" : {
+            "description" : "Clusters do not exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Create a new tenant.",
+        "description" : "This operation requires Pulsar super-user privileges.",
+        "operationId" : "createTenant",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "TenantInfo",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/TenantInfo"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "409" : {
+            "description" : "Tenant already exists"
+          },
+          "412" : {
+            "description" : "Clusters do not exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Delete a tenant and all namespaces and topics under it.",
+        "description" : "",
+        "operationId" : "deleteTenant",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "405" : {
+            "description" : "Broker doesn't allow forced deletion of tenants"
+          },
+          "409" : {
+            "description" : "The tenant still has active namespaces"
+          }
+        }
+      }
+    },
+    "/worker-stats/functionsmetrics" : {
+      "get" : {
+        "summary" : "Get metrics for all functions owned by worker",
+        "description" : "Requested should be executed by Monitoring agent on each worker to fetch the metrics",
+        "operationId" : "getStats",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/WorkerFunctionInstanceStats"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have admin permission"
+          },
+          "503" : {
+            "description" : "Worker service is not running"
+          }
+        }
+      }
+    },
+    "/worker-stats/metrics" : {
+      "get" : {
+        "summary" : "Gets the metrics for Monitoring",
+        "description" : "Request should be executed by Monitoring agent on each worker to fetch the worker-metrics",
+        "operationId" : "getMetrics",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/Metrics"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have admin permission"
+          },
+          "503" : {
+            "description" : "Worker service is not running"
+          }
+        }
+      }
+    },
+    "/worker/assignments" : {
+      "get" : {
+        "summary" : "Fetches information about which Pulsar Functions are assigned to which Pulsar clusters",
+        "description" : "",
+        "operationId" : "getAssignments",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "503" : {
+            "description" : "Worker service is not running"
+          }
+        }
+      }
+    },
+    "/worker/cluster" : {
+      "get" : {
+        "summary" : "Fetches information about the Pulsar cluster running Pulsar Functions",
+        "description" : "",
+        "operationId" : "getCluster",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/WorkerInfo"
+              }
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "503" : {
+            "description" : "Worker service is not running"
+          }
+        }
+      }
+    },
+    "/worker/cluster/leader" : {
+      "get" : {
+        "summary" : "Fetches info about the leader node of the Pulsar cluster running Pulsar Functions",
+        "description" : "",
+        "operationId" : "getClusterLeader",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/WorkerInfo"
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "503" : {
+            "description" : "Worker service is not running"
+          }
+        }
+      }
+    },
+    "/worker/cluster/leader/ready" : {
+      "get" : {
+        "summary" : "Checks if this node is the leader and is ready to service requests",
+        "description" : "",
+        "operationId" : "isLeaderReady",
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "503" : {
+            "description" : "Worker service is not running"
+          }
+        }
+      }
+    },
+    "/worker/connectors" : {
+      "get" : {
+        "summary" : "Fetches a list of supported Pulsar IO connectors currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getConnectorsList",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      }
+    },
+    "/worker/drain" : {
+      "get" : {
+        "summary" : "Get the status of any ongoing drain operation at this worker",
+        "description" : "",
+        "operationId" : "getDrainStatus",
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongRunningProcessStatus"
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "503" : {
+            "description" : "Worker service is not ready"
+          }
+        }
+      },
+      "put" : {
+        "summary" : "Drains this worker, i.e., moves its work-assignments to other workers",
+        "description" : "",
+        "operationId" : "drain",
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "409" : {
+            "description" : "Drain already in progress"
+          },
+          "503" : {
+            "description" : "Worker service is not ready"
+          }
+        }
+      }
+    },
+    "/worker/leader/drain" : {
+      "get" : {
+        "summary" : "Get the status of any ongoing drain operation at the specified worker",
+        "description" : "",
+        "operationId" : "getDrainStatusFromLeader",
+        "parameters" : [ {
+          "name" : "workerId",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongRunningProcessStatus"
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "503" : {
+            "description" : "Worker service is not ready"
+          }
+        }
+      },
+      "put" : {
+        "summary" : "Drains the specified worker, i.e., moves its work-assignments to other workers",
+        "description" : "",
+        "operationId" : "drainAtLeader",
+        "parameters" : [ {
+          "name" : "workerId",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "409" : {
+            "description" : "Drain already in progress"
+          },
+          "503" : {
+            "description" : "Worker service is not ready"
+          }
+        }
+      }
+    },
+    "/worker/rebalance" : {
+      "put" : {
+        "summary" : "Triggers a rebalance of functions to workers",
+        "description" : "",
+        "operationId" : "rebalance",
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "AllocatorStats" : {
+      "type" : "object",
+      "properties" : {
+        "numDirectArenas" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numHeapArenas" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numThreadLocalCaches" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "normalCacheSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "smallCacheSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "directArenas" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolArenaStats"
+          }
+        },
+        "heapArenas" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolArenaStats"
+          }
+        }
+      }
+    },
+    "Annotation" : {
+      "type" : "object"
+    },
+    "AnnotationIntrospector" : {
+      "type" : "object"
+    },
+    "ArrayBuilders" : {
+      "type" : "object",
+      "properties" : {
+        "booleanBuilder" : {
+          "$ref" : "#/definitions/BooleanBuilder"
+        },
+        "byteBuilder" : {
+          "$ref" : "#/definitions/ByteBuilder"
+        },
+        "shortBuilder" : {
+          "$ref" : "#/definitions/ShortBuilder"
+        },
+        "intBuilder" : {
+          "$ref" : "#/definitions/IntBuilder"
+        },
+        "longBuilder" : {
+          "$ref" : "#/definitions/LongBuilder"
+        },
+        "floatBuilder" : {
+          "$ref" : "#/definitions/FloatBuilder"
+        },
+        "doubleBuilder" : {
+          "$ref" : "#/definitions/DoubleBuilder"
+        }
+      }
+    },
+    "AuthPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "topicAuthentication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string",
+                "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+              }
+            }
+          }
+        },
+        "subscriptionAuthentication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "array",
+            "uniqueItems" : true,
+            "items" : {
+              "type" : "string"
+            }
+          }
+        },
+        "namespaceAuthentication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "array",
+            "uniqueItems" : true,
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions", "sources", "sinks", "packages" ]
+            }
+          }
+        }
+      }
+    },
+    "AuthenticationDataHttps" : {
+      "type" : "object",
+      "properties" : {
+        "subscription" : {
+          "type" : "string"
+        },
+        "tlsCertificates" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/X509Certificate"
+          }
+        },
+        "httpAuthType" : {
+          "type" : "string"
+        },
+        "peerAddress" : {
+          "$ref" : "#/definitions/SocketAddress"
+        },
+        "commandData" : {
+          "type" : "string"
+        }
+      }
+    },
+    "AutoFailoverPolicyData" : {
+      "type" : "object",
+      "properties" : {
+        "policyType" : {
+          "type" : "string",
+          "enum" : [ "min_available" ]
+        },
+        "parameters" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "AutoSubscriptionCreationOverride" : {
+      "type" : "object",
+      "properties" : {
+        "allowAutoSubscriptionCreation" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "AutoTopicCreationOverride" : {
+      "type" : "object",
+      "properties" : {
+        "topicType" : {
+          "type" : "string"
+        },
+        "defaultNumPartitions" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "allowAutoTopicCreation" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "BacklogQuota" : {
+      "type" : "object",
+      "properties" : {
+        "limitSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "limitTime" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "policy" : {
+          "type" : "string",
+          "enum" : [ "producer_request_hold", "producer_exception", "consumer_backlog_eviction" ]
+        },
+        "limit" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "Base64Variant" : {
+      "type" : "object",
+      "properties" : {
+        "paddingChar" : {
+          "type" : "string"
+        },
+        "paddingByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "maxLineLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "BookieAffinityGroupData" : {
+      "type" : "object",
+      "properties" : {
+        "bookkeeperAffinityGroupPrimary" : {
+          "type" : "string"
+        },
+        "bookkeeperAffinityGroupSecondary" : {
+          "type" : "string"
+        }
+      }
+    },
+    "BookieInfo" : {
+      "type" : "object",
+      "properties" : {
+        "hostname" : {
+          "type" : "string"
+        },
+        "rack" : {
+          "type" : "string"
+        }
+      }
+    },
+    "BookiesClusterInfo" : {
+      "type" : "object",
+      "properties" : {
+        "bookies" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/RawBookieInfo"
+          }
+        }
+      }
+    },
+    "BooleanBuilder" : {
+      "type" : "object"
+    },
+    "BrokerInfo" : {
+      "type" : "object",
+      "properties" : {
+        "serviceUrl" : {
+          "type" : "string"
+        }
+      }
+    },
+    "BrokerNamespaceIsolationData" : {
+      "type" : "object",
+      "properties" : {
+        "brokerName" : {
+          "type" : "string",
+          "example" : "broker1:8080",
+          "description" : "The broker name"
+        },
+        "policyName" : {
+          "type" : "string",
+          "example" : "my-policy",
+          "description" : "Policy name"
+        },
+        "namespaceRegex" : {
+          "type" : "array",
+          "description" : "The namespace-isolation policies attached to this broker",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "primary" : {
+          "type" : "boolean"
+        }
+      },
+      "description" : "The namespace isolation data for a given broker"
+    },
+    "BundlesData" : {
+      "type" : "object",
+      "properties" : {
+        "boundaries" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "numBundles" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "ByteBuilder" : {
+      "type" : "object"
+    },
+    "CharacterEscapes" : {
+      "type" : "object",
+      "properties" : {
+        "escapeCodesForAscii" : {
+          "type" : "array",
+          "items" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }
+      }
+    },
+    "ClassIntrospector" : {
+      "type" : "object"
+    },
+    "ClassLoader" : {
+      "type" : "object",
+      "properties" : {
+        "parent" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "unnamedModule" : {
+          "$ref" : "#/definitions/Module"
+        },
+        "registeredAsParallelCapable" : {
+          "type" : "boolean"
+        },
+        "definedPackages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Package"
+          }
+        }
+      }
+    },
+    "ClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "serviceUrl" : {
+          "type" : "string",
+          "example" : "http://pulsar.example.com:8080",
+          "description" : "The HTTP rest service URL (for admin operations)"
+        },
+        "serviceUrlTls" : {
+          "type" : "string",
+          "example" : "https://pulsar.example.com:8443",
+          "description" : "The HTTPS rest service URL (for admin operations)"
+        },
+        "brokerServiceUrl" : {
+          "type" : "string",
+          "example" : "pulsar://pulsar.example.com:6650",
+          "description" : "The broker service url (for produce and consume operations)"
+        },
+        "brokerServiceUrlTls" : {
+          "type" : "string",
+          "example" : "pulsar+ssl://pulsar.example.com:6651",
+          "description" : "The secured broker service url (for produce and consume operations)"
+        },
+        "proxyServiceUrl" : {
+          "type" : "string",
+          "example" : "pulsar+ssl://ats-proxy.example.com:4443 or pulsar://ats-proxy.example.com:4080",
+          "description" : "Proxy-service url when client would like to connect to broker via proxy."
+        },
+        "authenticationPlugin" : {
+          "type" : "string",
+          "example" : "org.apache.pulsar.client.impl.auth.AuthenticationToken",
+          "description" : "Authentication plugin when client would like to connect to cluster."
+        },
+        "authenticationParameters" : {
+          "type" : "string",
+          "description" : "Authentication parameters when client would like to connect to cluster."
+        },
+        "proxyProtocol" : {
+          "type" : "string",
+          "example" : "SNI",
+          "description" : "protocol to decide type of proxy routing eg: SNI-routing",
+          "enum" : [ "SNI" ]
+        },
+        "peerClusterNames" : {
+          "type" : "array",
+          "description" : "A set of peer cluster names",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "brokerClientTlsEnabled" : {
+          "type" : "boolean",
+          "description" : "Enable TLS when talking with other brokers in the same cluster (admin operation) or different clusters (replication)"
+        },
+        "tlsAllowInsecureConnection" : {
+          "type" : "boolean",
+          "description" : "Allow TLS connections to servers whose certificate cannot be be verified to have been signed by a trusted certificate authority."
+        },
+        "brokerClientTlsEnabledWithKeyStore" : {
+          "type" : "boolean",
+          "description" : "Whether internal client use KeyStore type to authenticate with other Pulsar brokers"
+        },
+        "brokerClientTlsTrustStoreType" : {
+          "type" : "string",
+          "example" : "JKS",
+          "description" : "TLS TrustStore type configuration for internal client: JKS, PKCS12 used by the internal client to authenticate with Pulsar brokers"
+        },
+        "brokerClientTlsTrustStore" : {
+          "type" : "string",
+          "description" : "TLS TrustStore path for internal client used by the internal client to authenticate with Pulsar brokers"
+        },
+        "brokerClientTlsTrustStorePassword" : {
+          "type" : "string",
+          "description" : "TLS TrustStore password for internal client used by the internal client to authenticate with Pulsar brokers"
+        },
+        "brokerClientTrustCertsFilePath" : {
+          "type" : "string",
+          "description" : "Path for the trusted TLS certificate file for outgoing connection to a server (broker)"
+        },
+        "listenerName" : {
+          "type" : "string",
+          "description" : "listenerName when client would like to connect to cluster"
+        }
+      },
+      "description" : "The configuration data for a cluster"
+    },
+    "CompactionStats" : {
+      "type" : "object",
+      "properties" : {
+        "lastCompactionRemovedEventCount" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastCompactionSucceedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastCompactionFailedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastCompactionDurationTimeInMills" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "CompletableFuture" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFuturePartitionedTopicMetadata" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureVoid" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ConnectorDefinition" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "description" : {
+          "type" : "string"
+        },
+        "sourceClass" : {
+          "type" : "string"
+        },
+        "sinkClass" : {
+          "type" : "string"
+        },
+        "sourceConfigClass" : {
+          "type" : "string"
+        },
+        "sinkConfigClass" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ConsumerStats" : {
+      "type" : "object",
+      "properties" : {
+        "chunkedMessageRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateRedeliver" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "messageAckRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "clientVersion" : {
+          "type" : "string"
+        },
+        "unackedMessages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "lastConsumedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastAckedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgMessagesPerEntry" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "blockedConsumerOnUnackedMsgs" : {
+          "type" : "boolean"
+        },
+        "readPositionWhenJoining" : {
+          "type" : "string"
+        },
+        "keyHashRanges" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "bytesOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "consumerName" : {
+          "type" : "string"
+        },
+        "connectedSince" : {
+          "type" : "string"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "availablePermits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "address" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ContextAttributes" : {
+      "type" : "object"
+    },
+    "Currency" : {
+      "type" : "object",
+      "properties" : {
+        "currencyCode" : {
+          "type" : "string"
+        },
+        "defaultFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numericCode" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "symbol" : {
+          "type" : "string"
+        },
+        "numericCodeAsString" : {
+          "type" : "string"
+        }
+      }
+    },
+    "CursorDetails" : {
+      "type" : "object",
+      "properties" : {
+        "cursorBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "CursorStats" : {
+      "type" : "object",
+      "properties" : {
+        "markDeletePosition" : {
+          "type" : "string"
+        },
+        "readPosition" : {
+          "type" : "string"
+        },
+        "waitingReadOp" : {
+          "type" : "boolean"
+        },
+        "pendingReadOps" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "messagesConsumedCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedger" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerLastEntry" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "individuallyDeletedMessages" : {
+          "type" : "string"
+        },
+        "lastLedgerSwitchTimestamp" : {
+          "type" : "string"
+        },
+        "state" : {
+          "type" : "string"
+        },
+        "numberOfEntriesSinceFirstNotAckedMessage" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "totalNonContiguousDeletedMessagesRange" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "subscriptionHavePendingRead" : {
+          "type" : "boolean"
+        },
+        "subscriptionHavePendingReplayRead" : {
+          "type" : "boolean"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        }
+      }
+    },
+    "DateFormat" : {
+      "type" : "object",
+      "properties" : {
+        "calendar" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "numberFormat" : {
+          "$ref" : "#/definitions/NumberFormat"
+        },
+        "lenient" : {
+          "type" : "boolean"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        }
+      }
+    },
+    "DelayedDeliveryPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "tickTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "active" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "DeleteSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "DeserializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "problemHandlers" : {
+          "$ref" : "#/definitions/LinkedNodeDeserializationProblemHandler"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializationContext" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "contextualType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "arrayBuilders" : {
+          "$ref" : "#/definitions/ArrayBuilders"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "parser" : {
+          "$ref" : "#/definitions/JsonParser"
+        },
+        "config" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/DeserializerFactory"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializerFactory" : {
+      "type" : "object"
+    },
+    "DispatchRate" : {
+      "type" : "object",
+      "properties" : {
+        "dispatchThrottlingRateInMsg" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "relativeToPublishRate" : {
+          "type" : "boolean"
+        },
+        "dispatchThrottlingRateInByte" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "ratePeriodInSecond" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "DispatchRateImpl" : {
+      "type" : "object",
+      "properties" : {
+        "dispatchThrottlingRateInMsg" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "dispatchThrottlingRateInByte" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "relativeToPublishRate" : {
+          "type" : "boolean"
+        },
+        "ratePeriodInSecond" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "DoubleBuilder" : {
+      "type" : "object"
+    },
+    "FailureDomain" : {
+      "type" : "object",
+      "properties" : {
+        "brokers" : {
+          "type" : "array",
+          "example" : "[ 'broker-1', 'broker-2' ]",
+          "description" : "The collection of brokers in the same failure domain",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "The data of a failure domain configuration in a cluster"
+    },
+    "FilterProvider" : {
+      "type" : "object"
+    },
+    "FloatBuilder" : {
+      "type" : "object"
+    },
+    "FormatSchema" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        }
+      }
+    },
+    "FunctionInstanceStatsData" : {
+      "type" : "object",
+      "properties" : {
+        "oneMin" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsDataBase"
+        },
+        "lastInvocation" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userMetrics" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "number",
+            "format" : "double"
+          }
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FunctionInstanceStatsDataBase" : {
+      "type" : "object",
+      "properties" : {
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "Functions" : {
+      "type" : "object",
+      "properties" : {
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "FunctionsV2" : {
+      "type" : "object",
+      "properties" : {
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "FunctionsV2WorkerService" : {
+      "type" : "object",
+      "properties" : {
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "FunctionsWorkerService" : {
+      "type" : "object",
+      "properties" : {
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "GetAllVersionsSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "getSchemaResponses" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/GetSchemaResponse"
+          }
+        }
+      }
+    },
+    "GetSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "type" : {
+          "type" : "string",
+          "enum" : [ "NONE", "STRING", "JSON", "PROTOBUF", "AVRO", "BOOLEAN", "INT8", "INT16", "INT32", "INT64", "FLOAT", "DOUBLE", "DATE", "TIME", "TIMESTAMP", "KEY_VALUE", "INSTANT", "LOCAL_DATE", "LOCAL_TIME", "LOCAL_DATE_TIME", "PROTOBUF_NATIVE", "BYTES", "AUTO", "AUTO_CONSUME", "AUTO_PUBLISH" ]
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "data" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "HandlerInstantiator" : {
+      "type" : "object"
+    },
+    "InactiveTopicPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "inactiveTopicDeleteMode" : {
+          "type" : "string",
+          "enum" : [ "delete_when_no_subscriptions", "delete_when_subscriptions_caught_up" ]
+        },
+        "maxInactiveDurationSeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "deleteWhileInactive" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "InjectableValues" : {
+      "type" : "object"
+    },
+    "InputDecorator" : {
+      "type" : "object"
+    },
+    "IntBuilder" : {
+      "type" : "object"
+    },
+    "InternalConfigurationData" : {
+      "type" : "object",
+      "properties" : {
+        "zookeeperServers" : {
+          "type" : "string"
+        },
+        "configurationStoreServers" : {
+          "type" : "string"
+        },
+        "metadataStoreUrl" : {
+          "type" : "string"
+        },
+        "configurationMetadataStoreUrl" : {
+          "type" : "string"
+        },
+        "ledgersRootPath" : {
+          "type" : "string"
+        },
+        "bookkeeperMetadataServiceUri" : {
+          "type" : "string"
+        },
+        "stateStorageServiceUrl" : {
+          "type" : "string"
+        }
+      }
+    },
+    "IsCompatibilityResponse" : {
+      "type" : "object",
+      "properties" : {
+        "schemaCompatibilityStrategy" : {
+          "type" : "string"
+        },
+        "compatibility" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JavaType" : {
+      "type" : "object",
+      "properties" : {
+        "containerType" : {
+          "type" : "boolean"
+        },
+        "collectionLikeType" : {
+          "type" : "boolean"
+        },
+        "mapLikeType" : {
+          "type" : "boolean"
+        },
+        "referencedType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "valueHandler" : {
+          "type" : "object"
+        },
+        "typeHandler" : {
+          "type" : "object"
+        },
+        "contentValueHandler" : {
+          "type" : "object"
+        },
+        "contentTypeHandler" : {
+          "type" : "object"
+        },
+        "erasedSignature" : {
+          "type" : "string"
+        },
+        "bindings" : {
+          "$ref" : "#/definitions/TypeBindings"
+        },
+        "keyType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "concrete" : {
+          "type" : "boolean"
+        },
+        "interface" : {
+          "type" : "boolean"
+        },
+        "primitive" : {
+          "type" : "boolean"
+        },
+        "interfaces" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        },
+        "genericSignature" : {
+          "type" : "string"
+        },
+        "final" : {
+          "type" : "boolean"
+        },
+        "abstract" : {
+          "type" : "boolean"
+        },
+        "contentType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "enumType" : {
+          "type" : "boolean"
+        },
+        "javaLangObject" : {
+          "type" : "boolean"
+        },
+        "arrayType" : {
+          "type" : "boolean"
+        },
+        "throwable" : {
+          "type" : "boolean"
+        },
+        "superClass" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "referenceType" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonFactory" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "formatName" : {
+          "type" : "string"
+        },
+        "inputDecorator" : {
+          "$ref" : "#/definitions/InputDecorator"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputDecorator" : {
+          "$ref" : "#/definitions/OutputDecorator"
+        },
+        "rootValueSeparator" : {
+          "type" : "string"
+        }
+      }
+    },
+    "JsonGenerator" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "prettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "outputTarget" : {
+          "type" : "object"
+        },
+        "highestEscapedChar" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "outputBuffered" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonLocation" : {
+      "type" : "object",
+      "properties" : {
+        "sourceRef" : {
+          "type" : "object"
+        },
+        "lineNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "columnNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "charOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "byteOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "JsonNodeFactory" : {
+      "type" : "object"
+    },
+    "JsonParser" : {
+      "type" : "object",
+      "properties" : {
+        "currentLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "binaryValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "typeId" : {
+          "type" : "object"
+        },
+        "inputSource" : {
+          "type" : "object"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "parsingContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "tokenLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentTokenId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "expectedStartArrayToken" : {
+          "type" : "boolean"
+        },
+        "expectedStartObjectToken" : {
+          "type" : "boolean"
+        },
+        "lastClearedToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "textOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numberValue" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "numberType" : {
+          "type" : "string",
+          "enum" : [ "INT", "LONG", "BIG_INTEGER", "FLOAT", "DOUBLE", "BIG_DECIMAL" ]
+        },
+        "bigIntegerValue" : {
+          "type" : "integer"
+        },
+        "decimalValue" : {
+          "type" : "number"
+        },
+        "embeddedObject" : {
+          "type" : "object"
+        },
+        "valueAsInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "valueAsLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "valueAsDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "valueAsBoolean" : {
+          "type" : "boolean"
+        },
+        "valueAsString" : {
+          "type" : "string"
+        },
+        "objectId" : {
+          "type" : "object"
+        },
+        "textCharacters" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "textLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        },
+        "text" : {
+          "type" : "string"
+        },
+        "booleanValue" : {
+          "type" : "boolean"
+        },
+        "byteValue" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "doubleValue" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "floatValue" : {
+          "type" : "number",
+          "format" : "float"
+        },
+        "longValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "shortValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "intValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "JsonSerializer" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonSerializerObject" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        },
+        "delegatee" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        }
+      }
+    },
+    "JsonStreamContext" : {
+      "type" : "object",
+      "properties" : {
+        "typeDesc" : {
+          "type" : "string"
+        },
+        "entryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "parent" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "currentIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "KubernetesContainerFactory" : {
+      "type" : "object",
+      "properties" : {
+        "k8Uri" : {
+          "type" : "string"
+        },
+        "jobNamespace" : {
+          "type" : "string"
+        },
+        "jobName" : {
+          "type" : "string"
+        },
+        "pulsarDockerImageName" : {
+          "type" : "string"
+        },
+        "functionDockerImages" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "imagePullPolicy" : {
+          "type" : "string"
+        },
+        "pulsarRootDir" : {
+          "type" : "string"
+        },
+        "configAdminCLI" : {
+          "type" : "string"
+        },
+        "submittingInsidePod" : {
+          "type" : "boolean"
+        },
+        "pulsarServiceUrl" : {
+          "type" : "string"
+        },
+        "pulsarAdminUrl" : {
+          "type" : "string"
+        },
+        "installUserCodeDependencies" : {
+          "type" : "boolean"
+        },
+        "pythonDependencyRepository" : {
+          "type" : "string"
+        },
+        "pythonExtraDependencyRepository" : {
+          "type" : "string"
+        },
+        "extraFunctionDependenciesDir" : {
+          "type" : "string"
+        },
+        "customLabels" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "expectedMetricsCollectionInterval" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "changeConfigMap" : {
+          "type" : "string"
+        },
+        "changeConfigMapNamespace" : {
+          "type" : "string"
+        },
+        "percentMemoryPadding" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cpuOverCommitRatio" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "memoryOverCommitRatio" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "grpcPort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "metricsPort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "narExtractionDirectory" : {
+          "type" : "string"
+        },
+        "functionInstanceClassPath" : {
+          "type" : "string"
+        },
+        "gracePeriodSeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "LedgerDetails" : {
+      "type" : "object",
+      "properties" : {
+        "entries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "size" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "ledgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "LedgerInfo" : {
+      "type" : "object",
+      "properties" : {
+        "ledgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "entries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "size" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offloaded" : {
+          "type" : "boolean"
+        },
+        "metadata" : {
+          "type" : "string"
+        },
+        "underReplicated" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "LinkedNode" : {
+      "type" : "object"
+    },
+    "LinkedNodeDeserializationProblemHandler" : {
+      "type" : "object"
+    },
+    "LoadReport" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "brokerVersionString" : {
+          "type" : "string"
+        },
+        "webServiceUrl" : {
+          "type" : "string"
+        },
+        "webServiceUrlTls" : {
+          "type" : "string"
+        },
+        "pulsarServiceUrl" : {
+          "type" : "string"
+        },
+        "pulsarServiceUrlTls" : {
+          "type" : "string"
+        },
+        "persistentTopicsEnabled" : {
+          "type" : "boolean"
+        },
+        "nonPersistentTopicsEnabled" : {
+          "type" : "boolean"
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "numTopics" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numConsumers" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numProducers" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numBundles" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "protocols" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "systemResourceUsage" : {
+          "$ref" : "#/definitions/SystemResourceUsage"
+        },
+        "bundleStats" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/NamespaceBundleStats"
+          }
+        },
+        "bundleGains" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "bundleLosses" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "allocatedCPU" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedMemory" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedBandwidthIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedBandwidthOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedMsgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedMsgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedCPU" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedMemory" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedBandwidthIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedBandwidthOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedMsgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedMsgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "underLoaded" : {
+          "type" : "boolean"
+        },
+        "overLoaded" : {
+          "type" : "boolean"
+        },
+        "loadReportType" : {
+          "type" : "string"
+        },
+        "cpu" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "memory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "directMemory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "bandwidthIn" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "bandwidthOut" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "lastUpdate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "Locale" : {
+      "type" : "object",
+      "properties" : {
+        "iso3Country" : {
+          "type" : "string"
+        },
+        "displayLanguage" : {
+          "type" : "string"
+        },
+        "displayScript" : {
+          "type" : "string"
+        },
+        "displayCountry" : {
+          "type" : "string"
+        },
+        "displayVariant" : {
+          "type" : "string"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "script" : {
+          "type" : "string"
+        },
+        "country" : {
+          "type" : "string"
+        },
+        "variant" : {
+          "type" : "string"
+        },
+        "extensionKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleAttributes" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "iso3Language" : {
+          "type" : "string"
+        },
+        "language" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongBuilder" : {
+      "type" : "object"
+    },
+    "LongRunningProcessStatus" : {
+      "type" : "object",
+      "properties" : {
+        "status" : {
+          "type" : "string",
+          "enum" : [ "NOT_RUN", "RUNNING", "SUCCESS", "ERROR" ]
+        },
+        "lastError" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongSchemaVersion" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "MemoryLimit" : {
+      "type" : "object",
+      "properties" : {
+        "absoluteValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "percentOfMaxDirectMemory" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "MessageId" : {
+      "type" : "object"
+    },
+    "Metrics" : {
+      "type" : "object",
+      "properties" : {
+        "metrics" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "dimensions" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "Module" : {
+      "type" : "object",
+      "properties" : {
+        "layer" : {
+          "$ref" : "#/definitions/ModuleLayer"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "descriptor" : {
+          "$ref" : "#/definitions/ModuleDescriptor"
+        },
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "named" : {
+          "type" : "boolean"
+        },
+        "packages" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ModuleDescriptor" : {
+      "type" : "object",
+      "properties" : {
+        "open" : {
+          "type" : "boolean"
+        },
+        "automatic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ModuleLayer" : {
+      "type" : "object"
+    },
+    "NamespaceBundleStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "consumerCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "producerCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "topics" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cacheSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "NamespaceIsolationData" : {
+      "type" : "object",
+      "properties" : {
+        "namespaces" : {
+          "type" : "array",
+          "description" : "The list of namespaces to apply this namespace isolation data",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "primary" : {
+          "type" : "array",
+          "description" : "The list of primary brokers for serving the list of namespaces in this isolation policy",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "secondary" : {
+          "type" : "array",
+          "description" : "The list of secondary brokers for serving the list of namespaces in this isolation policy",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "auto_failover_policy" : {
+          "example" : "{  \"policy_type\": \"min_available\"  \"parameters\": {    \"\": \"\"  }}",
+          "description" : "The data of auto-failover policy configuration",
+          "$ref" : "#/definitions/AutoFailoverPolicyData"
+        }
+      },
+      "description" : "The data of namespace isolation configuration"
+    },
+    "NamespaceOwnershipStatus" : {
+      "type" : "object",
+      "properties" : {
+        "broker_assignment" : {
+          "type" : "string",
+          "enum" : [ "primary", "secondary", "shared" ]
+        },
+        "is_controlled" : {
+          "type" : "boolean"
+        },
+        "is_active" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "NonPersistentPublisherStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "chunkedMessageRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "producerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "clientVersion" : {
+          "type" : "string"
+        },
+        "producerName" : {
+          "type" : "string"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "connectedSince" : {
+          "type" : "string"
+        },
+        "supportsPartialProducer" : {
+          "type" : "boolean"
+        },
+        "accessMode" : {
+          "type" : "string",
+          "enum" : [ "Shared", "Exclusive", "WaitForExclusive" ]
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "address" : {
+          "type" : "string"
+        }
+      }
+    },
+    "NonPersistentReplicatorStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "replicationBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "inboundConnection" : {
+          "type" : "string"
+        },
+        "inboundConnectedSince" : {
+          "type" : "string"
+        },
+        "outboundConnection" : {
+          "type" : "string"
+        },
+        "outboundConnectedSince" : {
+          "type" : "string"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "replicationDelayInSeconds" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "connected" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "NonPersistentSubscriptionStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "consumers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConsumerStats"
+          }
+        },
+        "subscriptionProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "chunkedMessageRate" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "msgRateRedeliver" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "messageAckRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "earliestMsgPublishTimeInBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgBacklogNoDelayed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "blockedSubscriptionOnUnackedMsgs" : {
+          "type" : "boolean"
+        },
+        "msgDelayed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "unackedMessages" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "activeConsumerName" : {
+          "type" : "string"
+        },
+        "totalMsgExpired" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastExpireTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastConsumedFlowTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastConsumedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastAckedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastMarkDeleteAdvancedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "consumersAfterMarkDeletePosition" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "backlogSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "replicated" : {
+          "type" : "boolean"
+        },
+        "durable" : {
+          "type" : "boolean"
+        },
+        "bytesOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "nonContiguousDeletedMessagesRanges" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "nonContiguousDeletedMessagesRangesSerializedSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "allowOutOfOrderDelivery" : {
+          "type" : "boolean"
+        },
+        "keySharedMode" : {
+          "type" : "string"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "type" : {
+          "type" : "string"
+        }
+      }
+    },
+    "NonPersistentTopicStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "publishers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/NonPersistentPublisherStats"
+          }
+        },
+        "replication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/NonPersistentReplicatorStats"
+          }
+        },
+        "subscriptions" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/NonPersistentSubscriptionStats"
+          }
+        },
+        "backlogSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "bytesInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "bytesOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgChunkPublished" : {
+          "type" : "boolean"
+        },
+        "storageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "earliestMsgPublishTimeInBacklogs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offloadedStorageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "waitingPublishers" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "deduplicationStatus" : {
+          "type" : "string"
+        },
+        "topicEpoch" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "nonContiguousDeletedMessagesRanges" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "nonContiguousDeletedMessagesRangesSerializedSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "compaction" : {
+          "$ref" : "#/definitions/CompactionStats"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "Number" : {
+      "type" : "object"
+    },
+    "NumberFormat" : {
+      "type" : "object",
+      "properties" : {
+        "groupingUsed" : {
+          "type" : "boolean"
+        },
+        "parseIntegerOnly" : {
+          "type" : "boolean"
+        },
+        "maximumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maximumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currency" : {
+          "$ref" : "#/definitions/Currency"
+        },
+        "roundingMode" : {
+          "type" : "string",
+          "enum" : [ "UP", "DOWN", "CEILING", "FLOOR", "HALF_UP", "HALF_DOWN", "HALF_EVEN", "UNNECESSARY" ]
+        }
+      }
+    },
+    "ObjectCodec" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "ObjectMapper" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "serializationConfig" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "deserializationConfig" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "deserializationContext" : {
+          "$ref" : "#/definitions/DeserializationContext"
+        },
+        "serializerFactory" : {
+          "$ref" : "#/definitions/SerializerFactory"
+        },
+        "serializerProvider" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "serializerProviderInstance" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "visibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "injectableValues" : {
+          "$ref" : "#/definitions/InjectableValues"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "OffloadPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "managedLedgerOffloadDriver" : {
+          "type" : "string"
+        },
+        "offloadersDirectory" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadMaxThreads" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerOffloadThresholdInBytes" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "managedLedgerOffloadDeletionLagInMillis" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "managedLedgerOffloadPrefetchRounds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "s3ManagedLedgerOffloadCredentialSecret" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadRole" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadRoleSessionName" : {
+          "type" : "string"
+        },
+        "gcsManagedLedgerOffloadRegion" : {
+          "type" : "string"
+        },
+        "gcsManagedLedgerOffloadBucket" : {
+          "type" : "string"
+        },
+        "gcsManagedLedgerOffloadMaxBlockSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "gcsManagedLedgerOffloadReadBufferSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "gcsManagedLedgerOffloadServiceAccountKeyFile" : {
+          "type" : "string"
+        },
+        "fileSystemProfilePath" : {
+          "type" : "string"
+        },
+        "fileSystemURI" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadBucket" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadRegion" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadServiceEndpoint" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadMaxBlockSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerOffloadReadBufferSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerOffloadedReadPriority" : {
+          "type" : "string",
+          "enum" : [ "BOOKKEEPER_FIRST", "TIERED_STORAGE_FIRST" ]
+        },
+        "s3ManagedLedgerOffloadRegion" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadBucket" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadServiceEndpoint" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadMaxBlockSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "s3ManagedLedgerOffloadReadBufferSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "s3ManagedLedgerOffloadCredentialId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "OffloadPoliciesImpl" : {
+      "type" : "object",
+      "properties" : {
+        "offloadersDirectory" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadDriver" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadMaxThreads" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerOffloadPrefetchRounds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerOffloadThresholdInBytes" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "managedLedgerOffloadDeletionLagInMillis" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "managedLedgerOffloadedReadPriority" : {
+          "type" : "string",
+          "enum" : [ "BOOKKEEPER_FIRST", "TIERED_STORAGE_FIRST" ]
+        },
+        "s3ManagedLedgerOffloadRegion" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadBucket" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadServiceEndpoint" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadMaxBlockSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "s3ManagedLedgerOffloadReadBufferSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "s3ManagedLedgerOffloadCredentialId" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadCredentialSecret" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadRole" : {
+          "type" : "string"
+        },
+        "s3ManagedLedgerOffloadRoleSessionName" : {
+          "type" : "string"
+        },
+        "gcsManagedLedgerOffloadRegion" : {
+          "type" : "string"
+        },
+        "gcsManagedLedgerOffloadBucket" : {
+          "type" : "string"
+        },
+        "gcsManagedLedgerOffloadMaxBlockSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "gcsManagedLedgerOffloadReadBufferSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "gcsManagedLedgerOffloadServiceAccountKeyFile" : {
+          "type" : "string"
+        },
+        "fileSystemProfilePath" : {
+          "type" : "string"
+        },
+        "fileSystemURI" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadBucket" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadRegion" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadServiceEndpoint" : {
+          "type" : "string"
+        },
+        "managedLedgerOffloadMaxBlockSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerOffloadReadBufferSizeInBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "s3Driver" : {
+          "type" : "boolean"
+        },
+        "gcsDriver" : {
+          "type" : "boolean"
+        },
+        "fileSystemDriver" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "OutputDecorator" : {
+      "type" : "object"
+    },
+    "OutputStream" : {
+      "type" : "object"
+    },
+    "Package" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "specificationTitle" : {
+          "type" : "string"
+        },
+        "specificationVersion" : {
+          "type" : "string"
+        },
+        "specificationVendor" : {
+          "type" : "string"
+        },
+        "implementationTitle" : {
+          "type" : "string"
+        },
+        "implementationVersion" : {
+          "type" : "string"
+        },
+        "implementationVendor" : {
+          "type" : "string"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "sealed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "PartitionedTopicMetadata" : {
+      "type" : "object",
+      "properties" : {
+        "partitions" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "PendingBookieOpsStats" : {
+      "type" : "object",
+      "properties" : {
+        "dataLedgerOpenOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dataLedgerCloseOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dataLedgerCreateOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dataLedgerDeleteOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerOpenOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerCloseOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerCreateOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerDeleteOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "PersistencePolicies" : {
+      "type" : "object",
+      "properties" : {
+        "bookkeeperEnsemble" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "bookkeeperWriteQuorum" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "bookkeeperAckQuorum" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerMaxMarkDeleteRate" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "PersistentOfflineTopicStats" : {
+      "type" : "object",
+      "properties" : {
+        "storageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "totalMessages" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "messageBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "brokerName" : {
+          "type" : "string"
+        },
+        "topicName" : {
+          "type" : "string"
+        },
+        "dataLedgerDetails" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/LedgerDetails"
+          }
+        },
+        "cursorDetails" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/CursorDetails"
+          }
+        },
+        "statGeneratedAt" : {
+          "type" : "string",
+          "format" : "date-time"
+        }
+      }
+    },
+    "PersistentTopicInternalStats" : {
+      "type" : "object",
+      "properties" : {
+        "entriesAddedCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numberOfEntries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "totalSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "currentLedgerEntries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "currentLedgerSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastLedgerCreatedTimestamp" : {
+          "type" : "string"
+        },
+        "lastLedgerCreationFailureTimestamp" : {
+          "type" : "string"
+        },
+        "waitingCursorsCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "pendingAddEntriesCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "lastConfirmedEntry" : {
+          "type" : "string"
+        },
+        "state" : {
+          "type" : "string"
+        },
+        "ledgers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/LedgerInfo"
+          }
+        },
+        "cursors" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/CursorStats"
+          }
+        },
+        "schemaLedgers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/LedgerInfo"
+          }
+        },
+        "compactedLedger" : {
+          "$ref" : "#/definitions/LedgerInfo"
+        }
+      }
+    },
+    "Policies" : {
+      "type" : "object",
+      "properties" : {
+        "auth_policies" : {
+          "$ref" : "#/definitions/AuthPolicies"
+        },
+        "replication_clusters" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "bundles" : {
+          "$ref" : "#/definitions/BundlesData"
+        },
+        "backlog_quota_map" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/BacklogQuota"
+          }
+        },
+        "clusterDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        },
+        "topicDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        },
+        "subscriptionDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        },
+        "replicatorDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRateImpl"
+          }
+        },
+        "clusterSubscribeRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        },
+        "persistence" : {
+          "$ref" : "#/definitions/PersistencePolicies"
+        },
+        "deduplicationEnabled" : {
+          "type" : "boolean"
+        },
+        "autoTopicCreationOverride" : {
+          "$ref" : "#/definitions/AutoTopicCreationOverride"
+        },
+        "autoSubscriptionCreationOverride" : {
+          "$ref" : "#/definitions/AutoSubscriptionCreationOverride"
+        },
+        "publishMaxMessageRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/PublishRate"
+          }
+        },
+        "latency_stats_sample_rate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        },
+        "message_ttl_in_seconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "subscription_expiration_time_minutes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "retention_policies" : {
+          "$ref" : "#/definitions/RetentionPolicies"
+        },
+        "deleted" : {
+          "type" : "boolean"
+        },
+        "encryption_required" : {
+          "type" : "boolean"
+        },
+        "delayed_delivery_policies" : {
+          "$ref" : "#/definitions/DelayedDeliveryPolicies"
+        },
+        "inactive_topic_policies" : {
+          "$ref" : "#/definitions/InactiveTopicPolicies"
+        },
+        "subscription_auth_mode" : {
+          "type" : "string",
+          "enum" : [ "None", "Prefix" ]
+        },
+        "max_producers_per_topic" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_consumers_per_topic" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_consumers_per_subscription" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_unacked_messages_per_consumer" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_unacked_messages_per_subscription" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_subscriptions_per_topic" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "compaction_threshold" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offload_threshold" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offload_deletion_lag_ms" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "max_topics_per_namespace" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema_auto_update_compatibility_strategy" : {
+          "type" : "string",
+          "enum" : [ "AutoUpdateDisabled", "Backward", "Forward", "Full", "AlwaysCompatible", "BackwardTransitive", "ForwardTransitive", "FullTransitive" ]
+        },
+        "schema_compatibility_strategy" : {
+          "type" : "string",
+          "enum" : [ "UNDEFINED", "ALWAYS_INCOMPATIBLE", "ALWAYS_COMPATIBLE", "BACKWARD", "FORWARD", "FULL", "BACKWARD_TRANSITIVE", "FORWARD_TRANSITIVE", "FULL_TRANSITIVE" ]
+        },
+        "is_allow_auto_update_schema" : {
+          "type" : "boolean"
+        },
+        "schema_validation_enforced" : {
+          "type" : "boolean"
+        },
+        "offload_policies" : {
+          "$ref" : "#/definitions/OffloadPolicies"
+        },
+        "deduplicationSnapshotIntervalSeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "subscription_types_enabled" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "resource_group_name" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PoolArenaStats" : {
+      "type" : "object",
+      "properties" : {
+        "numSmallSubpages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numChunkLists" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "smallSubpages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolSubpageStats"
+          }
+        },
+        "chunkLists" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolChunkListStats"
+          }
+        },
+        "numAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSmallAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numNormalAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numHugeAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSmallDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numNormalDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numHugeDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveSmallAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveNormalAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveHugeAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "PoolChunkListStats" : {
+      "type" : "object",
+      "properties" : {
+        "minUsage" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maxUsage" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "chunks" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolChunkStats"
+          }
+        }
+      }
+    },
+    "PoolChunkStats" : {
+      "type" : "object",
+      "properties" : {
+        "usage" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "chunkSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "freeBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "PoolSubpageStats" : {
+      "type" : "object",
+      "properties" : {
+        "maxNumElements" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numAvailable" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "elementSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "pageSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "PostSchemaPayload" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "schema" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "PostSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "$ref" : "#/definitions/SchemaVersion"
+        }
+      }
+    },
+    "PrettyPrinter" : {
+      "type" : "object"
+    },
+    "Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ProcessContainerFactory" : {
+      "type" : "object",
+      "properties" : {
+        "javaInstanceJarLocation" : {
+          "type" : "string"
+        },
+        "pythonInstanceLocation" : {
+          "type" : "string"
+        },
+        "logDirectory" : {
+          "type" : "string"
+        },
+        "extraFunctionDependenciesDir" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyName" : {
+      "type" : "object",
+      "properties" : {
+        "namespace" : {
+          "type" : "string"
+        },
+        "empty" : {
+          "type" : "boolean"
+        },
+        "simpleName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyNamingStrategy" : {
+      "type" : "object"
+    },
+    "PublicKey" : {
+      "type" : "object",
+      "properties" : {
+        "algorithm" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "format" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PublishRate" : {
+      "type" : "object",
+      "properties" : {
+        "publishThrottlingRateInMsg" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "publishThrottlingRateInByte" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "PublisherStats" : {
+      "type" : "object",
+      "properties" : {
+        "chunkedMessageRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "producerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "clientVersion" : {
+          "type" : "string"
+        },
+        "producerName" : {
+          "type" : "string"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "connectedSince" : {
+          "type" : "string"
+        },
+        "supportsPartialProducer" : {
+          "type" : "boolean"
+        },
+        "accessMode" : {
+          "type" : "string",
+          "enum" : [ "Shared", "Exclusive", "WaitForExclusive" ]
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "address" : {
+          "type" : "string"
+        }
+      }
+    },
+    "RawBookieInfo" : {
+      "type" : "object",
+      "properties" : {
+        "bookieId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ReplicatorStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "replicationBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "inboundConnection" : {
+          "type" : "string"
+        },
+        "inboundConnectedSince" : {
+          "type" : "string"
+        },
+        "outboundConnection" : {
+          "type" : "string"
+        },
+        "outboundConnectedSince" : {
+          "type" : "string"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "replicationDelayInSeconds" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "connected" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ResetCursorData" : {
+      "type" : "object",
+      "properties" : {
+        "ledgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "entryId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "partitionIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "batchIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "excluded" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ResourceDescription" : {
+      "type" : "object",
+      "properties" : {
+        "usagePct" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "resourceUsage" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ResourceUsage"
+          }
+        }
+      }
+    },
+    "ResourceGroup" : {
+      "type" : "object",
+      "properties" : {
+        "publishRateInMsgs" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "publishRateInBytes" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dispatchRateInMsgs" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "dispatchRateInBytes" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "ResourceQuota" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "bandwidthIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "bandwidthOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "memory" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "dynamic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ResourceUnit" : {
+      "type" : "object",
+      "properties" : {
+        "availableResource" : {
+          "$ref" : "#/definitions/ResourceDescription"
+        },
+        "resourceId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ResourceUsage" : {
+      "type" : "object",
+      "properties" : {
+        "usage" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "limit" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "RetentionPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "retentionTimeInMinutes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "retentionSizeInMB" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "SchemaVersion" : {
+      "type" : "object"
+    },
+    "SerializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "defaultPrettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "serializationInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "serializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "SerializerFactory" : {
+      "type" : "object"
+    },
+    "SerializerProvider" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "defaultNullKeySerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "defaultNullValueSerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "config" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        },
+        "generator" : {
+          "$ref" : "#/definitions/JsonGenerator"
+        }
+      }
+    },
+    "ShortBuilder" : {
+      "type" : "object"
+    },
+    "Sinks" : {
+      "type" : "object",
+      "properties" : {
+        "sinkList" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        },
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "SinksWorkerService" : {
+      "type" : "object",
+      "properties" : {
+        "sinkList" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        },
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "SocketAddress" : {
+      "type" : "object"
+    },
+    "Sources" : {
+      "type" : "object",
+      "properties" : {
+        "sourceList" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        },
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "SourcesWorkerService" : {
+      "type" : "object",
+      "properties" : {
+        "sourceList" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        },
+        "listOfConnectors" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConnectorDefinition"
+          }
+        }
+      }
+    },
+    "SubscribeRate" : {
+      "type" : "object",
+      "properties" : {
+        "subscribeThrottlingRatePerConsumer" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "ratePeriodInSecond" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "SubscriptionStats" : {
+      "type" : "object",
+      "properties" : {
+        "consumers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConsumerStats"
+          }
+        },
+        "subscriptionProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "chunkedMessageRate" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "msgRateRedeliver" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "messageAckRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "earliestMsgPublishTimeInBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgBacklogNoDelayed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "blockedSubscriptionOnUnackedMsgs" : {
+          "type" : "boolean"
+        },
+        "msgDelayed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "unackedMessages" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "activeConsumerName" : {
+          "type" : "string"
+        },
+        "totalMsgExpired" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastExpireTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastConsumedFlowTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastConsumedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastAckedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastMarkDeleteAdvancedTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "consumersAfterMarkDeletePosition" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "backlogSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "replicated" : {
+          "type" : "boolean"
+        },
+        "durable" : {
+          "type" : "boolean"
+        },
+        "bytesOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "nonContiguousDeletedMessagesRanges" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "nonContiguousDeletedMessagesRangesSerializedSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "allowOutOfOrderDelivery" : {
+          "type" : "boolean"
+        },
+        "keySharedMode" : {
+          "type" : "string"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "type" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SubtypeResolver" : {
+      "type" : "object"
+    },
+    "SystemResourceUsage" : {
+      "type" : "object",
+      "properties" : {
+        "bandwidthIn" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "bandwidthOut" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "cpu" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "memory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "directMemory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        }
+      }
+    },
+    "TenantInfo" : {
+      "type" : "object",
+      "properties" : {
+        "adminRoles" : {
+          "type" : "array",
+          "description" : "Comma separated list of auth principal allowed to administrate the tenant.",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "allowedClusters" : {
+          "type" : "array",
+          "description" : "Comma separated allowed clusters.",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "Information of adminRoles and allowedClusters for tenant"
+    },
+    "ThreadContainerFactory" : {
+      "type" : "object",
+      "properties" : {
+        "threadGroupName" : {
+          "type" : "string"
+        },
+        "pulsarClientMemoryLimit" : {
+          "$ref" : "#/definitions/MemoryLimit"
+        }
+      }
+    },
+    "TimeZone" : {
+      "type" : "object",
+      "properties" : {
+        "id" : {
+          "type" : "string"
+        },
+        "dstsavings" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "rawOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "TopicStats" : {
+      "type" : "object",
+      "properties" : {
+        "backlogSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "publishers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PublisherStats"
+          }
+        },
+        "replication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ReplicatorStats"
+          }
+        },
+        "bytesInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "bytesOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgOutCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgChunkPublished" : {
+          "type" : "boolean"
+        },
+        "storageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "earliestMsgPublishTimeInBacklogs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offloadedStorageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "waitingPublishers" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "deduplicationStatus" : {
+          "type" : "string"
+        },
+        "topicEpoch" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "nonContiguousDeletedMessagesRanges" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "nonContiguousDeletedMessagesRangesSerializedSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "compaction" : {
+          "$ref" : "#/definitions/CompactionStats"
+        },
+        "subscriptions" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/SubscriptionStats"
+          }
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "TypeBindings" : {
+      "type" : "object",
+      "properties" : {
+        "empty" : {
+          "type" : "boolean"
+        },
+        "typeParameters" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        }
+      }
+    },
+    "TypeFactory" : {
+      "type" : "object",
+      "properties" : {
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        }
+      }
+    },
+    "Value" : {
+      "type" : "object",
+      "properties" : {
+        "contentInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "valueInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        }
+      }
+    },
+    "VisibilityChecker" : {
+      "type" : "object"
+    },
+    "VisibilityCheckerObject" : {
+      "type" : "object"
+    },
+    "WorkerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "workerId" : {
+          "type" : "string"
+        },
+        "workerHostname" : {
+          "type" : "string"
+        },
+        "workerPort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "workerPortTls" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "authenticateMetricsEndpoint" : {
+          "type" : "boolean"
+        },
+        "includeStandardPrometheusMetrics" : {
+          "type" : "boolean"
+        },
+        "jvmGCMetricsLoggerClassName" : {
+          "type" : "string"
+        },
+        "numHttpServerThreads" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "httpRequestsLimitEnabled" : {
+          "type" : "boolean"
+        },
+        "httpRequestsMaxPerSecond" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "configurationStoreServers" : {
+          "type" : "string"
+        },
+        "configurationMetadataStoreUrl" : {
+          "type" : "string"
+        },
+        "metadataStoreSessionTimeoutMillis" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "metadataStoreOperationTimeoutSeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "metadataStoreCacheExpirySeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "zooKeeperSessionTimeoutMillis" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "zooKeeperOperationTimeoutSeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "zooKeeperCacheExpirySeconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "connectorsDirectory" : {
+          "type" : "string"
+        },
+        "narExtractionDirectory" : {
+          "type" : "string"
+        },
+        "validateConnectorConfig" : {
+          "type" : "boolean"
+        },
+        "uploadBuiltinSinksSources" : {
+          "type" : "boolean"
+        },
+        "functionsDirectory" : {
+          "type" : "string"
+        },
+        "functionMetadataTopicName" : {
+          "type" : "string"
+        },
+        "useCompactedMetadataTopic" : {
+          "type" : "boolean"
+        },
+        "functionWebServiceUrl" : {
+          "type" : "string"
+        },
+        "pulsarServiceUrl" : {
+          "type" : "string"
+        },
+        "pulsarWebServiceUrl" : {
+          "type" : "string"
+        },
+        "clusterCoordinationTopicName" : {
+          "type" : "string"
+        },
+        "pulsarFunctionsNamespace" : {
+          "type" : "string"
+        },
+        "pulsarFunctionsCluster" : {
+          "type" : "string"
+        },
+        "numFunctionPackageReplicas" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "downloadDirectory" : {
+          "type" : "string"
+        },
+        "stateStorageServiceUrl" : {
+          "type" : "string"
+        },
+        "stateStorageProviderImplementation" : {
+          "type" : "string"
+        },
+        "functionAssignmentTopicName" : {
+          "type" : "string"
+        },
+        "schedulerClassName" : {
+          "type" : "string"
+        },
+        "failureCheckFreqMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "rescheduleTimeoutMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "rebalanceCheckFreqSec" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerListProbeIntervalSec" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "initialBrokerReconnectMaxRetries" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "assignmentWriteMaxRetries" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instanceLivenessCheckFreqMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "brokerClientAuthenticationEnabled" : {
+          "type" : "boolean"
+        },
+        "brokerClientAuthenticationPlugin" : {
+          "type" : "string"
+        },
+        "brokerClientAuthenticationParameters" : {
+          "type" : "string"
+        },
+        "bookkeeperClientAuthenticationPlugin" : {
+          "type" : "string"
+        },
+        "bookkeeperClientAuthenticationParametersName" : {
+          "type" : "string"
+        },
+        "bookkeeperClientAuthenticationParameters" : {
+          "type" : "string"
+        },
+        "topicCompactionFrequencySec" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "tlsEnabled" : {
+          "type" : "boolean"
+        },
+        "tlsCertificateFilePath" : {
+          "type" : "string"
+        },
+        "tlsKeyFilePath" : {
+          "type" : "string"
+        },
+        "tlsTrustCertsFilePath" : {
+          "type" : "string"
+        },
+        "tlsAllowInsecureConnection" : {
+          "type" : "boolean"
+        },
+        "tlsRequireTrustedClientCertOnConnect" : {
+          "type" : "boolean"
+        },
+        "useTls" : {
+          "type" : "boolean"
+        },
+        "tlsEnableHostnameVerification" : {
+          "type" : "boolean"
+        },
+        "tlsCertRefreshCheckDurationSec" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "tlsEnabledWithKeyStore" : {
+          "type" : "boolean"
+        },
+        "tlsProvider" : {
+          "type" : "string"
+        },
+        "tlsKeyStoreType" : {
+          "type" : "string"
+        },
+        "tlsKeyStore" : {
+          "type" : "string"
+        },
+        "tlsKeyStorePassword" : {
+          "type" : "string"
+        },
+        "tlsTrustStoreType" : {
+          "type" : "string"
+        },
+        "tlsTrustStore" : {
+          "type" : "string"
+        },
+        "tlsTrustStorePassword" : {
+          "type" : "string"
+        },
+        "webServiceTlsProtocols" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "webServiceTlsCiphers" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "authenticationEnabled" : {
+          "type" : "boolean"
+        },
+        "authenticationProviders" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "authorizationEnabled" : {
+          "type" : "boolean"
+        },
+        "authorizationProvider" : {
+          "type" : "string"
+        },
+        "superUserRoles" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "initializedDlogMetadata" : {
+          "type" : "boolean"
+        },
+        "brokerClientTrustCertsFilePath" : {
+          "type" : "string"
+        },
+        "functionRuntimeFactoryClassName" : {
+          "type" : "string"
+        },
+        "functionRuntimeFactoryConfigs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secretsProviderConfiguratorClassName" : {
+          "type" : "string"
+        },
+        "secretsProviderConfiguratorConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "functionInstanceMinResources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "functionInstanceMaxResources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "functionInstanceResourceGranularities" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "functionInstanceResourceChangeInLockStep" : {
+          "type" : "boolean"
+        },
+        "functionAuthProviderClassName" : {
+          "type" : "string"
+        },
+        "runtimeCustomizerClassName" : {
+          "type" : "string"
+        },
+        "runtimeCustomizerConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "maxPendingAsyncRequests" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "forwardSourceMessageProperty" : {
+          "type" : "boolean"
+        },
+        "additionalJavaRuntimeArguments" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "functionsWorkerServiceNarPackage" : {
+          "type" : "string"
+        },
+        "functionsWorkerServiceCustomConfigs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "exposeAdminClientEnabled" : {
+          "type" : "boolean"
+        },
+        "threadContainerFactory" : {
+          "$ref" : "#/definitions/ThreadContainerFactory"
+        },
+        "processContainerFactory" : {
+          "$ref" : "#/definitions/ProcessContainerFactory"
+        },
+        "kubernetesContainerFactory" : {
+          "$ref" : "#/definitions/KubernetesContainerFactory"
+        },
+        "clientAuthenticationParameters" : {
+          "type" : "string"
+        },
+        "clientAuthenticationPlugin" : {
+          "type" : "string"
+        },
+        "clusterCoordinationTopic" : {
+          "type" : "string"
+        },
+        "workerWebAddressTls" : {
+          "type" : "string"
+        },
+        "tlsTrustChainBytes" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "functionAssignmentTopic" : {
+          "type" : "string"
+        },
+        "workerWebAddress" : {
+          "type" : "string"
+        },
+        "functionMetadataTopic" : {
+          "type" : "string"
+        }
+      }
+    },
+    "WorkerFunctionInstanceStats" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "metrics" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsData"
+        }
+      }
+    },
+    "WorkerInfo" : {
+      "type" : "object",
+      "properties" : {
+        "workerId" : {
+          "type" : "string"
+        },
+        "workerHostname" : {
+          "type" : "string"
+        },
+        "port" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "WorkerService" : {
+      "type" : "object",
+      "properties" : {
+        "workers" : {
+          "$ref" : "#/definitions/WorkersWorkerService"
+        },
+        "workerConfig" : {
+          "$ref" : "#/definitions/WorkerConfig"
+        },
+        "functionsV2" : {
+          "$ref" : "#/definitions/FunctionsV2WorkerService"
+        },
+        "sinks" : {
+          "$ref" : "#/definitions/SinksWorkerService"
+        },
+        "initialized" : {
+          "type" : "boolean"
+        },
+        "sources" : {
+          "$ref" : "#/definitions/SourcesWorkerService"
+        },
+        "functions" : {
+          "$ref" : "#/definitions/FunctionsWorkerService"
+        }
+      }
+    },
+    "Workers" : {
+      "type" : "object"
+    },
+    "WorkersWorkerService" : {
+      "type" : "object"
+    },
+    "X500Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        }
+      }
+    },
+    "X509Certificate" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "subjectX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "issuerX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "subjectAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "issuerAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "keyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "tbscertificate" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "sigAlgOID" : {
+          "type" : "string"
+        },
+        "sigAlgParams" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "issuerUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "subjectUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "extendedKeyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "issuerDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "subjectDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "signature" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "basicConstraints" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "sigAlgName" : {
+          "type" : "string"
+        },
+        "serialNumber" : {
+          "type" : "integer"
+        },
+        "notBefore" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "notAfter" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "criticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "nonCriticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "publicKey" : {
+          "$ref" : "#/definitions/PublicKey"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.10.2/swaggerfunctions.json b/site2/website/static/swagger/2.10.2/swaggerfunctions.json
new file mode 100644
index 0000000000000..d7c94e24c18aa
--- /dev/null
+++ b/site2/website/static/swagger/2.10.2/swaggerfunctions.json
@@ -0,0 +1,3096 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Functions operations",
+    "version" : "v3",
+    "title" : "Pulsar Functions REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "functions"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/functions/connectors" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Fetches a list of supported Pulsar IO connectors currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getConnectorsList",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        },
+        "deprecated" : true
+      }
+    },
+    "/functions/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Lists all Pulsar Functions currently deployed in a given namespace",
+        "description" : "",
+        "operationId" : "listFunctions",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Fetches information about a Pulsar Function currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getFunctionInfo",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionConfig"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Creates a new Pulsar Function in cluster mode",
+        "description" : "",
+        "operationId" : "registerFunction",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "You can submit a function (in any languages that you are familiar with) \nto a Pulsar cluster. Follow the steps below. \n1. Create a JSON object using some of the following parameters.\nA JSON value presenting configuration payload of a Pulsar Function.\n An example of the expected Pulsar Function can be found here.\n- **autoAck**\n  Whether or not the framework acknowledges messages automatically.\n- **runtime**\n  What is the runtime of the Pulsar Function. Possible Values: [JAVA, PYTHON, GO]\n- **resources**\n  The size of the system resources allowed by the Pulsar Function runtime. The resources include: cpu, ram, disk.\n- **className**\n  The class name of a Pulsar Function.\n- **customSchemaInputs**\n  The map of input topics to Schema class names (specified as a JSON object).\n- **customSerdeInputs**\n  The map of input topics to SerDe class names (specified as a JSON object).\n- **deadLetterTopic**\n  Messages that are not processed successfully are sent to `deadLetterTopic`.\n- **runtimeFlags**\n  Any flags that you want to pass to the runtime. Note that in thread mode, these flags have no impact.\n- **fqfn**\n  The Fully Qualified Function Name (FQFN) for the Pulsar Function.\n- **inputSpecs**\n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}\n- **inputs**\n  The input topic or topics (multiple topics can be specified as a comma-separated list) of a Pulsar Function.\n- **jar**\n  Path to the JAR file for the Pulsar Function (if the Pulsar Function is written in Java).   It also supports URL path [http/https/file (file protocol assumes that file   already exists on worker host)] from which worker can download the package.\n- **py**\n  Path to the main Python file or Python wheel file for the Pulsar Function (if the Pulsar Function is written in Python).\n- **go**\n  Path to the main Go executable binary for the Pulsar Function (if the Pulsar Function is written in Go).\n- **logTopic**\n  The topic to which the logs of a Pulsar Function are produced.\n- **maxMessageRetries**\n  How many times should we try to process a message before giving up.\n- **output**\n  The output topic of a Pulsar Function (If none is specified, no output is written).\n- **outputSerdeClassName**\n  The SerDe class to be used for messages output by the Pulsar Function.\n- **parallelism**\n  The parallelism factor of a Pulsar Function (i.e. the number of a Pulsar Function instances to run).\n- **processingGuarantees**\n  The processing guarantees (that is, delivery semantics) applied to the Pulsar Function.  Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]\n- **retainOrdering**\n  Function consumes and processes messages in order.\n- **outputSchemaType**\n   Represents either a builtin schema type (for example: 'avro', 'json', ect) or the class name for a Schema implementation.- **subName**\n  Pulsar source subscription name. User can specify a subscription-name for the input-topic consumer.\n- **windowConfig**\n  The window configuration of a Pulsar Function.\n- **timeoutMs**\n  The message timeout in milliseconds.\n- **topicsPattern**\n  The topic pattern to consume from a list of topics under a namespace that match the pattern.  [input] and [topic-pattern] are mutually exclusive. Add SerDe class name for a   pattern in customSerdeInputs (supported for java fun only)\n- **userConfig**\n  A map of user-defined configurations (specified as a JSON object).\n- **secrets**\n  This is a map of secretName(that is how the secret is going to be accessed in the Pulsar Function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **cleanupSubscription**\n  Whether the subscriptions of a Pulsar Function created or used should be deleted when the Pulsar Function is deleted.\n2. Encapsulate the JSON object to a multipart object.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/FunctionConfig"
+          },
+          "x-examples" : {
+            "text/plain" : "Example \n\n 1. Create a JSON object. \n\n{\n\t\"inputs\": \"persistent://public/default/input-topic\",\n\t\"parallelism\": \"4\",\n\t\"output\": \"persistent://public/default/output-topic\",\n\t\"log-topic\": \"persistent://public/default/log-topic\",\n\t\"classname\": \"org.example.test.ExclamationFunction\",\n\t\"jar\": \"java-function-1.0-SNAPSHOT.jar\"\n}\n\n\n2. Encapsulate the JSON object to a multipart object (in Python). \n\nfrom requests_toolbelt.multipart.encoder import MultipartEncoder \nmp_encoder = MultipartEncoder( \n\t[('functionConfig', (None, json.dumps(config), 'application/json'))])"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully created"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Function already exists, etc.)"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "functions" ],
+        "summary" : "Updates a Pulsar Function currently running in cluster mode",
+        "description" : "",
+        "operationId" : "updateFunction",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting configuration payload of a Pulsar Function. An example of the expected Pulsar Function can be found here.\n- **autoAck**\n  Whether or not the framework acknowledges messages automatically.\n- **runtime**\n  What is the runtime of the Pulsar Function. Possible Values: [JAVA, PYTHON, GO]\n- **resources**\n  The size of the system resources allowed by the Pulsar Function runtime. The resources include: cpu, ram, disk.\n- **className**\n  The class name of a Pulsar Function.\n- **customSchemaInputs**\n  The map of input topics to Schema class names (specified as a JSON object).\n- **customSerdeInputs**\n  The map of input topics to SerDe class names (specified as a JSON object).\n- **deadLetterTopic**\n  Messages that are not processed successfully are sent to `deadLetterTopic`.\n- **runtimeFlags**\n  Any flags that you want to pass to the runtime. Note that in thread mode, these flags have no impact.\n- **fqfn**\n  The Fully Qualified Function Name (FQFN) for the Pulsar Function.\n- **inputSpecs**\n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}\n- **inputs**\n  The input topic or topics (multiple topics can be specified as a comma-separated list) of a Pulsar Function.\n- **jar**\n  Path to the JAR file for the Pulsar Function (if the Pulsar Function is written in Java).   It also supports URL path [http/https/file (file protocol assumes that file   already exists on worker host)] from which worker can download the package.\n- **py**\n  Path to the main Python file or Python wheel file for the Pulsar Function (if the Pulsar Function is written in Python).\n- **go**\n  Path to the main Go executable binary for the Pulsar Function (if the Pulsar Function is written in Go).\n- **logTopic**\n  The topic to which the logs of a Pulsar Function are produced.\n- **maxMessageRetries**\n  How many times should we try to process a message before giving up.\n- **output**\n  The output topic of a Pulsar Function (If none is specified, no output is written).\n- **outputSerdeClassName**\n  The SerDe class to be used for messages output by the Pulsar Function.\n- **parallelism**\n  The parallelism factor of a Pulsar Function (i.e. the number of a Pulsar Function instances to run).\n- **processingGuarantees**\n  The processing guarantees (that is, delivery semantics) applied to the Pulsar Function.  Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]\n- **retainOrdering**\n  Function consumes and processes messages in order.\n- **outputSchemaType**\n   Represents either a builtin schema type (for example: 'avro', 'json', ect) or the class name for a Schema implementation.- **subName**\n  Pulsar source subscription name. User can specify a subscription-name for the input-topic consumer.\n- **windowConfig**\n  The window configuration of a Pulsar Function.\n- **timeoutMs**\n  The message timeout in milliseconds.\n- **topicsPattern**\n  The topic pattern to consume from a list of topics under a namespace that match the pattern.  [input] and [topic-pattern] are mutually exclusive. Add SerDe class name for a   pattern in customSerdeInputs (supported for java fun only)\n- **userConfig**\n  A map of user-defined configurations (specified as a JSON object).\n- **secrets**\n  This is a map of secretName(that is how the secret is going to be accessed in the Pulsar Function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **cleanupSubscription**\n  Whether the subscriptions of a Pulsar Function created or used should be deleted when the Pulsar Function is deleted.\n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/FunctionConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n  \"inputs\": persistent://public/default/input-topic,\n  \"parallelism\": 4\n  \"output\": persistent://public/default/output-topic\n  \"log-topic\": persistent://public/default/log-topic\n  \"classname\": org.example.test.ExclamationFunction\n  \"jar\": java-function-1.0-SNAPSHOT.jar\n}"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The update options is for the Pulsar Function that needs to be updated.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/UpdateOptions"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully updated"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Function doesn't exist, etc.)"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "functions" ],
+        "summary" : "Deletes a Pulsar Function currently running in cluster mode",
+        "description" : "",
+        "operationId" : "deregisterFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "The Pulsar Function was successfully deleted"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/restart" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Restart all instances of a Pulsar Function",
+        "description" : "",
+        "operationId" : "restartFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/start" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Start all instances of a Pulsar Function",
+        "description" : "",
+        "operationId" : "startFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/state/{key}" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Fetch the current state associated with a Pulsar Function",
+        "description" : "",
+        "operationId" : "getFunctionState",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "description" : "The stats key",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionState"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The key does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Put the state associated with a Pulsar Function",
+        "description" : "",
+        "operationId" : "putFunctionState",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/stats" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the stats of a Pulsar Function",
+        "description" : "",
+        "operationId" : "getFunctionStats",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionStatsImpl"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this function"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/status" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the status of a Pulsar Function",
+        "description" : "",
+        "operationId" : "getFunctionStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionStatus"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this function"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/stop" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Stop all instances of a Pulsar Function",
+        "description" : "",
+        "operationId" : "stopFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/trigger" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Triggers a Pulsar Function with a user-specified value or file data",
+        "description" : "",
+        "operationId" : "triggerFunction",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The value with which you want to trigger the Pulsar Function",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The path to the file that contains the data with which you'd like to trigger the Pulsar Function",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/InputStream"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The specific topic name that the Pulsar Function consumes from which you want to inject the data to",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/Message"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/restart" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Restart an instance of a Pulsar Function",
+        "description" : "",
+        "operationId" : "restartFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, all instances are restarted",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this function"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/start" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Start an instance of a Pulsar Function",
+        "description" : "",
+        "operationId" : "startFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, all instances sre started. ",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/stats" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the stats of a Pulsar Function instance",
+        "description" : "",
+        "operationId" : "getFunctionInstanceStats",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, the stats of all instances is returned",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionInstanceStatsDataImpl"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this function"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/status" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the status of a Pulsar Function instance",
+        "description" : "",
+        "operationId" : "getFunctionInstanceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, the stats of all instances is returned",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionInstanceStatusData"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this function"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/stop" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Stop an instance of a Pulsar Function",
+        "description" : "",
+        "operationId" : "stopFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, all instances are stopped. ",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "Annotation" : {
+      "type" : "object"
+    },
+    "AnnotationIntrospector" : {
+      "type" : "object"
+    },
+    "ArrayBuilders" : {
+      "type" : "object",
+      "properties" : {
+        "booleanBuilder" : {
+          "$ref" : "#/definitions/BooleanBuilder"
+        },
+        "byteBuilder" : {
+          "$ref" : "#/definitions/ByteBuilder"
+        },
+        "shortBuilder" : {
+          "$ref" : "#/definitions/ShortBuilder"
+        },
+        "intBuilder" : {
+          "$ref" : "#/definitions/IntBuilder"
+        },
+        "longBuilder" : {
+          "$ref" : "#/definitions/LongBuilder"
+        },
+        "floatBuilder" : {
+          "$ref" : "#/definitions/FloatBuilder"
+        },
+        "doubleBuilder" : {
+          "$ref" : "#/definitions/DoubleBuilder"
+        }
+      }
+    },
+    "AuthenticationDataHttps" : {
+      "type" : "object",
+      "properties" : {
+        "subscription" : {
+          "type" : "string"
+        },
+        "tlsCertificates" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/X509Certificate"
+          }
+        },
+        "httpAuthType" : {
+          "type" : "string"
+        },
+        "peerAddress" : {
+          "$ref" : "#/definitions/SocketAddress"
+        },
+        "commandData" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Base64Variant" : {
+      "type" : "object",
+      "properties" : {
+        "paddingChar" : {
+          "type" : "string"
+        },
+        "paddingByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "maxLineLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "BooleanBuilder" : {
+      "type" : "object"
+    },
+    "ByteBuilder" : {
+      "type" : "object"
+    },
+    "CharacterEscapes" : {
+      "type" : "object",
+      "properties" : {
+        "escapeCodesForAscii" : {
+          "type" : "array",
+          "items" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }
+      }
+    },
+    "ClassIntrospector" : {
+      "type" : "object"
+    },
+    "ClassLoader" : {
+      "type" : "object",
+      "properties" : {
+        "parent" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "unnamedModule" : {
+          "$ref" : "#/definitions/Module"
+        },
+        "registeredAsParallelCapable" : {
+          "type" : "boolean"
+        },
+        "definedPackages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Package"
+          }
+        }
+      }
+    },
+    "CompletableFuture" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureVoid" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ConsumerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        },
+        "serdeClassName" : {
+          "type" : "string"
+        },
+        "schemaProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "consumerProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "receiverQueueSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cryptoConfig" : {
+          "$ref" : "#/definitions/CryptoConfig"
+        },
+        "poolMessages" : {
+          "type" : "boolean"
+        },
+        "regexPattern" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ContextAttributes" : {
+      "type" : "object"
+    },
+    "CryptoConfig" : {
+      "type" : "object",
+      "properties" : {
+        "cryptoKeyReaderClassName" : {
+          "type" : "string"
+        },
+        "cryptoKeyReaderConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "encryptionKeys" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "producerCryptoFailureAction" : {
+          "type" : "string",
+          "enum" : [ "FAIL", "SEND" ]
+        },
+        "consumerCryptoFailureAction" : {
+          "type" : "string",
+          "enum" : [ "FAIL", "DISCARD", "CONSUME" ]
+        }
+      }
+    },
+    "Currency" : {
+      "type" : "object",
+      "properties" : {
+        "currencyCode" : {
+          "type" : "string"
+        },
+        "defaultFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numericCode" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "symbol" : {
+          "type" : "string"
+        },
+        "numericCodeAsString" : {
+          "type" : "string"
+        }
+      }
+    },
+    "DateFormat" : {
+      "type" : "object",
+      "properties" : {
+        "calendar" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "numberFormat" : {
+          "$ref" : "#/definitions/NumberFormat"
+        },
+        "lenient" : {
+          "type" : "boolean"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        }
+      }
+    },
+    "DeserializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "problemHandlers" : {
+          "$ref" : "#/definitions/LinkedNodeDeserializationProblemHandler"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializationContext" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "contextualType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "arrayBuilders" : {
+          "$ref" : "#/definitions/ArrayBuilders"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "parser" : {
+          "$ref" : "#/definitions/JsonParser"
+        },
+        "config" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/DeserializerFactory"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializerFactory" : {
+      "type" : "object"
+    },
+    "DoubleBuilder" : {
+      "type" : "object"
+    },
+    "EncryptionContext" : {
+      "type" : "object",
+      "properties" : {
+        "keys" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/EncryptionKey"
+          }
+        },
+        "param" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "algorithm" : {
+          "type" : "string"
+        },
+        "compressionType" : {
+          "type" : "string",
+          "enum" : [ "NONE", "LZ4", "ZLIB", "ZSTD", "SNAPPY" ]
+        },
+        "uncompressedMessageSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "batchSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "EncryptionKey" : {
+      "type" : "object",
+      "properties" : {
+        "keyValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ExceptionInformation" : {
+      "type" : "object",
+      "properties" : {
+        "exceptionString" : {
+          "type" : "string"
+        },
+        "timestampMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FilterProvider" : {
+      "type" : "object"
+    },
+    "FloatBuilder" : {
+      "type" : "object"
+    },
+    "FormatSchema" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        }
+      }
+    },
+    "FunctionConfig" : {
+      "type" : "object",
+      "properties" : {
+        "runtimeFlags" : {
+          "type" : "string"
+        },
+        "tenant" : {
+          "type" : "string"
+        },
+        "namespace" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "className" : {
+          "type" : "string"
+        },
+        "inputs" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "customSerdeInputs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "topicsPattern" : {
+          "type" : "string"
+        },
+        "customSchemaInputs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "customSchemaOutputs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "inputSpecs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ConsumerConfig"
+          }
+        },
+        "output" : {
+          "type" : "string"
+        },
+        "producerConfig" : {
+          "$ref" : "#/definitions/ProducerConfig"
+        },
+        "outputSchemaType" : {
+          "type" : "string"
+        },
+        "outputSerdeClassName" : {
+          "type" : "string"
+        },
+        "logTopic" : {
+          "type" : "string"
+        },
+        "processingGuarantees" : {
+          "type" : "string",
+          "enum" : [ "ATLEAST_ONCE", "ATMOST_ONCE", "EFFECTIVELY_ONCE" ]
+        },
+        "retainOrdering" : {
+          "type" : "boolean"
+        },
+        "retainKeyOrdering" : {
+          "type" : "boolean"
+        },
+        "batchBuilder" : {
+          "type" : "string"
+        },
+        "forwardSourceMessageProperty" : {
+          "type" : "boolean"
+        },
+        "userConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secrets" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "runtime" : {
+          "type" : "string",
+          "enum" : [ "JAVA", "PYTHON", "GO" ]
+        },
+        "autoAck" : {
+          "type" : "boolean"
+        },
+        "maxMessageRetries" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "deadLetterTopic" : {
+          "type" : "string"
+        },
+        "subName" : {
+          "type" : "string"
+        },
+        "parallelism" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "resources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "fqfn" : {
+          "type" : "string"
+        },
+        "windowConfig" : {
+          "$ref" : "#/definitions/WindowConfig"
+        },
+        "timeoutMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "jar" : {
+          "type" : "string"
+        },
+        "py" : {
+          "type" : "string"
+        },
+        "go" : {
+          "type" : "string"
+        },
+        "cleanupSubscription" : {
+          "type" : "boolean"
+        },
+        "customRuntimeOptions" : {
+          "type" : "string"
+        },
+        "maxPendingAsyncRequests" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "exposePulsarAdminClientEnabled" : {
+          "type" : "boolean"
+        },
+        "subscriptionPosition" : {
+          "type" : "string",
+          "enum" : [ "Latest", "Earliest" ]
+        }
+      }
+    },
+    "FunctionInstanceStatsData" : {
+      "type" : "object",
+      "properties" : {
+        "oneMin" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsDataBase"
+        },
+        "lastInvocation" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userMetrics" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "number",
+            "format" : "double"
+          }
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FunctionInstanceStatsDataBase" : {
+      "type" : "object",
+      "properties" : {
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FunctionInstanceStatsDataBaseImpl" : {
+      "type" : "object",
+      "properties" : {
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "FunctionInstanceStatsDataImpl" : {
+      "type" : "object",
+      "properties" : {
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "1min" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsDataBaseImpl"
+        },
+        "lastInvocation" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userMetrics" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "number",
+            "format" : "double"
+          }
+        }
+      }
+    },
+    "FunctionInstanceStatsImpl" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "metrics" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsData"
+        }
+      }
+    },
+    "FunctionInstanceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "status" : {
+          "$ref" : "#/definitions/FunctionInstanceStatusData"
+        }
+      }
+    },
+    "FunctionInstanceStatusData" : {
+      "type" : "object",
+      "properties" : {
+        "running" : {
+          "type" : "boolean"
+        },
+        "error" : {
+          "type" : "string"
+        },
+        "numRestarts" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numReceived" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSuccessfullyProcessed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numUserExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestUserExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numSystemExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSystemExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "averageLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "lastInvocationTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "FunctionState" : {
+      "type" : "object",
+      "properties" : {
+        "key" : {
+          "type" : "string"
+        },
+        "stringValue" : {
+          "type" : "string"
+        },
+        "byteValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "numberValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FunctionStatsImpl" : {
+      "type" : "object",
+      "properties" : {
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "1min" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsDataBaseImpl"
+        },
+        "lastInvocation" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/FunctionInstanceStatsImpl"
+          }
+        }
+      }
+    },
+    "FunctionStatus" : {
+      "type" : "object",
+      "properties" : {
+        "numInstances" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numRunning" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/FunctionInstanceStatus"
+          }
+        }
+      }
+    },
+    "HandlerInstantiator" : {
+      "type" : "object"
+    },
+    "InjectableValues" : {
+      "type" : "object"
+    },
+    "InputDecorator" : {
+      "type" : "object"
+    },
+    "InputStream" : {
+      "type" : "object"
+    },
+    "IntBuilder" : {
+      "type" : "object"
+    },
+    "JavaType" : {
+      "type" : "object",
+      "properties" : {
+        "containerType" : {
+          "type" : "boolean"
+        },
+        "collectionLikeType" : {
+          "type" : "boolean"
+        },
+        "mapLikeType" : {
+          "type" : "boolean"
+        },
+        "referencedType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "valueHandler" : {
+          "type" : "object"
+        },
+        "typeHandler" : {
+          "type" : "object"
+        },
+        "contentValueHandler" : {
+          "type" : "object"
+        },
+        "contentTypeHandler" : {
+          "type" : "object"
+        },
+        "erasedSignature" : {
+          "type" : "string"
+        },
+        "bindings" : {
+          "$ref" : "#/definitions/TypeBindings"
+        },
+        "keyType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "concrete" : {
+          "type" : "boolean"
+        },
+        "interface" : {
+          "type" : "boolean"
+        },
+        "primitive" : {
+          "type" : "boolean"
+        },
+        "interfaces" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        },
+        "genericSignature" : {
+          "type" : "string"
+        },
+        "final" : {
+          "type" : "boolean"
+        },
+        "abstract" : {
+          "type" : "boolean"
+        },
+        "contentType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "enumType" : {
+          "type" : "boolean"
+        },
+        "javaLangObject" : {
+          "type" : "boolean"
+        },
+        "arrayType" : {
+          "type" : "boolean"
+        },
+        "throwable" : {
+          "type" : "boolean"
+        },
+        "superClass" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "referenceType" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonFactory" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "formatName" : {
+          "type" : "string"
+        },
+        "inputDecorator" : {
+          "$ref" : "#/definitions/InputDecorator"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputDecorator" : {
+          "$ref" : "#/definitions/OutputDecorator"
+        },
+        "rootValueSeparator" : {
+          "type" : "string"
+        }
+      }
+    },
+    "JsonGenerator" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "prettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "outputTarget" : {
+          "type" : "object"
+        },
+        "highestEscapedChar" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "outputBuffered" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonLocation" : {
+      "type" : "object",
+      "properties" : {
+        "sourceRef" : {
+          "type" : "object"
+        },
+        "lineNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "columnNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "charOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "byteOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "JsonNodeFactory" : {
+      "type" : "object"
+    },
+    "JsonParser" : {
+      "type" : "object",
+      "properties" : {
+        "currentLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "binaryValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "typeId" : {
+          "type" : "object"
+        },
+        "inputSource" : {
+          "type" : "object"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "parsingContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "tokenLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentTokenId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "expectedStartArrayToken" : {
+          "type" : "boolean"
+        },
+        "expectedStartObjectToken" : {
+          "type" : "boolean"
+        },
+        "lastClearedToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "textOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numberValue" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "numberType" : {
+          "type" : "string",
+          "enum" : [ "INT", "LONG", "BIG_INTEGER", "FLOAT", "DOUBLE", "BIG_DECIMAL" ]
+        },
+        "bigIntegerValue" : {
+          "type" : "integer"
+        },
+        "decimalValue" : {
+          "type" : "number"
+        },
+        "embeddedObject" : {
+          "type" : "object"
+        },
+        "valueAsInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "valueAsLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "valueAsDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "valueAsBoolean" : {
+          "type" : "boolean"
+        },
+        "valueAsString" : {
+          "type" : "string"
+        },
+        "objectId" : {
+          "type" : "object"
+        },
+        "textCharacters" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "textLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        },
+        "text" : {
+          "type" : "string"
+        },
+        "booleanValue" : {
+          "type" : "boolean"
+        },
+        "byteValue" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "doubleValue" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "floatValue" : {
+          "type" : "number",
+          "format" : "float"
+        },
+        "longValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "shortValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "intValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "JsonSerializer" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonSerializerObject" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        },
+        "delegatee" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        }
+      }
+    },
+    "JsonStreamContext" : {
+      "type" : "object",
+      "properties" : {
+        "typeDesc" : {
+          "type" : "string"
+        },
+        "entryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "parent" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "currentIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "LinkedNode" : {
+      "type" : "object"
+    },
+    "LinkedNodeDeserializationProblemHandler" : {
+      "type" : "object"
+    },
+    "Locale" : {
+      "type" : "object",
+      "properties" : {
+        "iso3Country" : {
+          "type" : "string"
+        },
+        "displayLanguage" : {
+          "type" : "string"
+        },
+        "displayScript" : {
+          "type" : "string"
+        },
+        "displayCountry" : {
+          "type" : "string"
+        },
+        "displayVariant" : {
+          "type" : "string"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "script" : {
+          "type" : "string"
+        },
+        "country" : {
+          "type" : "string"
+        },
+        "variant" : {
+          "type" : "string"
+        },
+        "extensionKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleAttributes" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "iso3Language" : {
+          "type" : "string"
+        },
+        "language" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongBuilder" : {
+      "type" : "object"
+    },
+    "Message" : {
+      "type" : "object",
+      "properties" : {
+        "publishTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "eventTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "producerName" : {
+          "type" : "string"
+        },
+        "sequenceId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "replicatedFrom" : {
+          "type" : "string"
+        },
+        "schemaVersion" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "orderingKey" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "replicated" : {
+          "type" : "boolean"
+        },
+        "topicName" : {
+          "type" : "string"
+        },
+        "messageId" : {
+          "$ref" : "#/definitions/MessageId"
+        },
+        "encryptionCtx" : {
+          "$ref" : "#/definitions/EncryptionContext"
+        },
+        "redeliveryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "readerSchema" : {
+          "$ref" : "#/definitions/SchemaObject"
+        },
+        "brokerPublishTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "data" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "value" : {
+          "type" : "object"
+        },
+        "key" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "index" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "keyBytes" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        }
+      }
+    },
+    "MessageId" : {
+      "type" : "object"
+    },
+    "Module" : {
+      "type" : "object",
+      "properties" : {
+        "layer" : {
+          "$ref" : "#/definitions/ModuleLayer"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "descriptor" : {
+          "$ref" : "#/definitions/ModuleDescriptor"
+        },
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "named" : {
+          "type" : "boolean"
+        },
+        "packages" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ModuleDescriptor" : {
+      "type" : "object",
+      "properties" : {
+        "open" : {
+          "type" : "boolean"
+        },
+        "automatic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ModuleLayer" : {
+      "type" : "object"
+    },
+    "Number" : {
+      "type" : "object"
+    },
+    "NumberFormat" : {
+      "type" : "object",
+      "properties" : {
+        "groupingUsed" : {
+          "type" : "boolean"
+        },
+        "parseIntegerOnly" : {
+          "type" : "boolean"
+        },
+        "maximumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maximumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currency" : {
+          "$ref" : "#/definitions/Currency"
+        },
+        "roundingMode" : {
+          "type" : "string",
+          "enum" : [ "UP", "DOWN", "CEILING", "FLOOR", "HALF_UP", "HALF_DOWN", "HALF_EVEN", "UNNECESSARY" ]
+        }
+      }
+    },
+    "ObjectCodec" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "ObjectMapper" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "serializationConfig" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "deserializationConfig" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "deserializationContext" : {
+          "$ref" : "#/definitions/DeserializationContext"
+        },
+        "serializerFactory" : {
+          "$ref" : "#/definitions/SerializerFactory"
+        },
+        "serializerProvider" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "serializerProviderInstance" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "visibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "injectableValues" : {
+          "$ref" : "#/definitions/InjectableValues"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "OutputDecorator" : {
+      "type" : "object"
+    },
+    "Package" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "specificationTitle" : {
+          "type" : "string"
+        },
+        "specificationVersion" : {
+          "type" : "string"
+        },
+        "specificationVendor" : {
+          "type" : "string"
+        },
+        "implementationTitle" : {
+          "type" : "string"
+        },
+        "implementationVersion" : {
+          "type" : "string"
+        },
+        "implementationVendor" : {
+          "type" : "string"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "sealed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "PrettyPrinter" : {
+      "type" : "object"
+    },
+    "Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ProducerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "maxPendingMessages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maxPendingMessagesAcrossPartitions" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "useThreadLocalProducers" : {
+          "type" : "boolean"
+        },
+        "cryptoConfig" : {
+          "$ref" : "#/definitions/CryptoConfig"
+        },
+        "batchBuilder" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyName" : {
+      "type" : "object",
+      "properties" : {
+        "namespace" : {
+          "type" : "string"
+        },
+        "empty" : {
+          "type" : "boolean"
+        },
+        "simpleName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyNamingStrategy" : {
+      "type" : "object"
+    },
+    "PublicKey" : {
+      "type" : "object",
+      "properties" : {
+        "algorithm" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "format" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "Schema" : {
+      "type" : "object",
+      "properties" : {
+        "schemaInfo" : {
+          "$ref" : "#/definitions/SchemaInfo"
+        },
+        "nativeSchema" : {
+          "type" : "object"
+        }
+      }
+    },
+    "SchemaInfo" : {
+      "type" : "object",
+      "properties" : {
+        "schemaDefinition" : {
+          "type" : "string"
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "schema" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "type" : {
+          "type" : "string",
+          "enum" : [ "NONE", "STRING", "JSON", "PROTOBUF", "AVRO", "BOOLEAN", "INT8", "INT16", "INT32", "INT64", "FLOAT", "DOUBLE", "DATE", "TIME", "TIMESTAMP", "KEY_VALUE", "INSTANT", "LOCAL_DATE", "LOCAL_TIME", "LOCAL_DATE_TIME", "PROTOBUF_NATIVE", "BYTES", "AUTO", "AUTO_CONSUME", "AUTO_PUBLISH" ]
+        }
+      }
+    },
+    "SchemaObject" : {
+      "type" : "object",
+      "properties" : {
+        "schemaInfo" : {
+          "$ref" : "#/definitions/SchemaInfo"
+        },
+        "nativeSchema" : {
+          "type" : "object"
+        }
+      }
+    },
+    "SerializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "defaultPrettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "serializationInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "serializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "SerializerFactory" : {
+      "type" : "object"
+    },
+    "SerializerProvider" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "defaultNullKeySerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "defaultNullValueSerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "config" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        },
+        "generator" : {
+          "$ref" : "#/definitions/JsonGenerator"
+        }
+      }
+    },
+    "ShortBuilder" : {
+      "type" : "object"
+    },
+    "SocketAddress" : {
+      "type" : "object"
+    },
+    "SubtypeResolver" : {
+      "type" : "object"
+    },
+    "TimeZone" : {
+      "type" : "object",
+      "properties" : {
+        "id" : {
+          "type" : "string"
+        },
+        "dstsavings" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "rawOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "TypeBindings" : {
+      "type" : "object",
+      "properties" : {
+        "empty" : {
+          "type" : "boolean"
+        },
+        "typeParameters" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        }
+      }
+    },
+    "TypeFactory" : {
+      "type" : "object",
+      "properties" : {
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        }
+      }
+    },
+    "UpdateOptions" : {
+      "type" : "object",
+      "properties" : {
+        "update-auth-data" : {
+          "type" : "boolean",
+          "description" : "Whether or not to update the auth data"
+        }
+      },
+      "description" : "Options while updating the sink"
+    },
+    "Value" : {
+      "type" : "object",
+      "properties" : {
+        "contentInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "valueInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        }
+      }
+    },
+    "VisibilityChecker" : {
+      "type" : "object"
+    },
+    "VisibilityCheckerObject" : {
+      "type" : "object"
+    },
+    "WindowConfig" : {
+      "type" : "object",
+      "properties" : {
+        "windowLengthCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "windowLengthDurationMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "slidingIntervalCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "slidingIntervalDurationMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lateDataTopic" : {
+          "type" : "string"
+        },
+        "maxLagMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "watermarkEmitIntervalMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "timestampExtractorClassName" : {
+          "type" : "string"
+        },
+        "actualWindowFunctionClassName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "X500Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        }
+      }
+    },
+    "X509Certificate" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "subjectX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "issuerX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "subjectAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "issuerAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "keyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "tbscertificate" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "sigAlgOID" : {
+          "type" : "string"
+        },
+        "sigAlgParams" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "issuerUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "subjectUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "extendedKeyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "issuerDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "subjectDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "signature" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "basicConstraints" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "sigAlgName" : {
+          "type" : "string"
+        },
+        "serialNumber" : {
+          "type" : "integer"
+        },
+        "notBefore" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "notAfter" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "criticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "nonCriticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "publicKey" : {
+          "$ref" : "#/definitions/PublicKey"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.10.2/swaggerpackages.json b/site2/website/static/swagger/2.10.2/swaggerpackages.json
new file mode 100644
index 0000000000000..41e17074e1661
--- /dev/null
+++ b/site2/website/static/swagger/2.10.2/swaggerpackages.json
@@ -0,0 +1,1764 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Packages operations",
+    "version" : "v3",
+    "title" : "Pulsar Packages REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "packages"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/packages/{type}/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "packages" ],
+        "summary" : "Get all the specified type packages in a namespace.",
+        "description" : "",
+        "operationId" : "listPackages",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Return all the specified type package names in the specified namespace.",
+            "schema" : {
+              "$ref" : "#/definitions/PackageMetadata"
+            }
+          },
+          "412" : {
+            "description" : "The package type is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      }
+    },
+    "/packages/{type}/{tenant}/{namespace}/{packageName}" : {
+      "get" : {
+        "tags" : [ "packages" ],
+        "summary" : "Get all the versions of a package.",
+        "description" : "",
+        "operationId" : "listPackageVersion",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "packageName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Return the package versions of the specified package.",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "404" : {
+            "description" : "The specified package is not existent."
+          },
+          "412" : {
+            "description" : "The package name is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      }
+    },
+    "/packages/{type}/{tenant}/{namespace}/{packageName}/{version}" : {
+      "get" : {
+        "tags" : [ "packages" ],
+        "summary" : "Download a package with the package name.",
+        "description" : "",
+        "operationId" : "download",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "packageName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Download the specified package successfully.",
+            "schema" : {
+              "$ref" : "#/definitions/StreamingOutput"
+            }
+          },
+          "404" : {
+            "description" : "The specified package is not existent."
+          },
+          "412" : {
+            "description" : "The package name is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "packages" ],
+        "summary" : "Upload a package.",
+        "description" : "",
+        "operationId" : "upload",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "packageName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Upload the specified package successfully."
+          },
+          "412" : {
+            "description" : "The package name is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "packages" ],
+        "summary" : "Delete a package with the package name.",
+        "description" : "",
+        "operationId" : "delete",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "packageName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Delete the specified package successfully."
+          },
+          "404" : {
+            "description" : "The specified package is not existent."
+          },
+          "412" : {
+            "description" : "The package name is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      }
+    },
+    "/packages/{type}/{tenant}/{namespace}/{packageName}/{version}/metadata" : {
+      "get" : {
+        "tags" : [ "packages" ],
+        "summary" : "Get the metadata of a package.",
+        "description" : "",
+        "operationId" : "getMeta",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "packageName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Return the metadata of the specified package.",
+            "schema" : {
+              "$ref" : "#/definitions/PackageMetadata"
+            }
+          },
+          "404" : {
+            "description" : "The specified package is not existent."
+          },
+          "412" : {
+            "description" : "The package name is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "packages" ],
+        "summary" : "Update the metadata of a package.",
+        "description" : "",
+        "operationId" : "updateMeta",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "type",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "packageName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Update the metadata of the specified package successfully."
+          },
+          "404" : {
+            "description" : "The specified package is not existent."
+          },
+          "412" : {
+            "description" : "The package name is illegal."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          },
+          "503" : {
+            "description" : "Package Management Service is not enabled in the broker."
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "Annotation" : {
+      "type" : "object"
+    },
+    "AnnotationIntrospector" : {
+      "type" : "object"
+    },
+    "ArrayBuilders" : {
+      "type" : "object",
+      "properties" : {
+        "booleanBuilder" : {
+          "$ref" : "#/definitions/BooleanBuilder"
+        },
+        "byteBuilder" : {
+          "$ref" : "#/definitions/ByteBuilder"
+        },
+        "shortBuilder" : {
+          "$ref" : "#/definitions/ShortBuilder"
+        },
+        "intBuilder" : {
+          "$ref" : "#/definitions/IntBuilder"
+        },
+        "longBuilder" : {
+          "$ref" : "#/definitions/LongBuilder"
+        },
+        "floatBuilder" : {
+          "$ref" : "#/definitions/FloatBuilder"
+        },
+        "doubleBuilder" : {
+          "$ref" : "#/definitions/DoubleBuilder"
+        }
+      }
+    },
+    "AuthenticationDataHttps" : {
+      "type" : "object",
+      "properties" : {
+        "subscription" : {
+          "type" : "string"
+        },
+        "tlsCertificates" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/X509Certificate"
+          }
+        },
+        "httpAuthType" : {
+          "type" : "string"
+        },
+        "peerAddress" : {
+          "$ref" : "#/definitions/SocketAddress"
+        },
+        "commandData" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Base64Variant" : {
+      "type" : "object",
+      "properties" : {
+        "paddingChar" : {
+          "type" : "string"
+        },
+        "paddingByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "maxLineLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "BooleanBuilder" : {
+      "type" : "object"
+    },
+    "ByteBuilder" : {
+      "type" : "object"
+    },
+    "CharacterEscapes" : {
+      "type" : "object",
+      "properties" : {
+        "escapeCodesForAscii" : {
+          "type" : "array",
+          "items" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }
+      }
+    },
+    "ClassIntrospector" : {
+      "type" : "object"
+    },
+    "ClassLoader" : {
+      "type" : "object",
+      "properties" : {
+        "parent" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "unnamedModule" : {
+          "$ref" : "#/definitions/Module"
+        },
+        "registeredAsParallelCapable" : {
+          "type" : "boolean"
+        },
+        "definedPackages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Package"
+          }
+        }
+      }
+    },
+    "CompletableFuture" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureVoid" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ContextAttributes" : {
+      "type" : "object"
+    },
+    "Currency" : {
+      "type" : "object",
+      "properties" : {
+        "currencyCode" : {
+          "type" : "string"
+        },
+        "defaultFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numericCode" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "symbol" : {
+          "type" : "string"
+        },
+        "numericCodeAsString" : {
+          "type" : "string"
+        }
+      }
+    },
+    "DateFormat" : {
+      "type" : "object",
+      "properties" : {
+        "calendar" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "numberFormat" : {
+          "$ref" : "#/definitions/NumberFormat"
+        },
+        "lenient" : {
+          "type" : "boolean"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        }
+      }
+    },
+    "DeserializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "problemHandlers" : {
+          "$ref" : "#/definitions/LinkedNodeDeserializationProblemHandler"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializationContext" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "contextualType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "arrayBuilders" : {
+          "$ref" : "#/definitions/ArrayBuilders"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "parser" : {
+          "$ref" : "#/definitions/JsonParser"
+        },
+        "config" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/DeserializerFactory"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializerFactory" : {
+      "type" : "object"
+    },
+    "DoubleBuilder" : {
+      "type" : "object"
+    },
+    "FilterProvider" : {
+      "type" : "object"
+    },
+    "FloatBuilder" : {
+      "type" : "object"
+    },
+    "FormatSchema" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        }
+      }
+    },
+    "HandlerInstantiator" : {
+      "type" : "object"
+    },
+    "InjectableValues" : {
+      "type" : "object"
+    },
+    "InputDecorator" : {
+      "type" : "object"
+    },
+    "IntBuilder" : {
+      "type" : "object"
+    },
+    "JavaType" : {
+      "type" : "object",
+      "properties" : {
+        "containerType" : {
+          "type" : "boolean"
+        },
+        "collectionLikeType" : {
+          "type" : "boolean"
+        },
+        "mapLikeType" : {
+          "type" : "boolean"
+        },
+        "referencedType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "valueHandler" : {
+          "type" : "object"
+        },
+        "typeHandler" : {
+          "type" : "object"
+        },
+        "contentValueHandler" : {
+          "type" : "object"
+        },
+        "contentTypeHandler" : {
+          "type" : "object"
+        },
+        "erasedSignature" : {
+          "type" : "string"
+        },
+        "bindings" : {
+          "$ref" : "#/definitions/TypeBindings"
+        },
+        "keyType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "concrete" : {
+          "type" : "boolean"
+        },
+        "interface" : {
+          "type" : "boolean"
+        },
+        "primitive" : {
+          "type" : "boolean"
+        },
+        "interfaces" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        },
+        "genericSignature" : {
+          "type" : "string"
+        },
+        "final" : {
+          "type" : "boolean"
+        },
+        "abstract" : {
+          "type" : "boolean"
+        },
+        "contentType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "enumType" : {
+          "type" : "boolean"
+        },
+        "javaLangObject" : {
+          "type" : "boolean"
+        },
+        "arrayType" : {
+          "type" : "boolean"
+        },
+        "throwable" : {
+          "type" : "boolean"
+        },
+        "superClass" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "referenceType" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonFactory" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "formatName" : {
+          "type" : "string"
+        },
+        "inputDecorator" : {
+          "$ref" : "#/definitions/InputDecorator"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputDecorator" : {
+          "$ref" : "#/definitions/OutputDecorator"
+        },
+        "rootValueSeparator" : {
+          "type" : "string"
+        }
+      }
+    },
+    "JsonGenerator" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "prettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "outputTarget" : {
+          "type" : "object"
+        },
+        "highestEscapedChar" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "outputBuffered" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonLocation" : {
+      "type" : "object",
+      "properties" : {
+        "sourceRef" : {
+          "type" : "object"
+        },
+        "lineNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "columnNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "charOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "byteOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "JsonNodeFactory" : {
+      "type" : "object"
+    },
+    "JsonParser" : {
+      "type" : "object",
+      "properties" : {
+        "currentLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "binaryValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "typeId" : {
+          "type" : "object"
+        },
+        "inputSource" : {
+          "type" : "object"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "parsingContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "tokenLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentTokenId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "expectedStartArrayToken" : {
+          "type" : "boolean"
+        },
+        "expectedStartObjectToken" : {
+          "type" : "boolean"
+        },
+        "lastClearedToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "textOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numberValue" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "numberType" : {
+          "type" : "string",
+          "enum" : [ "INT", "LONG", "BIG_INTEGER", "FLOAT", "DOUBLE", "BIG_DECIMAL" ]
+        },
+        "bigIntegerValue" : {
+          "type" : "integer"
+        },
+        "decimalValue" : {
+          "type" : "number"
+        },
+        "embeddedObject" : {
+          "type" : "object"
+        },
+        "valueAsInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "valueAsLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "valueAsDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "valueAsBoolean" : {
+          "type" : "boolean"
+        },
+        "valueAsString" : {
+          "type" : "string"
+        },
+        "objectId" : {
+          "type" : "object"
+        },
+        "textCharacters" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "textLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        },
+        "text" : {
+          "type" : "string"
+        },
+        "booleanValue" : {
+          "type" : "boolean"
+        },
+        "byteValue" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "doubleValue" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "floatValue" : {
+          "type" : "number",
+          "format" : "float"
+        },
+        "longValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "shortValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "intValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "JsonSerializer" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonSerializerObject" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        },
+        "delegatee" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        }
+      }
+    },
+    "JsonStreamContext" : {
+      "type" : "object",
+      "properties" : {
+        "typeDesc" : {
+          "type" : "string"
+        },
+        "entryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "parent" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "currentIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "LinkedNode" : {
+      "type" : "object"
+    },
+    "LinkedNodeDeserializationProblemHandler" : {
+      "type" : "object"
+    },
+    "Locale" : {
+      "type" : "object",
+      "properties" : {
+        "iso3Country" : {
+          "type" : "string"
+        },
+        "displayLanguage" : {
+          "type" : "string"
+        },
+        "displayScript" : {
+          "type" : "string"
+        },
+        "displayCountry" : {
+          "type" : "string"
+        },
+        "displayVariant" : {
+          "type" : "string"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "script" : {
+          "type" : "string"
+        },
+        "country" : {
+          "type" : "string"
+        },
+        "variant" : {
+          "type" : "string"
+        },
+        "extensionKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleAttributes" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "iso3Language" : {
+          "type" : "string"
+        },
+        "language" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongBuilder" : {
+      "type" : "object"
+    },
+    "Module" : {
+      "type" : "object",
+      "properties" : {
+        "layer" : {
+          "$ref" : "#/definitions/ModuleLayer"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "descriptor" : {
+          "$ref" : "#/definitions/ModuleDescriptor"
+        },
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "named" : {
+          "type" : "boolean"
+        },
+        "packages" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ModuleDescriptor" : {
+      "type" : "object",
+      "properties" : {
+        "open" : {
+          "type" : "boolean"
+        },
+        "automatic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ModuleLayer" : {
+      "type" : "object"
+    },
+    "Number" : {
+      "type" : "object"
+    },
+    "NumberFormat" : {
+      "type" : "object",
+      "properties" : {
+        "groupingUsed" : {
+          "type" : "boolean"
+        },
+        "parseIntegerOnly" : {
+          "type" : "boolean"
+        },
+        "maximumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maximumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currency" : {
+          "$ref" : "#/definitions/Currency"
+        },
+        "roundingMode" : {
+          "type" : "string",
+          "enum" : [ "UP", "DOWN", "CEILING", "FLOOR", "HALF_UP", "HALF_DOWN", "HALF_EVEN", "UNNECESSARY" ]
+        }
+      }
+    },
+    "ObjectCodec" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "ObjectMapper" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "serializationConfig" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "deserializationConfig" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "deserializationContext" : {
+          "$ref" : "#/definitions/DeserializationContext"
+        },
+        "serializerFactory" : {
+          "$ref" : "#/definitions/SerializerFactory"
+        },
+        "serializerProvider" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "serializerProviderInstance" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "visibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "injectableValues" : {
+          "$ref" : "#/definitions/InjectableValues"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "OutputDecorator" : {
+      "type" : "object"
+    },
+    "Package" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "specificationTitle" : {
+          "type" : "string"
+        },
+        "specificationVersion" : {
+          "type" : "string"
+        },
+        "specificationVendor" : {
+          "type" : "string"
+        },
+        "implementationTitle" : {
+          "type" : "string"
+        },
+        "implementationVersion" : {
+          "type" : "string"
+        },
+        "implementationVendor" : {
+          "type" : "string"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "sealed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "PackageMetadata" : {
+      "type" : "object",
+      "properties" : {
+        "description" : {
+          "type" : "string"
+        },
+        "contact" : {
+          "type" : "string"
+        },
+        "createTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "modificationTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "PrettyPrinter" : {
+      "type" : "object"
+    },
+    "Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyName" : {
+      "type" : "object",
+      "properties" : {
+        "namespace" : {
+          "type" : "string"
+        },
+        "empty" : {
+          "type" : "boolean"
+        },
+        "simpleName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyNamingStrategy" : {
+      "type" : "object"
+    },
+    "PublicKey" : {
+      "type" : "object",
+      "properties" : {
+        "algorithm" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "format" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SerializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "defaultPrettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "serializationInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "serializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "SerializerFactory" : {
+      "type" : "object"
+    },
+    "SerializerProvider" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "defaultNullKeySerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "defaultNullValueSerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "config" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        },
+        "generator" : {
+          "$ref" : "#/definitions/JsonGenerator"
+        }
+      }
+    },
+    "ShortBuilder" : {
+      "type" : "object"
+    },
+    "SocketAddress" : {
+      "type" : "object"
+    },
+    "StreamingOutput" : {
+      "type" : "object"
+    },
+    "SubtypeResolver" : {
+      "type" : "object"
+    },
+    "TimeZone" : {
+      "type" : "object",
+      "properties" : {
+        "id" : {
+          "type" : "string"
+        },
+        "dstsavings" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "rawOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "TypeBindings" : {
+      "type" : "object",
+      "properties" : {
+        "empty" : {
+          "type" : "boolean"
+        },
+        "typeParameters" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        }
+      }
+    },
+    "TypeFactory" : {
+      "type" : "object",
+      "properties" : {
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        }
+      }
+    },
+    "Value" : {
+      "type" : "object",
+      "properties" : {
+        "contentInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "valueInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        }
+      }
+    },
+    "VisibilityChecker" : {
+      "type" : "object"
+    },
+    "VisibilityCheckerObject" : {
+      "type" : "object"
+    },
+    "X500Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        }
+      }
+    },
+    "X509Certificate" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "subjectX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "issuerX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "subjectAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "issuerAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "keyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "tbscertificate" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "sigAlgOID" : {
+          "type" : "string"
+        },
+        "sigAlgParams" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "issuerUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "subjectUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "extendedKeyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "issuerDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "subjectDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "signature" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "basicConstraints" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "sigAlgName" : {
+          "type" : "string"
+        },
+        "serialNumber" : {
+          "type" : "integer"
+        },
+        "notBefore" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "notAfter" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "criticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "nonCriticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "publicKey" : {
+          "$ref" : "#/definitions/PublicKey"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.10.2/swaggersink.json b/site2/website/static/swagger/2.10.2/swaggersink.json
new file mode 100644
index 0000000000000..318de351cbaa6
--- /dev/null
+++ b/site2/website/static/swagger/2.10.2/swaggersink.json
@@ -0,0 +1,2466 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Sink operations",
+    "version" : "v3",
+    "title" : "Pulsar Sink REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "sinks"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/sinks/builtinsinks" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Fetches the list of built-in Pulsar IO sinks",
+        "description" : "",
+        "operationId" : "getSinkList",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Get builtin sinks successfully.",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/ConnectorDefinition"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/sinks/builtinsinks/{name}/configdefinition" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Fetches information about config fields associated with the specified builtin sink",
+        "description" : "",
+        "operationId" : "getSinkConfigDefinition",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The name of the builtin sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/ConfigFieldDefinition"
+              }
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "builtin sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/reloadBuiltInSinks" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Reload the built-in connectors, including Sources and Sinks",
+        "description" : "",
+        "operationId" : "reloadSinks",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "401" : {
+            "description" : "This operation requires super-user access"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Lists all Pulsar Sinks currently deployed in a given namespace",
+        "description" : "",
+        "operationId" : "listSinks",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "400" : {
+            "description" : "Invalid list request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Fetches information about a Pulsar Sink currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getSinkInfo",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SinkConfig"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Creates a new Pulsar Sink in cluster mode",
+        "description" : "",
+        "operationId" : "registerSink",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "You can submit a sink (in any languages that you are familiar with) to a Pulsar cluster. Follow the steps below.\n1. Create a JSON object using some of the following parameters.\nA JSON value presenting config payload of a Pulsar Sink. All available configuration options are:\n- **classname**\n   The class name of a Pulsar Sink if archive is file-url-path (file://)\n- **sourceSubscriptionName**\n   Pulsar source subscription name if user wants a specific\n   subscription-name for input-topic consumer\n- **inputs**\n   The input topic or topics of a Pulsar Sink (specified as a JSON array)\n- **topicsPattern**\n   TopicsPattern to consume from list of topics under a namespace that    match the pattern. [input] and [topicsPattern] are mutually    exclusive. Add SerDe class name for a pattern in customSerdeInputs    (supported for java fun only)- **topicToSerdeClassName**\n   The map of input topics to SerDe class names (specified as a JSON object)\n- **topicToSchemaType**\n   The map of input topics to Schema types or class names (specified as a JSON object)\n- **inputSpecs**\n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}\n- **configs**\n   The map of configs (specified as a JSON object)\n- **secrets**\n   a map of secretName(aka how the secret is going to be \n   accessed in the function via context) to an object that \n   encapsulates how the secret is fetched by the underlying \n   secrets provider. The type of an value here can be found by the \n   SecretProviderConfigurator.getSecretObjectType() method. (specified as a JSON object)\n- **parallelism**\n   The parallelism factor of a Pulsar Sink (i.e. the number of a Pulsar Sink instances to run \n- **processingGuarantees**\n   The processing guarantees (aka delivery semantics) applied to the Pulsar Sink. Possible Values: \"ATLEAST_ONCE\", \"ATMOST_ONCE\", \"EFFECTIVELY_ONCE\"\n- **retainOrdering**\n   Boolean denotes whether the Pulsar Sink consumes and processes messages in order\n- **resources**\n   {\"cpu\": 1, \"ram\": 2, \"disk\": 3} The CPU (in cores), RAM (in bytes) and disk (in bytes) that needs to be allocated per Pulsar Sink instance (applicable only to Docker runtime)\n- **autoAck**\n   Boolean denotes whether or not the framework will automatically acknowledge messages\n- **timeoutMs**\n   Long denotes the message timeout in milliseconds\n- **cleanupSubscription**\n   Boolean denotes whether the subscriptions the functions created/used should be deleted when the functions is deleted\n- **runtimeFlags**\n   Any flags that you want to pass to the runtime as a single string\n2. Encapsulate the JSON object to a multipart object.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SinkConfig"
+          },
+          "x-examples" : {
+            "text/plain" : "Example \n\n 1. Create a JSON object. \n\n{\n\t\"classname\": \"org.example.MySinkTest\",\n\t\"inputs\": [\"persistent://public/default/sink-input\"],\n\t\"processingGuarantees\": \"EFFECTIVELY_ONCE\",\n\t\"parallelism\": \"10\"\n}\n\n\n2. Encapsulate the JSON object to a multipart object (in Python).\n\nfrom requests_toolbelt.multipart.encoder import MultipartEncoder \nmp_encoder = MultipartEncoder( \n\t[('sinkConfig', (None, json.dumps(config), 'application/json'))])"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Sink successfully created"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Sink already exists, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, failed to get tenant data, failed to process package, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Updates a Pulsar Sink currently running in cluster mode",
+        "description" : "",
+        "operationId" : "updateSink",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting config payload of a Pulsar Sink. All available configuration options are:\n- **classname**\n   The class name of a Pulsar Sink if archive is file-url-path (file://)\n- **sourceSubscriptionName**\n   Pulsar source subscription name if user wants a specific\n   subscription-name for input-topic consumer\n- **inputs**\n   The input topic or topics of a Pulsar Sink (specified as a JSON array)\n- **topicsPattern**\n   TopicsPattern to consume from list of topics under a namespace that    match the pattern. [input] and [topicsPattern] are mutually    exclusive. Add SerDe class name for a pattern in customSerdeInputs    (supported for java fun only)- **topicToSerdeClassName**\n   The map of input topics to SerDe class names (specified as a JSON object)\n- **topicToSchemaType**\n   The map of input topics to Schema types or class names (specified as a JSON object)\n- **inputSpecs**\n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}\n- **configs**\n   The map of configs (specified as a JSON object)\n- **secrets**\n   a map of secretName(aka how the secret is going to be \n   accessed in the function via context) to an object that \n   encapsulates how the secret is fetched by the underlying \n   secrets provider. The type of an value here can be found by the \n   SecretProviderConfigurator.getSecretObjectType() method. (specified as a JSON object)\n- **parallelism**\n   The parallelism factor of a Pulsar Sink (i.e. the number of a Pulsar Sink instances to run \n- **processingGuarantees**\n   The processing guarantees (aka delivery semantics) applied to the Pulsar Sink. Possible Values: \"ATLEAST_ONCE\", \"ATMOST_ONCE\", \"EFFECTIVELY_ONCE\"\n- **retainOrdering**\n   Boolean denotes whether the Pulsar Sink consumes and processes messages in order\n- **resources**\n   {\"cpu\": 1, \"ram\": 2, \"disk\": 3} The CPU (in cores), RAM (in bytes) and disk (in bytes) that needs to be allocated per Pulsar Sink instance (applicable only to Docker runtime)\n- **autoAck**\n   Boolean denotes whether or not the framework will automatically acknowledge messages\n- **timeoutMs**\n   Long denotes the message timeout in milliseconds\n- **cleanupSubscription**\n   Boolean denotes whether the subscriptions the functions created/used should be deleted when the functions is deleted\n- **runtimeFlags**\n   Any flags that you want to pass to the runtime as a single string\n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SinkConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n\t\"classname\": \"org.example.SinkStressTest\",\n\t\"inputs\": [\"persistent://public/default/sink-input\"],\n\t\"processingGuarantees\": \"EFFECTIVELY_ONCE\",\n\t\"parallelism\": 5\n}"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Update options for the Pulsar Sink",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/UpdateOptions"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Sink successfully updated"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Sink doesn't exist, update contains no change, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, failed to process package, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Deletes a Pulsar Sink currently running in cluster mode",
+        "description" : "",
+        "operationId" : "deregisterSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "The Pulsar Sink was successfully deleted"
+          },
+          "400" : {
+            "description" : "Invalid deregister request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "408" : {
+            "description" : "Got InterruptedException while deregistering the Pulsar Sink"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, failed to deregister, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/restart" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Restart all instances of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "restartSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid restart request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to restart the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/start" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Start all instances of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "startSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid start request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to start the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/status" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Displays the status of a Pulsar Sink running in cluster mode",
+        "description" : "",
+        "operationId" : "getSinkStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SinkStatus"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this sink"
+          },
+          "400" : {
+            "description" : "Invalid get status request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/stop" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Stop all instances of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "stopSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid stop request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to stop the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/restart" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Restart an instance of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "restartSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this sink"
+          },
+          "400" : {
+            "description" : "Invalid restart request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to restart the instance of a Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/start" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Start an instance of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "startSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid start request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to start the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/status" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Displays the status of a Pulsar Sink instance",
+        "description" : "",
+        "operationId" : "getSinkInstanceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SinkInstanceStatusData"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this sink"
+          },
+          "400" : {
+            "description" : "The Pulsar Sink instance does not exist"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal Server Error (got exception while getting status, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/stop" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Stop an instance of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "stopSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid stop request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink instance does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to stop the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "Annotation" : {
+      "type" : "object"
+    },
+    "AnnotationIntrospector" : {
+      "type" : "object"
+    },
+    "ArrayBuilders" : {
+      "type" : "object",
+      "properties" : {
+        "booleanBuilder" : {
+          "$ref" : "#/definitions/BooleanBuilder"
+        },
+        "byteBuilder" : {
+          "$ref" : "#/definitions/ByteBuilder"
+        },
+        "shortBuilder" : {
+          "$ref" : "#/definitions/ShortBuilder"
+        },
+        "intBuilder" : {
+          "$ref" : "#/definitions/IntBuilder"
+        },
+        "longBuilder" : {
+          "$ref" : "#/definitions/LongBuilder"
+        },
+        "floatBuilder" : {
+          "$ref" : "#/definitions/FloatBuilder"
+        },
+        "doubleBuilder" : {
+          "$ref" : "#/definitions/DoubleBuilder"
+        }
+      }
+    },
+    "AuthenticationDataHttps" : {
+      "type" : "object",
+      "properties" : {
+        "subscription" : {
+          "type" : "string"
+        },
+        "tlsCertificates" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/X509Certificate"
+          }
+        },
+        "httpAuthType" : {
+          "type" : "string"
+        },
+        "peerAddress" : {
+          "$ref" : "#/definitions/SocketAddress"
+        },
+        "commandData" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Base64Variant" : {
+      "type" : "object",
+      "properties" : {
+        "paddingChar" : {
+          "type" : "string"
+        },
+        "paddingByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "maxLineLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "BooleanBuilder" : {
+      "type" : "object"
+    },
+    "ByteBuilder" : {
+      "type" : "object"
+    },
+    "CharacterEscapes" : {
+      "type" : "object",
+      "properties" : {
+        "escapeCodesForAscii" : {
+          "type" : "array",
+          "items" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }
+      }
+    },
+    "ClassIntrospector" : {
+      "type" : "object"
+    },
+    "ClassLoader" : {
+      "type" : "object",
+      "properties" : {
+        "parent" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "unnamedModule" : {
+          "$ref" : "#/definitions/Module"
+        },
+        "registeredAsParallelCapable" : {
+          "type" : "boolean"
+        },
+        "definedPackages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Package"
+          }
+        }
+      }
+    },
+    "CompletableFuture" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureVoid" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ConfigFieldDefinition" : {
+      "type" : "object",
+      "properties" : {
+        "fieldName" : {
+          "type" : "string"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "attributes" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ConnectorDefinition" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "description" : {
+          "type" : "string"
+        },
+        "sourceClass" : {
+          "type" : "string"
+        },
+        "sinkClass" : {
+          "type" : "string"
+        },
+        "sourceConfigClass" : {
+          "type" : "string"
+        },
+        "sinkConfigClass" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ConsumerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        },
+        "serdeClassName" : {
+          "type" : "string"
+        },
+        "schemaProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "consumerProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "receiverQueueSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cryptoConfig" : {
+          "$ref" : "#/definitions/CryptoConfig"
+        },
+        "poolMessages" : {
+          "type" : "boolean"
+        },
+        "regexPattern" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ContextAttributes" : {
+      "type" : "object"
+    },
+    "CryptoConfig" : {
+      "type" : "object",
+      "properties" : {
+        "cryptoKeyReaderClassName" : {
+          "type" : "string"
+        },
+        "cryptoKeyReaderConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "encryptionKeys" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "producerCryptoFailureAction" : {
+          "type" : "string",
+          "enum" : [ "FAIL", "SEND" ]
+        },
+        "consumerCryptoFailureAction" : {
+          "type" : "string",
+          "enum" : [ "FAIL", "DISCARD", "CONSUME" ]
+        }
+      }
+    },
+    "Currency" : {
+      "type" : "object",
+      "properties" : {
+        "currencyCode" : {
+          "type" : "string"
+        },
+        "defaultFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numericCode" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "symbol" : {
+          "type" : "string"
+        },
+        "numericCodeAsString" : {
+          "type" : "string"
+        }
+      }
+    },
+    "DateFormat" : {
+      "type" : "object",
+      "properties" : {
+        "calendar" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "numberFormat" : {
+          "$ref" : "#/definitions/NumberFormat"
+        },
+        "lenient" : {
+          "type" : "boolean"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        }
+      }
+    },
+    "DeserializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "problemHandlers" : {
+          "$ref" : "#/definitions/LinkedNodeDeserializationProblemHandler"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializationContext" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "contextualType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "arrayBuilders" : {
+          "$ref" : "#/definitions/ArrayBuilders"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "parser" : {
+          "$ref" : "#/definitions/JsonParser"
+        },
+        "config" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/DeserializerFactory"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializerFactory" : {
+      "type" : "object"
+    },
+    "DoubleBuilder" : {
+      "type" : "object"
+    },
+    "ExceptionInformation" : {
+      "type" : "object",
+      "properties" : {
+        "exceptionString" : {
+          "type" : "string"
+        },
+        "timestampMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FilterProvider" : {
+      "type" : "object"
+    },
+    "FloatBuilder" : {
+      "type" : "object"
+    },
+    "FormatSchema" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        }
+      }
+    },
+    "HandlerInstantiator" : {
+      "type" : "object"
+    },
+    "InjectableValues" : {
+      "type" : "object"
+    },
+    "InputDecorator" : {
+      "type" : "object"
+    },
+    "IntBuilder" : {
+      "type" : "object"
+    },
+    "JavaType" : {
+      "type" : "object",
+      "properties" : {
+        "containerType" : {
+          "type" : "boolean"
+        },
+        "collectionLikeType" : {
+          "type" : "boolean"
+        },
+        "mapLikeType" : {
+          "type" : "boolean"
+        },
+        "referencedType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "valueHandler" : {
+          "type" : "object"
+        },
+        "typeHandler" : {
+          "type" : "object"
+        },
+        "contentValueHandler" : {
+          "type" : "object"
+        },
+        "contentTypeHandler" : {
+          "type" : "object"
+        },
+        "erasedSignature" : {
+          "type" : "string"
+        },
+        "bindings" : {
+          "$ref" : "#/definitions/TypeBindings"
+        },
+        "keyType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "concrete" : {
+          "type" : "boolean"
+        },
+        "interface" : {
+          "type" : "boolean"
+        },
+        "primitive" : {
+          "type" : "boolean"
+        },
+        "interfaces" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        },
+        "genericSignature" : {
+          "type" : "string"
+        },
+        "final" : {
+          "type" : "boolean"
+        },
+        "abstract" : {
+          "type" : "boolean"
+        },
+        "contentType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "enumType" : {
+          "type" : "boolean"
+        },
+        "javaLangObject" : {
+          "type" : "boolean"
+        },
+        "arrayType" : {
+          "type" : "boolean"
+        },
+        "throwable" : {
+          "type" : "boolean"
+        },
+        "superClass" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "referenceType" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonFactory" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "formatName" : {
+          "type" : "string"
+        },
+        "inputDecorator" : {
+          "$ref" : "#/definitions/InputDecorator"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputDecorator" : {
+          "$ref" : "#/definitions/OutputDecorator"
+        },
+        "rootValueSeparator" : {
+          "type" : "string"
+        }
+      }
+    },
+    "JsonGenerator" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "prettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "outputTarget" : {
+          "type" : "object"
+        },
+        "highestEscapedChar" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "outputBuffered" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonLocation" : {
+      "type" : "object",
+      "properties" : {
+        "sourceRef" : {
+          "type" : "object"
+        },
+        "lineNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "columnNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "charOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "byteOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "JsonNodeFactory" : {
+      "type" : "object"
+    },
+    "JsonParser" : {
+      "type" : "object",
+      "properties" : {
+        "currentLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "binaryValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "typeId" : {
+          "type" : "object"
+        },
+        "inputSource" : {
+          "type" : "object"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "parsingContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "tokenLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentTokenId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "expectedStartArrayToken" : {
+          "type" : "boolean"
+        },
+        "expectedStartObjectToken" : {
+          "type" : "boolean"
+        },
+        "lastClearedToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "textOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numberValue" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "numberType" : {
+          "type" : "string",
+          "enum" : [ "INT", "LONG", "BIG_INTEGER", "FLOAT", "DOUBLE", "BIG_DECIMAL" ]
+        },
+        "bigIntegerValue" : {
+          "type" : "integer"
+        },
+        "decimalValue" : {
+          "type" : "number"
+        },
+        "embeddedObject" : {
+          "type" : "object"
+        },
+        "valueAsInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "valueAsLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "valueAsDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "valueAsBoolean" : {
+          "type" : "boolean"
+        },
+        "valueAsString" : {
+          "type" : "string"
+        },
+        "objectId" : {
+          "type" : "object"
+        },
+        "textCharacters" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "textLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        },
+        "text" : {
+          "type" : "string"
+        },
+        "booleanValue" : {
+          "type" : "boolean"
+        },
+        "byteValue" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "doubleValue" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "floatValue" : {
+          "type" : "number",
+          "format" : "float"
+        },
+        "longValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "shortValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "intValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "JsonSerializer" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonSerializerObject" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        },
+        "delegatee" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        }
+      }
+    },
+    "JsonStreamContext" : {
+      "type" : "object",
+      "properties" : {
+        "typeDesc" : {
+          "type" : "string"
+        },
+        "entryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "parent" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "currentIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "LinkedNode" : {
+      "type" : "object"
+    },
+    "LinkedNodeDeserializationProblemHandler" : {
+      "type" : "object"
+    },
+    "Locale" : {
+      "type" : "object",
+      "properties" : {
+        "iso3Country" : {
+          "type" : "string"
+        },
+        "displayLanguage" : {
+          "type" : "string"
+        },
+        "displayScript" : {
+          "type" : "string"
+        },
+        "displayCountry" : {
+          "type" : "string"
+        },
+        "displayVariant" : {
+          "type" : "string"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "script" : {
+          "type" : "string"
+        },
+        "country" : {
+          "type" : "string"
+        },
+        "variant" : {
+          "type" : "string"
+        },
+        "extensionKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleAttributes" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "iso3Language" : {
+          "type" : "string"
+        },
+        "language" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongBuilder" : {
+      "type" : "object"
+    },
+    "Module" : {
+      "type" : "object",
+      "properties" : {
+        "layer" : {
+          "$ref" : "#/definitions/ModuleLayer"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "descriptor" : {
+          "$ref" : "#/definitions/ModuleDescriptor"
+        },
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "named" : {
+          "type" : "boolean"
+        },
+        "packages" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ModuleDescriptor" : {
+      "type" : "object",
+      "properties" : {
+        "open" : {
+          "type" : "boolean"
+        },
+        "automatic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ModuleLayer" : {
+      "type" : "object"
+    },
+    "Number" : {
+      "type" : "object"
+    },
+    "NumberFormat" : {
+      "type" : "object",
+      "properties" : {
+        "groupingUsed" : {
+          "type" : "boolean"
+        },
+        "parseIntegerOnly" : {
+          "type" : "boolean"
+        },
+        "maximumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maximumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currency" : {
+          "$ref" : "#/definitions/Currency"
+        },
+        "roundingMode" : {
+          "type" : "string",
+          "enum" : [ "UP", "DOWN", "CEILING", "FLOOR", "HALF_UP", "HALF_DOWN", "HALF_EVEN", "UNNECESSARY" ]
+        }
+      }
+    },
+    "ObjectCodec" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "ObjectMapper" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "serializationConfig" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "deserializationConfig" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "deserializationContext" : {
+          "$ref" : "#/definitions/DeserializationContext"
+        },
+        "serializerFactory" : {
+          "$ref" : "#/definitions/SerializerFactory"
+        },
+        "serializerProvider" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "serializerProviderInstance" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "visibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "injectableValues" : {
+          "$ref" : "#/definitions/InjectableValues"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "OutputDecorator" : {
+      "type" : "object"
+    },
+    "Package" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "specificationTitle" : {
+          "type" : "string"
+        },
+        "specificationVersion" : {
+          "type" : "string"
+        },
+        "specificationVendor" : {
+          "type" : "string"
+        },
+        "implementationTitle" : {
+          "type" : "string"
+        },
+        "implementationVersion" : {
+          "type" : "string"
+        },
+        "implementationVendor" : {
+          "type" : "string"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "sealed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "PrettyPrinter" : {
+      "type" : "object"
+    },
+    "Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyName" : {
+      "type" : "object",
+      "properties" : {
+        "namespace" : {
+          "type" : "string"
+        },
+        "empty" : {
+          "type" : "boolean"
+        },
+        "simpleName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyNamingStrategy" : {
+      "type" : "object"
+    },
+    "PublicKey" : {
+      "type" : "object",
+      "properties" : {
+        "algorithm" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "format" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "SerializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "defaultPrettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "serializationInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "serializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "SerializerFactory" : {
+      "type" : "object"
+    },
+    "SerializerProvider" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "defaultNullKeySerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "defaultNullValueSerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "config" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        },
+        "generator" : {
+          "$ref" : "#/definitions/JsonGenerator"
+        }
+      }
+    },
+    "ShortBuilder" : {
+      "type" : "object"
+    },
+    "SinkConfig" : {
+      "type" : "object",
+      "properties" : {
+        "tenant" : {
+          "type" : "string"
+        },
+        "namespace" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "className" : {
+          "type" : "string"
+        },
+        "sourceSubscriptionName" : {
+          "type" : "string"
+        },
+        "sourceSubscriptionPosition" : {
+          "type" : "string",
+          "enum" : [ "Latest", "Earliest" ]
+        },
+        "inputs" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "topicToSerdeClassName" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "topicsPattern" : {
+          "type" : "string"
+        },
+        "topicToSchemaType" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "topicToSchemaProperties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "inputSpecs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ConsumerConfig"
+          }
+        },
+        "maxMessageRetries" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "deadLetterTopic" : {
+          "type" : "string"
+        },
+        "configs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secrets" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "parallelism" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "processingGuarantees" : {
+          "type" : "string",
+          "enum" : [ "ATLEAST_ONCE", "ATMOST_ONCE", "EFFECTIVELY_ONCE" ]
+        },
+        "retainOrdering" : {
+          "type" : "boolean"
+        },
+        "retainKeyOrdering" : {
+          "type" : "boolean"
+        },
+        "resources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "autoAck" : {
+          "type" : "boolean"
+        },
+        "timeoutMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "negativeAckRedeliveryDelayMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "archive" : {
+          "type" : "string"
+        },
+        "cleanupSubscription" : {
+          "type" : "boolean"
+        },
+        "runtimeFlags" : {
+          "type" : "string"
+        },
+        "customRuntimeOptions" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SinkInstanceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "status" : {
+          "$ref" : "#/definitions/SinkInstanceStatusData"
+        }
+      }
+    },
+    "SinkInstanceStatusData" : {
+      "type" : "object",
+      "properties" : {
+        "running" : {
+          "type" : "boolean"
+        },
+        "error" : {
+          "type" : "string"
+        },
+        "numRestarts" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numReadFromPulsar" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSystemExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSystemExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numSinkExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSinkExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numWrittenToSink" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastReceivedTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SinkStatus" : {
+      "type" : "object",
+      "properties" : {
+        "numInstances" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numRunning" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/SinkInstanceStatus"
+          }
+        }
+      }
+    },
+    "SocketAddress" : {
+      "type" : "object"
+    },
+    "SubtypeResolver" : {
+      "type" : "object"
+    },
+    "TimeZone" : {
+      "type" : "object",
+      "properties" : {
+        "id" : {
+          "type" : "string"
+        },
+        "dstsavings" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "rawOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "TypeBindings" : {
+      "type" : "object",
+      "properties" : {
+        "empty" : {
+          "type" : "boolean"
+        },
+        "typeParameters" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        }
+      }
+    },
+    "TypeFactory" : {
+      "type" : "object",
+      "properties" : {
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        }
+      }
+    },
+    "UpdateOptions" : {
+      "type" : "object",
+      "properties" : {
+        "update-auth-data" : {
+          "type" : "boolean",
+          "description" : "Whether or not to update the auth data"
+        }
+      },
+      "description" : "Options while updating the sink"
+    },
+    "Value" : {
+      "type" : "object",
+      "properties" : {
+        "contentInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "valueInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        }
+      }
+    },
+    "VisibilityChecker" : {
+      "type" : "object"
+    },
+    "VisibilityCheckerObject" : {
+      "type" : "object"
+    },
+    "X500Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        }
+      }
+    },
+    "X509Certificate" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "subjectX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "issuerX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "subjectAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "issuerAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "keyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "tbscertificate" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "sigAlgOID" : {
+          "type" : "string"
+        },
+        "sigAlgParams" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "issuerUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "subjectUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "extendedKeyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "issuerDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "subjectDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "signature" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "basicConstraints" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "sigAlgName" : {
+          "type" : "string"
+        },
+        "serialNumber" : {
+          "type" : "integer"
+        },
+        "notBefore" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "notAfter" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "criticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "nonCriticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "publicKey" : {
+          "$ref" : "#/definitions/PublicKey"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.10.2/swaggersource.json b/site2/website/static/swagger/2.10.2/swaggersource.json
new file mode 100644
index 0000000000000..5586a5ef58d4a
--- /dev/null
+++ b/site2/website/static/swagger/2.10.2/swaggersource.json
@@ -0,0 +1,2420 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Source operations",
+    "version" : "v3",
+    "title" : "Pulsar Source REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "sources"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/sources/builtinsources" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Fetches the list of built-in Pulsar IO sources",
+        "description" : "",
+        "operationId" : "getSourceList",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/ConnectorDefinition"
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/builtinsources/{name}/configdefinition" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Fetches information about config fields associated with the specified builtin source",
+        "description" : "",
+        "operationId" : "getSourceConfigDefinition",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The name of the builtin source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/ConfigFieldDefinition"
+              }
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "builtin source does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/reloadBuiltInSources" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Reload the built-in connectors, including Sources and Sinks",
+        "description" : "",
+        "operationId" : "reloadSources",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "401" : {
+            "description" : "This operation requires super-user access"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Lists all Pulsar Sources currently deployed in a given namespace",
+        "description" : "",
+        "operationId" : "listSources",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Fetches information about a Pulsar Source currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getSourceInfo",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SourceConfig"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Creates a new Pulsar Source in cluster mode",
+        "description" : "",
+        "operationId" : "registerSource",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "You can submit a source (in any languages that you are familiar with) to a Pulsar cluster. Follow the steps below.\n1. Create a JSON object using some of the following parameters.\nA JSON value presenting configuration payload of a Pulsar Source. An example of the expected functions can be found here.\n- **classname**\n  The class name of a Pulsar Source if archive is file-url-path (file://).\n- **topicName**\n  The Pulsar topic to which data is sent.\n- **serdeClassName**\n  The SerDe classname for the Pulsar Source.\n- **schemaType**\n  The schema type (either a builtin schema like 'avro', 'json', etc.. or    custom Schema class name to be used to encode messages emitted from the Pulsar Source\n- **configs**\n  Source config key/values\n- **secrets**\n  This is a map of secretName(that is how the secret is going to be accessed in the function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **parallelism**\n  The parallelism factor of a Pulsar Source (i.e. the number of a Pulsar Source instances to run).\n- **processingGuarantees**\n  The processing guarantees (aka delivery semantics) applied to the Pulsar Source.    Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]\n- **resources**\n  The size of the system resources allowed by the Pulsar Source runtime. The resources include: cpu, ram, disk.\n- **archive**\n  The path to the NAR archive for the Pulsar Source. It also supports url-path   [http/https/file (file protocol assumes that file already exists on worker host)]   from which worker can download the package.\n- **runtimeFlags**\n  Any flags that you want to pass to the runtime.\n2. Encapsulate the JSON object to a multipart object.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SourceConfig"
+          },
+          "x-examples" : {
+            "text/plain" : "Example \n\n1. Create a JSON object. \n\n{\n\t\"tenant\": \"public\",\n\t\"namespace\": \"default\",\n\t\"name\": \"pulsar-io-mysql\",\n\t\"className\": \"TestSourceMysql\",\n\t\"topicName\": \"pulsar-io-mysql\",\n\t\"parallelism\": \"1\",\n\t\"archive\": \"/connectors/pulsar-io-mysql-0.0.1.nar\",\n\t\"schemaType\": \"avro\"\n}\n\n\n2. Encapsulate the JSON object to a multipart object (in Python). \n\nfrom requests_toolbelt.multipart.encoder import MultipartEncoder \nmp_encoder = MultipartEncoder( \n\t[('sourceConfig', (None, json.dumps(config), 'application/json'))])"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully created"
+          },
+          "400" : {
+            "description" : "Invalid request (Function already exists or Tenant, Namespace or Name is not provided, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "sources" ],
+        "summary" : "Updates a Pulsar Source currently running in cluster mode",
+        "description" : "",
+        "operationId" : "updateSource",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting configuration payload of a Pulsar Source. An example of the expected functions can be found here.\n- **classname**\n  The class name of a Pulsar Source if archive is file-url-path (file://).\n- **topicName**\n  The Pulsar topic to which data is sent.\n- **serdeClassName**\n  The SerDe classname for the Pulsar Source.\n- **schemaType**\n  The schema type (either a builtin schema like 'avro', 'json', etc.. or    custom Schema class name to be used to encode messages emitted from the Pulsar Source\n- **configs**\n  Pulsar Source config key/values\n- **secrets**\n  This is a map of secretName(that is how the secret is going to be accessed in the function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method.\n- **parallelism**\n  The parallelism factor of a Pulsar Source (i.e. the number of a Pulsar Source instances to run).\n- **processingGuarantees**\n  The processing guarantees (aka delivery semantics) applied to the Pulsar Source.    Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]\n- **resources**\n  The size of the system resources allowed by the Pulsar Source runtime. The resources include: cpu, ram, disk.\n- **archive**\n  The path to the NAR archive for the Pulsar Source. It also supports url-path   [http/https/file (file protocol assumes that file already exists on worker host)]   from which worker can download the package.\n- **runtimeFlags**\n  Any flags that you want to pass to the runtime.\n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SourceConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n  \"tenant\": public\n  \"namespace\": default\n  \"name\": pulsar-io-mysql\n  \"className\": TestSourceMysql\n  \"topicName\": pulsar-io-mysql\n  \"parallelism\": 1\n  \"archive\": /connectors/pulsar-io-mysql-0.0.1.nar\n  \"schemaType\": avro\n}"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Update options for Pulsar Source",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/UpdateOptions"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully updated"
+          },
+          "400" : {
+            "description" : "Invalid request (Function already exists or Tenant, Namespace or Name is not provided, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "sources" ],
+        "summary" : "Deletes a Pulsar Source currently running in cluster mode",
+        "description" : "",
+        "operationId" : "deregisterSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "The function was successfully deleted"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/restart" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Restart all instances of a Pulsar Source",
+        "description" : "",
+        "operationId" : "restartSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/start" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Start all instances of a Pulsar Source",
+        "description" : "",
+        "operationId" : "startSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/status" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Displays the status of a Pulsar Source running in cluster mode",
+        "description" : "",
+        "operationId" : "getSourceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SourceStatus"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this source"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/stop" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Stop all instances of a Pulsar Source",
+        "description" : "",
+        "operationId" : "stopSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/restart" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Restart an instance of a Pulsar Source",
+        "description" : "",
+        "operationId" : "restartSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this source"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/start" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Start an instance of a Pulsar Source",
+        "description" : "",
+        "operationId" : "startSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/status" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Displays the status of a Pulsar Source instance",
+        "description" : "",
+        "operationId" : "getSourceInstanceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SourceInstanceStatusData"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this source"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/stop" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Stop instance of a Pulsar Source",
+        "description" : "",
+        "operationId" : "stopSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "Annotation" : {
+      "type" : "object"
+    },
+    "AnnotationIntrospector" : {
+      "type" : "object"
+    },
+    "ArrayBuilders" : {
+      "type" : "object",
+      "properties" : {
+        "booleanBuilder" : {
+          "$ref" : "#/definitions/BooleanBuilder"
+        },
+        "byteBuilder" : {
+          "$ref" : "#/definitions/ByteBuilder"
+        },
+        "shortBuilder" : {
+          "$ref" : "#/definitions/ShortBuilder"
+        },
+        "intBuilder" : {
+          "$ref" : "#/definitions/IntBuilder"
+        },
+        "longBuilder" : {
+          "$ref" : "#/definitions/LongBuilder"
+        },
+        "floatBuilder" : {
+          "$ref" : "#/definitions/FloatBuilder"
+        },
+        "doubleBuilder" : {
+          "$ref" : "#/definitions/DoubleBuilder"
+        }
+      }
+    },
+    "AuthenticationDataHttps" : {
+      "type" : "object",
+      "properties" : {
+        "subscription" : {
+          "type" : "string"
+        },
+        "tlsCertificates" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/X509Certificate"
+          }
+        },
+        "httpAuthType" : {
+          "type" : "string"
+        },
+        "peerAddress" : {
+          "$ref" : "#/definitions/SocketAddress"
+        },
+        "commandData" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Base64Variant" : {
+      "type" : "object",
+      "properties" : {
+        "paddingChar" : {
+          "type" : "string"
+        },
+        "paddingByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "maxLineLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "BatchSourceConfig" : {
+      "type" : "object",
+      "properties" : {
+        "discoveryTriggererClassName" : {
+          "type" : "string"
+        },
+        "discoveryTriggererConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        }
+      }
+    },
+    "BooleanBuilder" : {
+      "type" : "object"
+    },
+    "ByteBuilder" : {
+      "type" : "object"
+    },
+    "CharacterEscapes" : {
+      "type" : "object",
+      "properties" : {
+        "escapeCodesForAscii" : {
+          "type" : "array",
+          "items" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        }
+      }
+    },
+    "ClassIntrospector" : {
+      "type" : "object"
+    },
+    "ClassLoader" : {
+      "type" : "object",
+      "properties" : {
+        "parent" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "unnamedModule" : {
+          "$ref" : "#/definitions/Module"
+        },
+        "registeredAsParallelCapable" : {
+          "type" : "boolean"
+        },
+        "definedPackages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Package"
+          }
+        }
+      }
+    },
+    "CompletableFuture" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "CompletableFutureVoid" : {
+      "type" : "object",
+      "properties" : {
+        "done" : {
+          "type" : "boolean"
+        },
+        "completedExceptionally" : {
+          "type" : "boolean"
+        },
+        "numberOfDependents" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "cancelled" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ConfigFieldDefinition" : {
+      "type" : "object",
+      "properties" : {
+        "fieldName" : {
+          "type" : "string"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "attributes" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ConnectorDefinition" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "description" : {
+          "type" : "string"
+        },
+        "sourceClass" : {
+          "type" : "string"
+        },
+        "sinkClass" : {
+          "type" : "string"
+        },
+        "sourceConfigClass" : {
+          "type" : "string"
+        },
+        "sinkConfigClass" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ContextAttributes" : {
+      "type" : "object"
+    },
+    "CryptoConfig" : {
+      "type" : "object",
+      "properties" : {
+        "cryptoKeyReaderClassName" : {
+          "type" : "string"
+        },
+        "cryptoKeyReaderConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "encryptionKeys" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "producerCryptoFailureAction" : {
+          "type" : "string",
+          "enum" : [ "FAIL", "SEND" ]
+        },
+        "consumerCryptoFailureAction" : {
+          "type" : "string",
+          "enum" : [ "FAIL", "DISCARD", "CONSUME" ]
+        }
+      }
+    },
+    "Currency" : {
+      "type" : "object",
+      "properties" : {
+        "currencyCode" : {
+          "type" : "string"
+        },
+        "defaultFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numericCode" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "symbol" : {
+          "type" : "string"
+        },
+        "numericCodeAsString" : {
+          "type" : "string"
+        }
+      }
+    },
+    "DateFormat" : {
+      "type" : "object",
+      "properties" : {
+        "calendar" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "numberFormat" : {
+          "$ref" : "#/definitions/NumberFormat"
+        },
+        "lenient" : {
+          "type" : "boolean"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        }
+      }
+    },
+    "DeserializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "problemHandlers" : {
+          "$ref" : "#/definitions/LinkedNodeDeserializationProblemHandler"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializationContext" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "contextualType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "deserializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "arrayBuilders" : {
+          "$ref" : "#/definitions/ArrayBuilders"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "parser" : {
+          "$ref" : "#/definitions/JsonParser"
+        },
+        "config" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/DeserializerFactory"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "DeserializerFactory" : {
+      "type" : "object"
+    },
+    "DoubleBuilder" : {
+      "type" : "object"
+    },
+    "ExceptionInformation" : {
+      "type" : "object",
+      "properties" : {
+        "exceptionString" : {
+          "type" : "string"
+        },
+        "timestampMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FilterProvider" : {
+      "type" : "object"
+    },
+    "FloatBuilder" : {
+      "type" : "object"
+    },
+    "FormatSchema" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        }
+      }
+    },
+    "HandlerInstantiator" : {
+      "type" : "object"
+    },
+    "InjectableValues" : {
+      "type" : "object"
+    },
+    "InputDecorator" : {
+      "type" : "object"
+    },
+    "IntBuilder" : {
+      "type" : "object"
+    },
+    "JavaType" : {
+      "type" : "object",
+      "properties" : {
+        "containerType" : {
+          "type" : "boolean"
+        },
+        "collectionLikeType" : {
+          "type" : "boolean"
+        },
+        "mapLikeType" : {
+          "type" : "boolean"
+        },
+        "referencedType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "valueHandler" : {
+          "type" : "object"
+        },
+        "typeHandler" : {
+          "type" : "object"
+        },
+        "contentValueHandler" : {
+          "type" : "object"
+        },
+        "contentTypeHandler" : {
+          "type" : "object"
+        },
+        "erasedSignature" : {
+          "type" : "string"
+        },
+        "bindings" : {
+          "$ref" : "#/definitions/TypeBindings"
+        },
+        "keyType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "concrete" : {
+          "type" : "boolean"
+        },
+        "interface" : {
+          "type" : "boolean"
+        },
+        "primitive" : {
+          "type" : "boolean"
+        },
+        "interfaces" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        },
+        "genericSignature" : {
+          "type" : "string"
+        },
+        "final" : {
+          "type" : "boolean"
+        },
+        "abstract" : {
+          "type" : "boolean"
+        },
+        "contentType" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "enumType" : {
+          "type" : "boolean"
+        },
+        "javaLangObject" : {
+          "type" : "boolean"
+        },
+        "arrayType" : {
+          "type" : "boolean"
+        },
+        "throwable" : {
+          "type" : "boolean"
+        },
+        "superClass" : {
+          "$ref" : "#/definitions/JavaType"
+        },
+        "typeName" : {
+          "type" : "string"
+        },
+        "referenceType" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonFactory" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "formatName" : {
+          "type" : "string"
+        },
+        "inputDecorator" : {
+          "$ref" : "#/definitions/InputDecorator"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputDecorator" : {
+          "$ref" : "#/definitions/OutputDecorator"
+        },
+        "rootValueSeparator" : {
+          "type" : "string"
+        }
+      }
+    },
+    "JsonGenerator" : {
+      "type" : "object",
+      "properties" : {
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "prettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "characterEscapes" : {
+          "$ref" : "#/definitions/CharacterEscapes"
+        },
+        "outputContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "outputTarget" : {
+          "type" : "object"
+        },
+        "highestEscapedChar" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "outputBuffered" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonLocation" : {
+      "type" : "object",
+      "properties" : {
+        "sourceRef" : {
+          "type" : "object"
+        },
+        "lineNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "columnNr" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "charOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "byteOffset" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "JsonNodeFactory" : {
+      "type" : "object"
+    },
+    "JsonParser" : {
+      "type" : "object",
+      "properties" : {
+        "currentLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "codec" : {
+          "$ref" : "#/definitions/ObjectCodec"
+        },
+        "binaryValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "typeId" : {
+          "type" : "object"
+        },
+        "inputSource" : {
+          "type" : "object"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "parsingContext" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "tokenLocation" : {
+          "$ref" : "#/definitions/JsonLocation"
+        },
+        "featureMask" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "formatFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentTokenId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "expectedStartArrayToken" : {
+          "type" : "boolean"
+        },
+        "expectedStartObjectToken" : {
+          "type" : "boolean"
+        },
+        "lastClearedToken" : {
+          "type" : "string",
+          "enum" : [ "NOT_AVAILABLE", "START_OBJECT", "END_OBJECT", "START_ARRAY", "END_ARRAY", "FIELD_NAME", "VALUE_EMBEDDED_OBJECT", "VALUE_STRING", "VALUE_NUMBER_INT", "VALUE_NUMBER_FLOAT", "VALUE_TRUE", "VALUE_FALSE", "VALUE_NULL" ]
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "textOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numberValue" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "numberType" : {
+          "type" : "string",
+          "enum" : [ "INT", "LONG", "BIG_INTEGER", "FLOAT", "DOUBLE", "BIG_DECIMAL" ]
+        },
+        "bigIntegerValue" : {
+          "type" : "integer"
+        },
+        "decimalValue" : {
+          "type" : "number"
+        },
+        "embeddedObject" : {
+          "type" : "object"
+        },
+        "valueAsInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "valueAsLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "valueAsDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "valueAsBoolean" : {
+          "type" : "boolean"
+        },
+        "valueAsString" : {
+          "type" : "string"
+        },
+        "objectId" : {
+          "type" : "object"
+        },
+        "textCharacters" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "textLength" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "schema" : {
+          "$ref" : "#/definitions/FormatSchema"
+        },
+        "closed" : {
+          "type" : "boolean"
+        },
+        "text" : {
+          "type" : "string"
+        },
+        "booleanValue" : {
+          "type" : "boolean"
+        },
+        "byteValue" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "doubleValue" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "floatValue" : {
+          "type" : "number",
+          "format" : "float"
+        },
+        "longValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "shortValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "intValue" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "JsonSerializer" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "JsonSerializerObject" : {
+      "type" : "object",
+      "properties" : {
+        "unwrappingSerializer" : {
+          "type" : "boolean"
+        },
+        "delegatee" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        }
+      }
+    },
+    "JsonStreamContext" : {
+      "type" : "object",
+      "properties" : {
+        "typeDesc" : {
+          "type" : "string"
+        },
+        "entryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currentValue" : {
+          "type" : "object"
+        },
+        "currentName" : {
+          "type" : "string"
+        },
+        "parent" : {
+          "$ref" : "#/definitions/JsonStreamContext"
+        },
+        "currentIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "LinkedNode" : {
+      "type" : "object"
+    },
+    "LinkedNodeDeserializationProblemHandler" : {
+      "type" : "object"
+    },
+    "Locale" : {
+      "type" : "object",
+      "properties" : {
+        "iso3Country" : {
+          "type" : "string"
+        },
+        "displayLanguage" : {
+          "type" : "string"
+        },
+        "displayScript" : {
+          "type" : "string"
+        },
+        "displayCountry" : {
+          "type" : "string"
+        },
+        "displayVariant" : {
+          "type" : "string"
+        },
+        "displayName" : {
+          "type" : "string"
+        },
+        "script" : {
+          "type" : "string"
+        },
+        "country" : {
+          "type" : "string"
+        },
+        "variant" : {
+          "type" : "string"
+        },
+        "extensionKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleAttributes" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "unicodeLocaleKeys" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "iso3Language" : {
+          "type" : "string"
+        },
+        "language" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongBuilder" : {
+      "type" : "object"
+    },
+    "Module" : {
+      "type" : "object",
+      "properties" : {
+        "layer" : {
+          "$ref" : "#/definitions/ModuleLayer"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "descriptor" : {
+          "$ref" : "#/definitions/ModuleDescriptor"
+        },
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "named" : {
+          "type" : "boolean"
+        },
+        "packages" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ModuleDescriptor" : {
+      "type" : "object",
+      "properties" : {
+        "open" : {
+          "type" : "boolean"
+        },
+        "automatic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ModuleLayer" : {
+      "type" : "object"
+    },
+    "Number" : {
+      "type" : "object"
+    },
+    "NumberFormat" : {
+      "type" : "object",
+      "properties" : {
+        "groupingUsed" : {
+          "type" : "boolean"
+        },
+        "parseIntegerOnly" : {
+          "type" : "boolean"
+        },
+        "maximumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumIntegerDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maximumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "minimumFractionDigits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "currency" : {
+          "$ref" : "#/definitions/Currency"
+        },
+        "roundingMode" : {
+          "type" : "string",
+          "enum" : [ "UP", "DOWN", "CEILING", "FLOOR", "HALF_UP", "HALF_DOWN", "HALF_EVEN", "UNNECESSARY" ]
+        }
+      }
+    },
+    "ObjectCodec" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "ObjectMapper" : {
+      "type" : "object",
+      "properties" : {
+        "jsonFactory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        },
+        "serializationConfig" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "deserializationConfig" : {
+          "$ref" : "#/definitions/DeserializationConfig"
+        },
+        "deserializationContext" : {
+          "$ref" : "#/definitions/DeserializationContext"
+        },
+        "serializerFactory" : {
+          "$ref" : "#/definitions/SerializerFactory"
+        },
+        "serializerProvider" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "serializerProviderInstance" : {
+          "$ref" : "#/definitions/SerializerProvider"
+        },
+        "visibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "nodeFactory" : {
+          "$ref" : "#/definitions/JsonNodeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "injectableValues" : {
+          "$ref" : "#/definitions/InjectableValues"
+        },
+        "factory" : {
+          "$ref" : "#/definitions/JsonFactory"
+        }
+      }
+    },
+    "OutputDecorator" : {
+      "type" : "object"
+    },
+    "Package" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "specificationTitle" : {
+          "type" : "string"
+        },
+        "specificationVersion" : {
+          "type" : "string"
+        },
+        "specificationVendor" : {
+          "type" : "string"
+        },
+        "implementationTitle" : {
+          "type" : "string"
+        },
+        "implementationVersion" : {
+          "type" : "string"
+        },
+        "implementationVendor" : {
+          "type" : "string"
+        },
+        "annotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "declaredAnnotations" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/Annotation"
+          }
+        },
+        "sealed" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "PrettyPrinter" : {
+      "type" : "object"
+    },
+    "Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ProducerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "maxPendingMessages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maxPendingMessagesAcrossPartitions" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "useThreadLocalProducers" : {
+          "type" : "boolean"
+        },
+        "cryptoConfig" : {
+          "$ref" : "#/definitions/CryptoConfig"
+        },
+        "batchBuilder" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyName" : {
+      "type" : "object",
+      "properties" : {
+        "namespace" : {
+          "type" : "string"
+        },
+        "empty" : {
+          "type" : "boolean"
+        },
+        "simpleName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "PropertyNamingStrategy" : {
+      "type" : "object"
+    },
+    "PublicKey" : {
+      "type" : "object",
+      "properties" : {
+        "algorithm" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "format" : {
+          "type" : "string"
+        }
+      }
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "SerializationConfig" : {
+      "type" : "object",
+      "properties" : {
+        "defaultPrettyPrinter" : {
+          "$ref" : "#/definitions/PrettyPrinter"
+        },
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "serializationInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "serializationFeatures" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "defaultPropertyInclusion" : {
+          "$ref" : "#/definitions/Value"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "fullRootName" : {
+          "$ref" : "#/definitions/PropertyName"
+        },
+        "subtypeResolver" : {
+          "$ref" : "#/definitions/SubtypeResolver"
+        },
+        "attributes" : {
+          "$ref" : "#/definitions/ContextAttributes"
+        },
+        "rootName" : {
+          "type" : "string"
+        },
+        "defaultVisibilityChecker" : {
+          "$ref" : "#/definitions/VisibilityCheckerObject"
+        },
+        "base64Variant" : {
+          "$ref" : "#/definitions/Base64Variant"
+        },
+        "annotationProcessingEnabled" : {
+          "type" : "boolean"
+        },
+        "classIntrospector" : {
+          "$ref" : "#/definitions/ClassIntrospector"
+        },
+        "propertyNamingStrategy" : {
+          "$ref" : "#/definitions/PropertyNamingStrategy"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "dateFormat" : {
+          "$ref" : "#/definitions/DateFormat"
+        },
+        "handlerInstantiator" : {
+          "$ref" : "#/definitions/HandlerInstantiator"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        }
+      }
+    },
+    "SerializerFactory" : {
+      "type" : "object"
+    },
+    "SerializerProvider" : {
+      "type" : "object",
+      "properties" : {
+        "annotationIntrospector" : {
+          "$ref" : "#/definitions/AnnotationIntrospector"
+        },
+        "typeFactory" : {
+          "$ref" : "#/definitions/TypeFactory"
+        },
+        "filterProvider" : {
+          "$ref" : "#/definitions/FilterProvider"
+        },
+        "defaultNullKeySerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "defaultNullValueSerializer" : {
+          "$ref" : "#/definitions/JsonSerializerObject"
+        },
+        "config" : {
+          "$ref" : "#/definitions/SerializationConfig"
+        },
+        "timeZone" : {
+          "$ref" : "#/definitions/TimeZone"
+        },
+        "locale" : {
+          "$ref" : "#/definitions/Locale"
+        },
+        "generator" : {
+          "$ref" : "#/definitions/JsonGenerator"
+        }
+      }
+    },
+    "ShortBuilder" : {
+      "type" : "object"
+    },
+    "SocketAddress" : {
+      "type" : "object"
+    },
+    "SourceConfig" : {
+      "type" : "object",
+      "properties" : {
+        "tenant" : {
+          "type" : "string"
+        },
+        "namespace" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "className" : {
+          "type" : "string"
+        },
+        "topicName" : {
+          "type" : "string"
+        },
+        "producerConfig" : {
+          "$ref" : "#/definitions/ProducerConfig"
+        },
+        "serdeClassName" : {
+          "type" : "string"
+        },
+        "schemaType" : {
+          "type" : "string"
+        },
+        "configs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secrets" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "parallelism" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "processingGuarantees" : {
+          "type" : "string",
+          "enum" : [ "ATLEAST_ONCE", "ATMOST_ONCE", "EFFECTIVELY_ONCE" ]
+        },
+        "resources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "archive" : {
+          "type" : "string"
+        },
+        "runtimeFlags" : {
+          "type" : "string"
+        },
+        "customRuntimeOptions" : {
+          "type" : "string"
+        },
+        "batchSourceConfig" : {
+          "$ref" : "#/definitions/BatchSourceConfig"
+        },
+        "batchBuilder" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SourceInstanceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "status" : {
+          "$ref" : "#/definitions/SourceInstanceStatusData"
+        }
+      }
+    },
+    "SourceInstanceStatusData" : {
+      "type" : "object",
+      "properties" : {
+        "running" : {
+          "type" : "boolean"
+        },
+        "error" : {
+          "type" : "string"
+        },
+        "numRestarts" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numReceivedFromSource" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSystemExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSystemExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numSourceExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSourceExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numWritten" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastReceivedTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SourceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "numInstances" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numRunning" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/SourceInstanceStatus"
+          }
+        }
+      }
+    },
+    "SubtypeResolver" : {
+      "type" : "object"
+    },
+    "TimeZone" : {
+      "type" : "object",
+      "properties" : {
+        "id" : {
+          "type" : "string"
+        },
+        "dstsavings" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "rawOffset" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "displayName" : {
+          "type" : "string"
+        }
+      }
+    },
+    "TypeBindings" : {
+      "type" : "object",
+      "properties" : {
+        "empty" : {
+          "type" : "boolean"
+        },
+        "typeParameters" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/JavaType"
+          }
+        }
+      }
+    },
+    "TypeFactory" : {
+      "type" : "object",
+      "properties" : {
+        "classLoader" : {
+          "$ref" : "#/definitions/ClassLoader"
+        }
+      }
+    },
+    "UpdateOptions" : {
+      "type" : "object",
+      "properties" : {
+        "update-auth-data" : {
+          "type" : "boolean",
+          "description" : "Whether or not to update the auth data"
+        }
+      },
+      "description" : "Options while updating the sink"
+    },
+    "Value" : {
+      "type" : "object",
+      "properties" : {
+        "contentInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        },
+        "valueInclusion" : {
+          "type" : "string",
+          "enum" : [ "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS" ]
+        }
+      }
+    },
+    "VisibilityChecker" : {
+      "type" : "object"
+    },
+    "VisibilityCheckerObject" : {
+      "type" : "object"
+    },
+    "X500Principal" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        }
+      }
+    },
+    "X509Certificate" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "subjectX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "issuerX500Principal" : {
+          "$ref" : "#/definitions/X500Principal"
+        },
+        "subjectAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "issuerAlternativeNames" : {
+          "type" : "array",
+          "items" : {
+            "type" : "array",
+            "items" : {
+              "type" : "object"
+            }
+          }
+        },
+        "keyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "tbscertificate" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "sigAlgOID" : {
+          "type" : "string"
+        },
+        "sigAlgParams" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "issuerUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "subjectUniqueID" : {
+          "type" : "array",
+          "items" : {
+            "type" : "boolean"
+          }
+        },
+        "extendedKeyUsage" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "issuerDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "subjectDN" : {
+          "$ref" : "#/definitions/Principal"
+        },
+        "signature" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "basicConstraints" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "sigAlgName" : {
+          "type" : "string"
+        },
+        "serialNumber" : {
+          "type" : "integer"
+        },
+        "notBefore" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "notAfter" : {
+          "type" : "string",
+          "format" : "date-time"
+        },
+        "criticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "nonCriticalExtensionOIDs" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "encoded" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "publicKey" : {
+          "$ref" : "#/definitions/PublicKey"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/about.md b/site2/website/versioned_docs/version-2.1.0-incubating/about.md
deleted file mode 100644
index 6ed04e87053ff..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/about.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-slug: /
-id: about
-title: Welcome to the doc portal!
-sidebar_label: "About"
----
-
-import BlockLinks from "@site/src/components/BlockLinks";
-import BlockLink from "@site/src/components/BlockLink";
-import { docUrl } from "@site/src/utils/index";
-
-
-# Welcome to the doc portal!
-***
-
-This portal holds a variety of support documents to help you work with Pulsar . If you’re a beginner, there are tutorials and explainers to help you understand Pulsar and how it works.
-
-If you’re an experienced coder, review this page to learn the easiest way to access the specific content you’re looking for.
-
-## Get Started Now
-
-    
-    
-    
-    
-    
-    
-
-
-## Navigation
-***
-
-There are several ways to get around in the doc portal. The index navigation pane is a table of contents for the entire archive. The archive is divided into sections, like chapters in a book. Click the title of the topic to view it.
-
-In-context links provide an easy way to immediately reference related topics. Click the underlined term to view the topic.
-
-Links to related topics can be found at the bottom of each topic page. Click the link to view the topic.
-
-![Page Linking](/assets/page-linking.png)
-
-## Continuous Improvement
-***
-As you probably know, we are working on a new user experience for our documentation portal that will make learning about and building on top of Apache Pulsar a much better experience. Whether you need overview concepts, how-to procedures, curated guides or quick references, we’re building content to support it. This welcome page is just the first step. We will be providing updates every month.
-
-## Help Improve These Documents
-***
-
-You’ll notice an Edit button at the bottom and top of each page. Click it to open a landing page with instructions for requesting changes to posted documents. These are your resources. Participation is not only welcomed – it’s essential!
-
-## Join the Community!
-***
-
-The Pulsar community on github is active, passionate, and knowledgeable.  Join discussions, voice opinions, suggest features, and dive into the code itself. Find your Pulsar family here at [apache/pulsar](https://github.com/apache/pulsar).
-
-An equally passionate community can be found in the [Pulsar Slack channel](https://apache-pulsar.slack.com/). You’ll need an invitation to join, but many Github Pulsar community members are Slack members too.  Join, hang out, learn, and make some new friends.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-kafka.md b/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-kafka.md
deleted file mode 100644
index e98e8a0100bf4..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-kafka.md
+++ /dev/null
@@ -1,269 +0,0 @@
----
-id: adaptors-kafka
-title: Pulsar adaptor for Apache Kafka
-sidebar_label: "Kafka client wrapper"
-original_id: adaptors-kafka
----
-
-
-Pulsar provides an easy option for applications that are currently written using the [Apache Kafka](http://kafka.apache.org) Java client API.
-
-## Using the Pulsar Kafka compatibility wrapper
-
-In an existing application, change the regular Kafka client dependency and replace it with the Pulsar Kafka wrapper. Remove:
-
-```xml
-
-
-  org.apache.kafka
-  kakfa-clients
-  0.10.2.1
-
-
-```
-
-Then include this dependency for the Pulsar Kafka wrapper:
-
-```xml
-
-
-  org.apache.pulsar
-  pulsar-client-kafka
-  @pulsar:version@
-
-
-```
-
-With the new dependency, the existing code should work without any changes. The only
-thing that needs to be adjusted is the configuration, to make sure to point the
-producers and consumers to Pulsar service rather than Kafka and to use a particular
-Pulsar topic.
-
-## Using the Pulsar Kafka compatibility wrapper together with existing kafka client.
-
-When migrating from Kafka to Pulsar, the application might have to use the original kafka client
-and the pulsar kafka wrapper together during migration. Then you should consider using the
-unshaded pulsar kafka client wrapper.
-
-```xml
-
-
-  org.apache.pulsar
-  pulsar-client-kafka-original
-  @pulsar:version@
-
-
-```
-
-When using this dependency, you need to construct producer using `org.apache.kafka.clients.producer.PulsarKafkaProducer`
-instead of `org.apache.kafka.clients.producer.KafkaProducer` and `org.apache.kafka.clients.producer.PulsarKafkaConsumer` for consumers.
-
-## Producer example
-
-```java
-
-// Topic needs to be a regular Pulsar topic
-String topic = "persistent://public/default/my-topic";
-
-Properties props = new Properties();
-// Point to a Pulsar service
-props.put("bootstrap.servers", "pulsar://localhost:6650");
-
-props.put("key.serializer", IntegerSerializer.class.getName());
-props.put("value.serializer", StringSerializer.class.getName());
-
-Producer producer = new KafkaProducer(props);
-
-for (int i = 0; i < 10; i++) {
-    producer.send(new ProducerRecord(topic, i, "hello-" + i));
-    log.info("Message {} sent successfully", i);
-}
-
-producer.close();
-
-```
-
-## Consumer example
-
-```java
-
-String topic = "persistent://public/default/my-topic";
-
-Properties props = new Properties();
-// Point to a Pulsar service
-props.put("bootstrap.servers", "pulsar://localhost:6650");
-props.put("group.id", "my-subscription-name");
-props.put("enable.auto.commit", "false");
-props.put("key.deserializer", IntegerDeserializer.class.getName());
-props.put("value.deserializer", StringDeserializer.class.getName());
-
-Consumer consumer = new KafkaConsumer(props);
-consumer.subscribe(Arrays.asList(topic));
-
-while (true) {
-    ConsumerRecords records = consumer.poll(100);
-    records.forEach(record -> {
-        log.info("Received record: {}", record);
-    });
-
-    // Commit last offset
-    consumer.commitSync();
-}
-
-```
-
-## Complete Examples
-
-You can find the complete producer and consumer examples [here](https://github.com/apache/incubator-pulsar/tree/master/pulsar-client-kafka-compat/pulsar-client-kafka-tests/src/test/java/org/apache/pulsar/client/kafka/compat/examples).
-
-## Compatibility matrix
-
-Currently the Pulsar Kafka wrapper supports most of the operations offered by the Kafka API.
-
-#### Producer
-
-APIs:
-
-| Producer Method                                                               | Supported | Notes                                                                    |
-|:------------------------------------------------------------------------------|:----------|:-------------------------------------------------------------------------|
-| `Future send(ProducerRecord record)`                    | Yes       | Currently no support for explicitly set the partition id when publishing |
-| `Future send(ProducerRecord record, Callback callback)` | Yes       |                                                                          |
-| `void flush()`                                                                | Yes       |                                                                          |
-| `List partitionsFor(String topic)`                             | No        |                                                                          |
-| `Map metrics()`                                 | No        |                                                                          |
-| `void close()`                                                                | Yes       |                                                                          |
-| `void close(long timeout, TimeUnit unit)`                                     | Yes       |                                                                          |
-
-Properties:
-
-| Config property                         | Supported | Notes                                                                         |
-|:----------------------------------------|:----------|:------------------------------------------------------------------------------|
-| `acks`                                  | Ignored   | Durability and quorum writes are configured at the namespace level            |
-| `batch.size`                            | Ignored   |                                                                               |
-| `block.on.buffer.full`                  | Yes       | If true it will block producer, otherwise give error                          |
-| `bootstrap.servers`                     | Yes       | Needs to point to a single Pulsar service URL                                 |
-| `buffer.memory`                         | Ignored   |                                                                               |
-| `client.id`                             | Ignored   |                                                                               |
-| `compression.type`                      | Yes       | Allows `gzip` and `lz4`. No `snappy`.                                         |
-| `connections.max.idle.ms`               | Ignored   |                                                                               |
-| `interceptor.classes`                   | Ignored   |                                                                               |
-| `key.serializer`                        | Yes       |                                                                               |
-| `linger.ms`                             | Yes       | Controls the group commit time when batching messages                         |
-| `max.block.ms`                          | Ignored   |                                                                               |
-| `max.in.flight.requests.per.connection` | Ignored   | In Pulsar ordering is maintained even with multiple requests in flight        |
-| `max.request.size`                      | Ignored   |                                                                               |
-| `metric.reporters`                      | Ignored   |                                                                               |
-| `metrics.num.samples`                   | Ignored   |                                                                               |
-| `metrics.sample.window.ms`              | Ignored   |                                                                               |
-| `partitioner.class`                     | Ignored   |                                                                               |
-| `receive.buffer.bytes`                  | Ignored   |                                                                               |
-| `reconnect.backoff.ms`                  | Ignored   |                                                                               |
-| `request.timeout.ms`                    | Ignored   |                                                                               |
-| `retries`                               | Ignored   | Pulsar client retries with exponential backoff until the send timeout expires |
-| `send.buffer.bytes`                     | Ignored   |                                                                               |
-| `timeout.ms`                            | Ignored   |                                                                               |
-| `value.serializer`                      | Yes       |                                                                               |
-
-
-#### Consumer
-
-APIs:
-
-| Consumer Method                                                                                         | Supported | Notes |
-|:--------------------------------------------------------------------------------------------------------|:----------|:------|
-| `Set assignment()`                                                                      | No        |       |
-| `Set subscription()`                                                                            | Yes       |       |
-| `void subscribe(Collection topics)`                                                             | Yes       |       |
-| `void subscribe(Collection topics, ConsumerRebalanceListener callback)`                         | No        |       |
-| `void assign(Collection partitions)`                                                    | No        |       |
-| `void subscribe(Pattern pattern, ConsumerRebalanceListener callback)`                                   | No        |       |
-| `void unsubscribe()`                                                                                    | Yes       |       |
-| `ConsumerRecords poll(long timeoutMillis)`                                                        | Yes       |       |
-| `void commitSync()`                                                                                     | Yes       |       |
-| `void commitSync(Map offsets)`                                       | Yes       |       |
-| `void commitAsync()`                                                                                    | Yes       |       |
-| `void commitAsync(OffsetCommitCallback callback)`                                                       | Yes       |       |
-| `void commitAsync(Map offsets, OffsetCommitCallback callback)`       | Yes       |       |
-| `void seek(TopicPartition partition, long offset)`                                                      | Yes       |       |
-| `void seekToBeginning(Collection partitions)`                                           | Yes       |       |
-| `void seekToEnd(Collection partitions)`                                                 | Yes       |       |
-| `long position(TopicPartition partition)`                                                               | Yes       |       |
-| `OffsetAndMetadata committed(TopicPartition partition)`                                                 | Yes       |       |
-| `Map metrics()`                                                           | No        |       |
-| `List partitionsFor(String topic)`                                                       | No        |       |
-| `Map> listTopics()`                                                         | No        |       |
-| `Set paused()`                                                                          | No        |       |
-| `void pause(Collection partitions)`                                                     | No        |       |
-| `void resume(Collection partitions)`                                                    | No        |       |
-| `Map offsetsForTimes(Map timestampsToSearch)` | No        |       |
-| `Map beginningOffsets(Collection partitions)`                     | No        |       |
-| `Map endOffsets(Collection partitions)`                           | No        |       |
-| `void close()`                                                                                          | Yes       |       |
-| `void close(long timeout, TimeUnit unit)`                                                               | Yes       |       |
-| `void wakeup()`                                                                                         | No        |       |
-
-Properties:
-
-| Config property                 | Supported | Notes                                                 |
-|:--------------------------------|:----------|:------------------------------------------------------|
-| `group.id`                      | Yes       | Maps to a Pulsar subscription name                    |
-| `max.poll.records`              | Ignored   |                                                       |
-| `max.poll.interval.ms`          | Ignored   | Messages are "pushed" from broker                     |
-| `session.timeout.ms`            | Ignored   |                                                       |
-| `heartbeat.interval.ms`         | Ignored   |                                                       |
-| `bootstrap.servers`             | Yes       | Needs to point to a single Pulsar service URL         |
-| `enable.auto.commit`            | Yes       |                                                       |
-| `auto.commit.interval.ms`       | Ignored   | With auto-commit, acks are sent immediately to broker |
-| `partition.assignment.strategy` | Ignored   |                                                       |
-| `auto.offset.reset`             | Ignored   |                                                       |
-| `fetch.min.bytes`               | Ignored   |                                                       |
-| `fetch.max.bytes`               | Ignored   |                                                       |
-| `fetch.max.wait.ms`             | Ignored   |                                                       |
-| `metadata.max.age.ms`           | Ignored   |                                                       |
-| `max.partition.fetch.bytes`     | Ignored   |                                                       |
-| `send.buffer.bytes`             | Ignored   |                                                       |
-| `receive.buffer.bytes`          | Ignored   |                                                       |
-| `client.id`                     | Ignored   |                                                       |
-
-
-## Custom Pulsar configurations
-
-You can configure Pulsar authentication provider directly from the Kafka properties.
-
-### Pulsar client properties:
-
-| Config property                        | Default | Notes                                                                                  |
-|:---------------------------------------|:--------|:---------------------------------------------------------------------------------------|
-| `pulsar.authentication.class`          |         | Configure to auth provider. Eg. `org.apache.pulsar.client.impl.auth.AuthenticationTls` |
-| [`pulsar.use.tls`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setUseTls-boolean-)                       | `false` | Enable TLS transport encryption                                                        |
-| [`pulsar.tls.trust.certs.file.path`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setTlsTrustCertsFilePath-java.lang.String-)   |         | Path for the TLS trust certificate store                                               |
-| [`pulsar.tls.allow.insecure.connection`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setTlsAllowInsecureConnection-boolean-) | `false` | Accept self-signed certificates from brokers                                           |
-| [`pulsar.operation.timeout.ms`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setOperationTimeout-int-java.util.concurrent.TimeUnit-) | `30000` | General operations timeout |
-| [`pulsar.stats.interval.seconds`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setStatsInterval-long-java.util.concurrent.TimeUnit-) | `60` | Pulsar client lib stats printing interval |
-| [`pulsar.num.io.threads`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setIoThreads-int-) | `1` | Number of Netty IO threads to use |
-| [`pulsar.connections.per.broker`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setConnectionsPerBroker-int-) | `1` | Max number of connection to open to each broker |
-| [`pulsar.use.tcp.nodelay`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setUseTcpNoDelay-boolean-) | `true` | TCP no-delay |
-| [`pulsar.concurrent.lookup.requests`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setConcurrentLookupRequest-int-) | `50000` | Max number of concurrent topic lookups |
-| [`pulsar.max.number.rejected.request.per.connection`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setMaxNumberOfRejectedRequestPerConnection-int-) | `50` | Threshold of errors to forcefully close a connection |
-
-
-### Pulsar producer properties
-
-| Config property                        | Default | Notes                                                                                  |
-|:---------------------------------------|:--------|:---------------------------------------------------------------------------------------|
-| [`pulsar.producer.name`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setProducerName-java.lang.String-) | | Specify producer name |
-| [`pulsar.producer.initial.sequence.id`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setInitialSequenceId-long-) |  | Specify baseline for sequence id for this producer |
-| [`pulsar.producer.max.pending.messages`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessages-int-) | `1000` | Set the max size of the queue holding the messages pending to receive an acknowledgment from the broker.  |
-| [`pulsar.producer.max.pending.messages.across.partitions`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessagesAcrossPartitions-int-) | `50000` | Set the number of max pending messages across all the partitions  |
-| [`pulsar.producer.batching.enabled`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingEnabled-boolean-) | `true` | Control whether automatic batching of messages is enabled for the producer |
-| [`pulsar.producer.batching.max.messages`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingMaxMessages-int-) | `1000` | The maximum number of messages permitted in a batch |
-
-
-### Pulsar consumer Properties
-
-| Config property                        | Default | Notes                                                                                  |
-|:---------------------------------------|:--------|:---------------------------------------------------------------------------------------|
-| [`pulsar.consumer.name`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setConsumerName-java.lang.String-) | | Set the consumer name |
-| [`pulsar.consumer.receiver.queue.size`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setReceiverQueueSize-int-) | 1000 | Sets the size of the consumer receive queue |
-| [`pulsar.consumer.total.receiver.queue.size.across.partitions`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setMaxTotalReceiverQueueSizeAcrossPartitions-int-) | 50000 | Set the max total receiver queue size across partitions |
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-spark.md b/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-spark.md
deleted file mode 100644
index 230a5a6ba4640..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-spark.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-id: adaptors-spark
-title: Pulsar adaptor for Apache Spark
-sidebar_label: "Apache Spark"
-original_id: adaptors-spark
----
-
-The Spark Streaming receiver for Pulsar is a custom receiver that enables Apache [Spark Streaming](https://spark.apache.org/streaming/) to receive raw data from Pulsar.
-
-An application can receive data in [Resilient Distributed Dataset](https://spark.apache.org/docs/latest/programming-guide.html#resilient-distributed-datasets-rdds) (RDD) format via the Spark Streaming receiver and can process it in a variety of ways.
-
-## Prerequisites
-
-To use the receiver, include a dependency for the `pulsar-spark` library in your Java configuration.
-
-### Maven
-
-If you're using Maven, add this to your `pom.xml`:
-
-```xml
-
-
-@pulsar:version@
-
-
-
-  org.apache.pulsar
-  pulsar-spark
-  ${pulsar.version}
-
-
-```
-
-### Gradle
-
-If you're using Gradle, add this to your `build.gradle` file:
-
-```groovy
-
-def pulsarVersion = "@pulsar:version@"
-
-dependencies {
-    compile group: 'org.apache.pulsar', name: 'pulsar-spark', version: pulsarVersion
-}
-
-```
-
-## Usage
-
-Pass an instance of `SparkStreamingPulsarReceiver` to the `receiverStream` method in `JavaStreamingContext`:
-
-```java
-
-SparkConf conf = new SparkConf().setMaster("local[*]").setAppName("pulsar-spark");
-JavaStreamingContext jssc = new JavaStreamingContext(conf, Durations.seconds(5));
-
-ClientConfiguration clientConf = new ClientConfiguration();
-ConsumerConfiguration consConf = new ConsumerConfiguration();
-String url = "pulsar://localhost:6650/";
-String topic = "persistent://public/default/topic1";
-String subs = "sub1";
-
-JavaReceiverInputDStream msgs = jssc
-        .receiverStream(new SparkStreamingPulsarReceiver(clientConf, consConf, url, topic, subs));
-
-```
-
-## Example
-
-You can find a complete example [here](https://github.com/apache/incubator-pulsar/tree/master/tests/pulsar-spark-test/src/test/java/org/apache/pulsar/spark/example/SparkStreamingPulsarReceiverExample.java).
-In this example, the number of messages which contain the string "Pulsar" in received messages is counted.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-storm.md b/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-storm.md
deleted file mode 100644
index 8ca5ec4a8c9a9..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/adaptors-storm.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-id: adaptors-storm
-title: Pulsar adaptor for Apache Storm
-sidebar_label: "Apache Storm"
-original_id: adaptors-storm
----
-
-Pulsar Storm is an adaptor for integrating with [Apache Storm](http://storm.apache.org/) topologies. It provides core Storm implementations for sending and receiving data.
-
-An application can inject data into a Storm topology via a generic Pulsar spout, as well as consume data from a Storm topology via a generic Pulsar bolt.
-
-## Using the Pulsar Storm Adaptor
-
-Include dependency for Pulsar Storm Adaptor:
-
-```xml
-
-
-  org.apache.pulsar
-  pulsar-storm
-  ${pulsar.version}
-
-
-```
-
-## Pulsar Spout
-
-The Pulsar Spout allows for the data published on a topic to be consumed by a Storm topology. It emits a Storm tuple based on the message received and the `MessageToValuesMapper` provided by the client.
-
-The tuples that fail to be processed by the downstream bolts will be re-injected by the spout with an exponential backoff, within a configurable timeout (the default is 60 seconds) or a configurable number of retries, whichever comes first, after which it is acknowledged by the consumer. Here's an example construction of a spout:
-
-```java
-
-// Configure a Pulsar Client
-ClientConfiguration clientConf = new ClientConfiguration();
-
-// Configure a Pulsar Consumer
-ConsumerConfiguration consumerConf = new ConsumerConfiguration();  
-
-@SuppressWarnings("serial")
-MessageToValuesMapper messageToValuesMapper = new MessageToValuesMapper() {
-
-    @Override
-    public Values toValues(Message msg) {
-        return new Values(new String(msg.getData()));
-    }
-
-    @Override
-    public void declareOutputFields(OutputFieldsDeclarer declarer) {
-        // declare the output fields
-        declarer.declare(new Fields("string"));
-    }
-};
-
-// Configure a Pulsar Spout
-PulsarSpoutConfiguration spoutConf = new PulsarSpoutConfiguration();
-spoutConf.setServiceUrl("pulsar://broker.messaging.usw.example.com:6650");
-spoutConf.setTopic("persistent://my-property/usw/my-ns/my-topic1");
-spoutConf.setSubscriptionName("my-subscriber-name1");
-spoutConf.setMessageToValuesMapper(messageToValuesMapper);
-
-// Create a Pulsar Spout
-PulsarSpout spout = new PulsarSpout(spoutConf, clientConf, consumerConf);
-
-```
-
-## Pulsar Bolt
-
-The Pulsar bolt allows data in a Storm topology to be published on a topic. It publishes messages based on the Storm tuple received and the `TupleToMessageMapper` provided by the client.
-
-A partitioned topic can also be used to publish messages on different topics. In the implementation of the `TupleToMessageMapper`, a "key" will need to be provided in the message which will send the messages with the same key to the same topic. Here's an example bolt:
-
-```java
-
-// Configure a Pulsar Client
-ClientConfiguration clientConf = new ClientConfiguration();
-
-// Configure a Pulsar Producer  
-ProducerConfiguration producerConf = new ProducerConfiguration();
-
-@SuppressWarnings("serial")
-TupleToMessageMapper tupleToMessageMapper = new TupleToMessageMapper() {
-
-    @Override
-    public Message toMessage(Tuple tuple) {
-        String receivedMessage = tuple.getString(0);
-        // message processing
-        String processedMsg = receivedMessage + "-processed";
-        return MessageBuilder.create().setContent(processedMsg.getBytes()).build();
-    }
-
-    @Override
-    public void declareOutputFields(OutputFieldsDeclarer declarer) {
-        // declare the output fields
-    }
-};
-
-// Configure a Pulsar Bolt
-PulsarBoltConfiguration boltConf = new PulsarBoltConfiguration();
-boltConf.setServiceUrl("pulsar://broker.messaging.usw.example.com:6650");
-boltConf.setTopic("persistent://my-property/usw/my-ns/my-topic2");
-boltConf.setTupleToMessageMapper(tupleToMessageMapper);
-
-// Create a Pulsar Bolt
-PulsarBolt bolt = new PulsarBolt(boltConf, clientConf);
-
-```
-
-## Example
-
-You can find a complete example [here](https://github.com/apache/incubator-pulsar/tree/master/pulsar-storm/src/test/java/org/apache/pulsar/storm/example/StormExample.java).
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-brokers.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-brokers.md
deleted file mode 100644
index 57454d9d57223..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-brokers.md
+++ /dev/null
@@ -1,174 +0,0 @@
----
-id: admin-api-brokers
-title: Managing Brokers
-sidebar_label: "Brokers"
-original_id: admin-api-brokers
----
-
-Pulsar brokers consist of two components:
-
-1. An HTTP server exposing a {@inject: rest:REST:/} interface administration and [topic](reference-terminology.md#topic) lookup.
-2. A dispatcher that handles all Pulsar [message](reference-terminology.md#message) transfers.
-
-[Brokers](reference-terminology.md#broker) can be managed via:
-
-* The [`brokers`](reference-pulsar-admin.md#brokers) command of the [`pulsar-admin`](reference-pulsar-admin.md) tool
-* The `/admin/v2/brokers` endpoint of the admin {@inject: rest:REST:/} API
-* The `brokers` method of the {@inject: javadoc:PulsarAdmin:/admin/org/apache/pulsar/client/admin/PulsarAdmin.html} object in the [Java API](client-libraries-java.md)
-
-In addition to being configurable when you start them up, brokers can also be [dynamically configured](#dynamic-broker-configuration).
-
-> See the [Configuration](reference-configuration.md#broker) page for a full listing of broker-specific configuration parameters.
-
-## Brokers resources
-
-### List active brokers
-
-Fetch all available active brokers that are serving traffic.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin brokers list use
-
-```
-
-```
-
-broker1.use.org.com:8080
-
-```
-
-###### REST
-
-{@inject: endpoint|GET|/admin/v2/brokers/:cluster|operation/getActiveBrokers}
-
-###### Java
-
-```java
-
-admin.brokers().getActiveBrokers(clusterName)
-
-```
-
-#### list of namespaces owned by a given broker
-
-It finds all namespaces which are owned and served by a given broker.
-
-###### CLI
-
-```shell
-
-$ pulsar-admin brokers namespaces use \
-  --url broker1.use.org.com:8080
-
-```
-
-```json
-
-{
-  "my-property/use/my-ns/0x00000000_0xffffffff": {
-    "broker_assignment": "shared",
-    "is_controlled": false,
-    "is_active": true
-  }
-}
-
-```
-
-###### REST
-
-{@inject: endpoint|GET|/admin/v2/brokers/:cluster/:broker/ownedNamespaces|operation/getOwnedNamespaes}
-
-###### Java
-
-```java
-
-admin.brokers().getOwnedNamespaces(cluster,brokerUrl);
-
-```
-
-### Dynamic broker configuration
-
-One way to configure a Pulsar [broker](reference-terminology.md#broker) is to supply a [configuration](reference-configuration.md#broker) when the broker is [started up](reference-cli-tools.md#pulsar-broker).
-
-But since all broker configuration in Pulsar is stored in ZooKeeper, configuration values can also be dynamically updated *while the broker is running*. When you update broker configuration dynamically, ZooKeeper will notify the broker of the change and the broker will then override any existing configuration values.
-
-* The [`brokers`](reference-pulsar-admin.md#brokers) command for the [`pulsar-admin`](reference-pulsar-admin.md) tool has a variety of subcommands that enable you to manipulate a broker's configuration dynamically, enabling you to [update config values](#update-dynamic-configuration) and more.
-* In the Pulsar admin {@inject: rest:REST:/} API, dynamic configuration is managed through the `/admin/v2/brokers/configuration` endpoint.
-
-### Update dynamic configuration
-
-#### pulsar-admin
-
-The [`update-dynamic-config`](reference-pulsar-admin.md#brokers-update-dynamic-config) subcommand will update existing configuration. It takes two arguments: the name of the parameter and the new value. Here's an example for the [`brokerShutdownTimeoutMs`](reference-configuration.md#broker-brokerShutdownTimeoutMs) parameter:
-
-```shell
-
-$ pulsar-admin brokers update-dynamic-config brokerShutdownTimeoutMs 100
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/brokers/configuration/:configName/:configValue|operation/updateDynamicConfiguration}
-
-#### Java
-
-```java
-
-admin.brokers().updateDynamicConfiguration(configName, configValue);
-
-```
-
-### List updated values
-
-Fetch a list of all potentially updatable configuration parameters.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin brokers list-dynamic-config
-brokerShutdownTimeoutMs
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/brokers/configuration|operation/getDynamicConfigurationName}
-
-#### Java
-
-```java
-
-admin.brokers().getDynamicConfigurationNames();
-
-```
-
-### List all
-
-Fetch a list of all parameters that have been dynamically updated.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin brokers get-all-dynamic-config
-brokerShutdownTimeoutMs:100
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/brokers/configuration/values|operation/getAllDynamicConfigurations}
-
-#### Java
-
-```java
-
-admin.brokers().getAllDynamicConfigurations();
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-clusters.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-clusters.md
deleted file mode 100644
index 7b3635de58f35..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-clusters.md
+++ /dev/null
@@ -1,237 +0,0 @@
----
-id: admin-api-clusters
-title: Managing Clusters
-sidebar_label: "Clusters"
-original_id: admin-api-clusters
----
-
-Pulsar clusters consist of one or more Pulsar [brokers](reference-terminology.md#broker), one or more [BookKeeper](reference-terminology.md#bookkeeper)
-servers (aka [bookies](reference-terminology.md#bookie)), and a [ZooKeeper](https://zookeeper.apache.org) cluster that provides configuration and coordination management.
-
-Clusters can be managed via:
-
-* The [`clusters`](reference-pulsar-admin.md#clusters) command of the [`pulsar-admin`](reference-pulsar-admin.md) tool
-* The `/admin/v2/clusters` endpoint of the admin {@inject: rest:REST:/} API
-* The `clusters` method of the {@inject: javadoc:PulsarAdmin:/admin/org/apache/pulsar/client/admin/PulsarAdmin} object in the [Java API](client-libraries-java.md)
-
-## Clusters resources
-
-### Provision
-
-New clusters can be provisioned using the admin interface.
-
-> Please note that this operation requires superuser privileges.
-
-#### pulsar-admin
-
-You can provision a new cluster using the [`create`](reference-pulsar-admin.md#clusters-create) subcommand. Here's an example:
-
-```shell
-
-$ pulsar-admin clusters create cluster-1 \
-  --url http://my-cluster.org.com:8080 \
-  --broker-url pulsar://my-cluster.org.com:6650
-
-```
-
-#### REST API
-
-{@inject: endpoint|PUT|/admin/v2/clusters/:cluster|operation/createCluster}
-
-#### Java
-
-```java
-
-ClusterData clusterData = new ClusterData(
-        serviceUrl,
-        serviceUrlTls,
-        brokerServiceUrl,
-        brokerServiceUrlTls
-);
-admin.clusters().createCluster(clusterName, clusterData);
-
-```
-
-### Initialize cluster metadata
-
-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 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
-
-You must initialize cluster metadata *before* starting up any [brokers](admin-api-brokers.md) that will belong to the cluster.
-
-> #### No cluster metadata initialization through the REST API or the Java admin API
->
-> Unlike most other admin functions in Pulsar, cluster metadata initialization cannot be performed via the admin REST API
-> or the admin Java client, as metadata initialization involves communicating with ZooKeeper directly.
-> Instead, you can use the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool, in particular
-> the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command.
-
-Here's an example cluster metadata initialization command:
-
-```shell
-
-bin/pulsar initialize-cluster-metadata \
-  --cluster us-west \
-  --zookeeper zk1.us-west.example.com:2181 \
-  --configuration-store zk1.us-west.example.com:2184 \
-  --web-service-url http://pulsar.us-west.example.com:8080/ \
-  --web-service-url-tls https://pulsar.us-west.example.com:8443/ \
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650/ \
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651/
-
-```
-
-You'll need to use `--*-tls` flags only if you're using [TLS authentication](security-tls-authentication.md) in your instance.
-
-### Get configuration
-
-You can fetch the [configuration](reference-configuration.md) for an existing cluster at any time.
-
-#### pulsar-admin
-
-Use the [`get`](reference-pulsar-admin.md#clusters-get) subcommand and specify the name of the cluster. Here's an example:
-
-```shell
-
-$ pulsar-admin clusters get cluster-1
-{
-    "serviceUrl": "http://my-cluster.org.com:8080/",
-    "serviceUrlTls": null,
-    "brokerServiceUrl": "pulsar://my-cluster.org.com:6650/",
-    "brokerServiceUrlTls": null
-    "peerClusterNames": null
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/clusters/:cluster|operation/getCluster}
-
-#### Java
-
-```java
-
-admin.clusters().getCluster(clusterName);
-
-```
-
-### Update
-
-You can update the configuration for an existing cluster at any time.
-
-#### pulsar-admin
-
-Use the [`update`](reference-pulsar-admin.md#clusters-update) subcommand and specify new configuration values using flags.
-
-```shell
-
-$ pulsar-admin clusters update cluster-1 \
-  --url http://my-cluster.org.com:4081 \
-  --broker-url pulsar://my-cluster.org.com:3350
-
-```
-
-#### REST
-
-{@inject: endpoint|POST|/admin/v2/clusters/:cluster|operation/updateCluster}
-
-#### Java
-
-```java
-
-ClusterData clusterData = new ClusterData(
-        serviceUrl,
-        serviceUrlTls,
-        brokerServiceUrl,
-        brokerServiceUrlTls
-);
-admin.clusters().updateCluster(clusterName, clusterData);
-
-```
-
-### Delete
-
-Clusters can be deleted from a Pulsar [instance](reference-terminology.md#instance).
-
-#### pulsar-admin
-
-Use the [`delete`](reference-pulsar-admin.md#clusters-delete) subcommand and specify the name of the cluster.
-
-```
-
-$ pulsar-admin clusters delete cluster-1
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/clusters/:cluster|operation/deleteCluster}
-
-#### Java
-
-```java
-
-admin.clusters().deleteCluster(clusterName);
-
-```
-
-### List
-
-You can fetch a list of all clusters in a Pulsar [instance](reference-terminology.md#instance).
-
-#### pulsar-admin
-
-Use the [`list`](reference-pulsar-admin.md#clusters-list) subcommand.
-
-```shell
-
-$ pulsar-admin clusters list
-cluster-1
-cluster-2
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/clusters|operation/getClusters}
-
-###### Java
-
-```java
-
-admin.clusters().getClusters();
-
-```
-
-### Update peer-cluster data
-
-Peer clusters can be configured for a given cluster in a Pulsar [instance](reference-terminology.md#instance).
-
-#### pulsar-admin
-
-Use the [`update-peer-clusters`](reference-pulsar-admin.md#clusters-update-peer-clusters) subcommand and specify the list of peer-cluster names.
-
-```
-
-$ pulsar-admin update-peer-clusters cluster-1 --peer-clusters cluster-2
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/clusters/:cluster/peers|operation/setPeerClusterNames}
-
-#### Java
-
-```java
-
-admin.clusters().updatePeerClusterNames(clusterName, peerClusterList);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-namespaces.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-namespaces.md
deleted file mode 100644
index 33a278de8def1..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-namespaces.md
+++ /dev/null
@@ -1,782 +0,0 @@
----
-id: admin-api-namespaces
-title: Managing Namespaces
-sidebar_label: "Namespaces"
-original_id: admin-api-namespaces
----
-
-Pulsar [namespaces](reference-terminology.md#namespace) are logical groupings of [topics](reference-terminology.md#topic).
-
-Namespaces can be managed via:
-
-* The [`namespaces`](reference-pulsar-admin.md#clusters) command of the [`pulsar-admin`](reference-pulsar-admin.md) tool
-* The `/admin/v2/namespaces` endpoint of the admin {@inject: rest:REST:/} API
-* The `namespaces` method of the {@inject: javadoc:PulsarAdmin:/admin/org/apache/pulsar/client/admin/PulsarAdmin} object in the [Java API](client-libraries-java.md)
-
-## Namespaces resources
-
-### Create
-
-You can create new namespaces under a given [tenant](reference-terminology.md#tenant).
-
-#### pulsar-admin
-
-Use the [`create`](reference-pulsar-admin.md#namespaces-create) subcommand and specify the namespace by name:
-
-```shell
-
-$ pulsar-admin namespaces create test-tenant/test-namespace
-
-```
-
-#### REST API
-
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace}
-
-#### Java
-
-```java
-
-admin.namespaces().createNamespace(namespace);
-
-```
-
-### Get policies
-
-You can fetch the current policies associated with a namespace at any time.
-
-#### pulsar-admin
-
-Use the [`policies`](reference-pulsar-admin.md#namespaces-policies) subcommand and specify the namespace:
-
-```shell
-
-$ pulsar-admin namespaces policies test-tenant/test-namespace
-{
-  "auth_policies": {
-    "namespace_auth": {},
-    "destination_auth": {}
-  },
-  "replication_clusters": [],
-  "bundles_activated": true,
-  "bundles": {
-    "boundaries": [
-      "0x00000000",
-      "0xffffffff"
-    ],
-    "numBundles": 1
-  },
-  "backlog_quota_map": {},
-  "persistence": null,
-  "latency_stats_sample_rate": {},
-  "message_ttl_in_seconds": 0,
-  "retention_policies": null,
-  "deleted": false
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies}
-
-#### Java
-
-```java
-
-admin.namespaces().getPolicies(namespace);
-
-```
-
-### List namespaces within a tenant
-
-You can list all namespaces within a given Pulsar [tenant](reference-terminology.md#tenant).
-
-#### pulsar-admin
-
-Use the [`list`](reference-pulsar-admin.md#namespaces-list) subcommand and specify the tenant:
-
-```shell
-
-$ pulsar-admin namespaces list test-tenant
-test-tenant/ns1
-test-tenant/ns2
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces}
-
-#### Java
-
-```java
-
-admin.namespaces().getNamespaces(tenant);
-
-```
-
-#### Java
-
-```java
-
-admin.namespaces().getNamespaces(tenant);
-
-```
-
-### Delete
-
-You can delete existing namespaces from a tenant.
-
-#### pulsar-admin
-
-Use the [`delete`](reference-pulsar-admin.md#namespaces-delete) subcommand and specify the namespace:
-
-```shell
-
-$ pulsar-admin namespaces delete test-tenant/ns1
-
-```
-
-#### REST
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace}
-
-#### Java
-
-```java
-
-admin.namespaces().deleteNamespace(namespace);
-
-```
-
-#### set replication cluster
-
-It sets replication clusters for a namespace, so Pulsar can internally replicate publish message from one colo to another colo.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces set-clusters test-tenant/ns1 \
-  --clusters cl1
-
-```
-
-###### REST
-
-```
-
-{@inject: endpoint POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters}
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().setNamespaceReplicationClusters(namespace, clusters);
-
-```
-
-#### get replication cluster
-
-It gives a list of replication clusters for a given namespace.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces get-clusters test-tenant/cl1/ns1
-
-```
-
-```
-
-cl2
-
-```
-
-###### REST
-
-```
-
-GET /admin/v2/namespaces/:tenant/:namespace/replication
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().getNamespaceReplicationClusters(namespace)
-
-```
-
-#### set backlog quota policies
-
-Backlog quota helps broker to restrict bandwidth/storage of a namespace once it reach certain threshold limit . Admin can set this limit and one of the following action after the limit is reached.
-
-  1.  producer_request_hold: broker will hold and not persist produce request payload
-
-  2.  producer_exception: broker will disconnects with client by giving exception
-
-  3.  consumer_backlog_eviction: broker will start discarding backlog messages
-
-  Backlog quota restriction can be taken care by defining restriction of backlog-quota-type: destination_storage
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces set-backlog-quota --limit 10 --policy producer_request_hold test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/backlogQuota
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().setBacklogQuota(namespace, new BacklogQuota(limit, policy))
-
-```
-
-#### get backlog quota policies
-
-It shows a configured backlog quota for a given namespace.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
-
-```
-
-```json
-
-{
-  "destination_storage": {
-    "limit": 10,
-    "policy": "producer_request_hold"
-  }
-}
-
-```
-
-###### REST
-
-```
-
-GET /admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().getBacklogQuotaMap(namespace);
-
-```
-
-#### remove backlog quota policies
-
-It removes backlog quota policies for a given namespace
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-DELETE /admin/v2/namespaces/:tenant/:namespace/backlogQuota
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().removeBacklogQuota(namespace, backlogQuotaType)
-
-```
-
-#### set persistence policies
-
-Persistence policies allow to configure persistency-level for all topic messages under a given namespace.
-
-  -   Bookkeeper-ack-quorum: Number of acks (guaranteed copies) to wait for each entry, default: 0
-
-  -   Bookkeeper-ensemble: Number of bookies to use for a topic, default: 0
-
-  -   Bookkeeper-write-quorum: How many writes to make of each entry, default: 0
-
-  -   Ml-mark-delete-max-rate: Throttling rate of mark-delete operation (0 means no throttle), default: 0.0
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper-ensemble 3 --bookkeeper-write-quorum 2 --ml-mark-delete-max-rate 0 test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/persistence
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().setPersistence(namespace,new PersistencePolicies(bookkeeperEnsemble, bookkeeperWriteQuorum,bookkeeperAckQuorum,managedLedgerMaxMarkDeleteRate))
-
-```
-
-#### get persistence policies
-
-It shows configured persistence policies of a given namespace.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces get-persistence test-tenant/ns1
-
-```
-
-```json
-
-{
-  "bookkeeperEnsemble": 3,
-  "bookkeeperWriteQuorum": 2,
-  "bookkeeperAckQuorum": 2,
-  "managedLedgerMaxMarkDeleteRate": 0
-}
-
-```
-
-###### REST
-
-```
-
-GET /admin/v2/namespaces/:tenant/:namespace/persistence
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().getPersistence(namespace)
-
-```
-
-#### unload namespace bundle
-
-Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-PUT /admin/v2/namespaces/:tenant/:namespace/unload
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().unloadNamespaceBundle(namespace, bundle)
-
-```
-
-#### set message-ttl
-
-It configures message’s time to live (in seconds) duration.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/messageTTL
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().setNamespaceMessageTTL(namespace, messageTTL)
-
-```
-
-#### get message-ttl
-
-It gives a message ttl of configured namespace.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces get-message-ttl test-tenant/ns1
-
-```
-
-```
-
-100
-
-```
-
-###### REST
-
-```
-
-GET /admin/v2/namespaces/:tenant/:namespace/messageTTL
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().getNamespaceReplicationClusters(namespace)
-
-```
-
-#### split bundle
-
-Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-PUT /admin/v2/namespaces/:tenant/:namespace/{bundle}/split
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().splitNamespaceBundle(namespace, bundle)
-
-```
-
-#### clear backlog
-
-It clears all message backlog for all the topics those belong to specific namespace. You can also clear backlog for a specific subscription as well.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/clearBacklog
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().clearNamespaceBacklogForSubscription(namespace, subscription)
-
-```
-
-#### clear bundle backlog
-
-It clears all message backlog for all the topics those belong to specific NamespaceBundle. You can also clear backlog for a specific subscription as well.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub my-subscription test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().clearNamespaceBundleBacklogForSubscription(namespace, bundle, subscription)
-
-```
-
-#### set retention
-
-Each namespace contains multiple topics and each topic’s retention size (storage size) should not exceed to a specific threshold or it should be stored till certain time duration. This command helps to configure retention size and time of topics in a given namespace.
-
-###### CLI
-
-```
-
-$ pulsar-admin set-retention --size 10 --time 100 test-tenant/ns1
-
-```
-
-```
-
-N/A
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/retention
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().setRetention(namespace, new RetentionPolicies(retentionTimeInMin, retentionSizeInMB))
-
-```
-
-#### get retention
-
-It shows retention information of a given namespace.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces get-retention test-tenant/ns1
-
-```
-
-```json
-
-{
-  "retentionTimeInMinutes": 10,
-  "retentionSizeInMB": 100
-}
-
-```
-
-###### REST
-
-```
-
-GET /admin/v2/namespaces/:tenant/:namespace/retention
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().getRetention(namespace)
-
-```
-
-#### set dispatch throttling
-
-It sets message dispatch rate for all the topics under a given namespace.
-Dispatch rate can be restricted by number of message per X seconds (`msg-dispatch-rate`) or by number of message-bytes per X second (`byte-dispatch-rate`).
-dispatch rate is in second and it can be configured with `dispatch-rate-period`. Default value of `msg-dispatch-rate` and `byte-dispatch-rate` is -1 which
-disables the throttling.
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
-  --msg-dispatch-rate 1000 \
-  --byte-dispatch-rate 1048576 \
-  --dispatch-rate-period 1
-
-```
-
-###### REST
-
-```
-
-POST /admin/v2/namespaces/:tenant/:namespace/dispatchRate
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().setDispatchRate(namespace, 1000, 1048576, 1)
-
-```
-
-#### get configured message-rate
-
-It shows configured message-rate for the namespace (topics under this namespace can dispatch this many messages per second)
-
-###### CLI
-
-```
-
-$ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
-
-```
-
-```json
-
-{
-  "dispatchThrottlingRatePerTopicInMsg" : 1000,
-  "dispatchThrottlingRatePerTopicInByte" : 1048576,
-  "ratePeriodInSecond" : 1
-}
-
-```
-
-###### REST
-
-```
-
-GET /admin/v2/namespaces/:tenant/:namespace/dispatchRate
-
-```
-
-###### Java
-
-```java
-
-admin.namespaces().getDispatchRate(namespace)
-
-```
-
-### Namespace isolation
-
-Coming soon.
-
-### Unloading from a broker
-
-You can unload a namespace, or a [namespace bundle](reference-terminology.md#namespace-bundle), from the Pulsar [broker](reference-terminology.md#broker) that is currently responsible for it.
-
-#### pulsar-admin
-
-Use the [`unload`](reference-pulsar-admin.md#namespaces-unload) subcommand of the [`namespaces`](reference-pulsar-admin.md#namespaces) command.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces unload my-tenant/my-ns
-
-```
-
-#### REST API
-
-#### Java
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-non-persistent-topics.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-non-persistent-topics.md
deleted file mode 100644
index 8f0b52f32ce33..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-non-persistent-topics.md
+++ /dev/null
@@ -1,277 +0,0 @@
----
-id: admin-api-non-persistent-topics
-title: Managing non-persistent topics
-sidebar_label: "Non-Persistent topics"
-original_id: admin-api-non-persistent-topics
----
-
-Non-persistent can be used in applications that only want to consume real time published messages and
-do not need persistent guarantee that can also reduce message-publish latency by removing overhead of
-persisting messages.
-
-In all of the instructions and commands below, the topic name structure is:
-
-```shell
-
-persistent://tenant/namespace/topic
-
-```
-
-## Non-persistent topics resources
-
-### Get stats
-
-It shows current statistics of a given non-partitioned topic.
-
-  -   **msgRateIn**: The sum of all local and replication publishers' publish rates in messages per second
-
-  -   **msgThroughputIn**: Same as above, but in bytes per second instead of messages per second
-
-  -   **msgRateOut**: The sum of all local and replication consumers' dispatch rates in messages per second
-
-  -   **msgThroughputOut**: Same as above, but in bytes per second instead of messages per second
-
-  -   **averageMsgSize**: The average size in bytes of messages published within the last interval
-
-  -   **publishers**: The list of all local publishers into the topic. There can be zero or thousands
-
-  -   **averageMsgSize**: Average message size in bytes from this publisher within the last interval
-
-  -   **producerId**: Internal identifier for this producer on this topic
-
-  -   **producerName**: Internal identifier for this producer, generated by the client library
-
-  -   **address**: IP address and source port for the connection of this producer
-
-  -   **connectedSince**: Timestamp this producer was created or last reconnected
-
-  -   **subscriptions**: The list of all local subscriptions to the topic
-
-  -   **my-subscription**: The name of this subscription (client defined)
-
-  -   **type**: This subscription type
-
-  -   **consumers**: The list of connected consumers for this subscription
-
-  -   **consumerName**: Internal identifier for this consumer, generated by the client library
-
-  -   **availablePermits**: The number of messages this consumer has space for in the client library's listen queue. A value of 0 means the client library's queue is full and receive() isn't being called. A nonzero value means this consumer is ready to be dispatched messages.
-
-  -   **replication**: This section gives the stats for cross-colo replication of this topic
-
-  -   **connected**: Whether the outbound replicator is connected
-
-  -   **inboundConnection**: The IP and port of the broker in the remote cluster's publisher connection to this broker
-
-  -   **inboundConnectedSince**: The TCP connection being used to publish messages to the remote cluster. If there are no local publishers connected, this connection is automatically closed after a minute.
-
-  -   **msgDropRate**: for publisher: publish: broker only allows configured number of in flight per connection, and drops all other published messages above the threshold. Broker also drops messages for subscriptions in case of unavailable limit and connection is not writable.
-
-```json
-
-{
-  "msgRateIn": 4641.528542257553,
-  "msgThroughputIn": 44663039.74947473,
-  "msgRateOut": 0,
-  "msgThroughputOut": 0,
-  "averageMsgSize": 1232439.816728665,
-  "storageSize": 135532389160,
-  "msgDropRate" : 0.0,
-  "publishers": [
-    {
-      "msgRateIn": 57.855383881403576,
-      "msgThroughputIn": 558994.7078932219,
-      "averageMsgSize": 613135,
-      "producerId": 0,
-      "producerName": null,
-      "address": null,
-      "connectedSince": null,
-      "msgDropRate" : 0.0
-    }
-  ],
-  "subscriptions": {
-    "my-topic_subscription": {
-      "msgRateOut": 0,
-      "msgThroughputOut": 0,
-      "msgBacklog": 116632,
-      "type": null,
-      "msgRateExpired": 36.98245516804671,
-       "consumers" : [ {
-        "msgRateOut" : 20343.506296021893,
-        "msgThroughputOut" : 2.0979855364233278E7,
-        "msgRateRedeliver" : 0.0,
-        "consumerName" : "fe3c0",
-        "availablePermits" : 950,
-        "unackedMessages" : 0,
-        "blockedConsumerOnUnackedMsgs" : false,
-        "address" : "/10.73.210.249:60578",
-        "connectedSince" : "2017-07-26 15:13:48.026-0700",
-        "clientVersion" : "1.19-incubating-SNAPSHOT"
-      } ],
-      "msgDropRate" : 432.2390921571593
-
-    }
-  },
-  "replication": {}
-}
-
-```
-
-#### pulsar-admin
-
-Topic stats can be fetched using [`stats`](reference-pulsar-admin.md#stats) command.
-
-```shell
-
-$ pulsar-admin non-persistent stats \
-  non-persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/non-persistent/:tenant/:namespace/:topic/stats|operation/getStats}
-
-
-#### Java
-
-```java
-
-String topic = "non-persistent://my-tenant/my-namespace/my-topic";
-admin.nonPersistentTopics().getStats(topic);
-
-```
-
-### Get internal stats
-
-It shows detailed statistics of a topic.
-
-#### pulsar-admin
-
-Topic internal-stats can be fetched using [`stats-internal`](reference-pulsar-admin.md#stats-internal) command.
-
-```shell
-
-$ pulsar-admin non-persistent stats-internal \
-  non-persistent://test-tenant/ns1/tp1 \
-
-{
-  "entriesAddedCounter" : 48834,
-  "numberOfEntries" : 0,
-  "totalSize" : 0,
-  "cursors" : {
-    "s1" : {
-      "waitingReadOp" : false,
-      "pendingReadOps" : 0,
-      "messagesConsumedCounter" : 0,
-      "cursorLedger" : 0,
-      "cursorLedgerLastEntry" : 0
-    }
-  }
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/non-persistent/:tenant/:namespace/:topic/internalStats|operation/getInternalStats}
-
-#### Java
-
-```java
-
-String topic = "non-persistent://my-tenant/my-namespace/my-topic";
-admin.nonPersistentTopics().getInternalStats(topic);
-
-```
-
-### Create partitioned topic
-
-Partitioned topics in Pulsar must be explicitly created. When creating a new partitioned topic you need to provide a name for the topic as well as the desired number of partitions.
-
-#### pulsar-admin
-
-```shell
-
-$ bin/pulsar-admin non-persistent create-partitioned-topic \
-  non-persistent://my-tenant/my-namespace/my-topic \
-  --partitions 4
-
-```
-
-#### REST API
-
-{@inject: endpoint|PUT|/admin/v2/non-persistent/:tenant/:namespace/:topic/partitions|operation/createPartitionedTopic}
-
-#### Java
-
-```java
-
-String topicName = "non-persistent://my-tenant/my-namespace/my-topic";
-int numPartitions = 4;
-admin.nonPersistentTopics().createPartitionedTopic(topicName, numPartitions);
-
-```
-
-### Get metadata
-
-Partitioned topics have metadata associated with them that you can fetch as a JSON object. The following metadata fields are currently available:
-
-Field | Meaning
-:-----|:-------
-`partitions` | The number of partitions into which the topic is divided
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin non-persistent get-partitioned-topic-metadata \
-  non-persistent://my-tenant/my-namespace/my-topic
-{
-  "partitions": 4
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/non-persistent/:tenant/:namespace/:topic/partitions|operation/getPartitionedMetadata}
-
-
-#### Java
-
-```java
-
-String topicName = "non-persistent://my-tenant/my-namespace/my-topic";
-admin.nonPersistentTopics().getPartitionedTopicMetadata(topicName);
-
-```
-
-### Unload topic
-
-It unloads a topic.
-
-#### pulsar-admin
-
-Topic can be unloaded using [`unload`](reference-pulsar-admin.md#unload) command.
-
-```shell
-
-$ pulsar-admin non-persistent unload \
-  non-persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|PUT|/admin/v2/non-persistent/:tenant/:namespace/:topic/unload|operation/unloadTopic}
-
-#### Java
-
-```java
-
-String topic = "non-persistent://my-tenantmy-namespace/my-topic";
-admin.nonPersistentTopics().unload(topic);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-overview.md
deleted file mode 100644
index 182697cc80325..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-overview.md
+++ /dev/null
@@ -1,78 +0,0 @@
----
-id: admin-api-overview
-title: The Pulsar admin interface
-sidebar_label: "Overview"
-original_id: admin-api-overview
----
-
-The Pulsar admin interface enables you to manage all of the important entities in a Pulsar [instance](reference-terminology.md#instance), such as [tenants](reference-terminology.md#tenant), [topics](reference-terminology.md#topic), and [namespaces](reference-terminology.md#namespace).
-
-You can currently interact with the admin interface via:
-
-- Making HTTP calls against the admin {@inject: rest:REST:/} API provided by Pulsar [brokers](reference-terminology.md#broker). For some restful apis, they might be redirected to topic owner brokers for serving
-   with [`307 Temporary Redirect`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/307), hence the HTTP callers should handle `307 Temporary Redirect`. If you are using `curl`, you should specify `-L`
-   to handle redirections.
-- The `pulsar-admin` CLI tool, which is available in the `bin` folder of your [Pulsar installation](getting-started-standalone.md):
-
-```shell
-
-$ bin/pulsar-admin
-
-```
-
-Full documentation for this tool can be found in the [Pulsar command-line tools](reference-pulsar-admin.md) doc.
-
-- A Java client interface.
-
-> #### The REST API is the admin interface
-> Under the hood, both the `pulsar-admin` CLI tool and the Java client both use the REST API. If you’d like to implement your own admin interface client, you should use the REST API as well. Full documentation can be found here.
-
-In this document, examples from each of the three available interfaces will be shown.
-
-## Admin setup
-
-Each of Pulsar's three admin interfaces---the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool, the [Java admin API](/api/admin), and the {@inject: rest:REST:/} API ---requires some special setup if you have [authentication](security-overview.md#authentication-providers) enabled in your Pulsar [instance](reference-terminology.md#instance).
-
-### pulsar-admin
-
-If you have [authentication](security-overview.md#authentication-providers) enabled, you will need to provide an auth configuration to use the [`pulsar-admin`](reference-pulsar-admin.md) tool. By default, the configuration for the `pulsar-admin` tool is found in the [`conf/client.conf`](reference-configuration.md#client) file. Here are the available parameters:
-
-|Name|Description|Default|
-|----|-----------|-------|
-|webServiceUrl|The web URL for the cluster.|http://localhost:8080/|
-|brokerServiceUrl|The Pulsar protocol URL for the cluster.|pulsar://localhost:6650/|
-|authPlugin|The authentication plugin.| |
-|authParams|The authentication parameters for the cluster, as a comma-separated string.| |
-|useTls|Whether or not TLS authentication will be enforced in the cluster.|false|
-|tlsAllowInsecureConnection|Accept untrusted TLS certificate from client.|false|
-|tlsTrustCertsFilePath|Path for the trusted TLS certificate file.| |
-
-### REST API
-
-You can find documentation for the REST API exposed by Pulsar [brokers](reference-terminology.md#broker) in this reference {@inject: rest:document:/}.
-
-### Java admin client
-
-To use the Java admin API, instantiate a {@inject: javadoc:PulsarAdmin:/admin/org/apache/pulsar/client/admin/PulsarAdmin} object, specifying a URL for a Pulsar [broker](reference-terminology.md#broker) and a {@inject: javadoc:ClientConfiguration:/admin/org/apache/pulsar/client/admin/ClientConfiguration}. Here's a minimal example using `localhost`:
-
-```java
-
-URL url = new URL("http://localhost:8080");
-// Pass auth-plugin class fully-qualified name if Pulsar-security enabled
-String authPluginClassName = "com.org.MyAuthPluginClass"; 
-// Pass auth-param if auth-plugin class requires it
-String authParams = "param1=value1";
-boolean useTls = false;
-boolean tlsAllowInsecureConnection = false;
-String tlsTrustCertsFilePath = null;
-
-ClientConfiguration config = new ClientConfiguration();
-config.setAuthentication(authPluginClassName, authParams);
-config.setUseTls(useTls);
-config.setTlsAllowInsecureConnection(tlsAllowInsecureConnection);
-config.setTlsTrustCertsFilePath(tlsTrustCertsFilePath);
-
-PulsarAdmin admin = new PulsarAdmin(url, config);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-partitioned-topics.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-partitioned-topics.md
deleted file mode 100644
index 4051f494b7a57..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-partitioned-topics.md
+++ /dev/null
@@ -1,362 +0,0 @@
----
-id: admin-api-partitioned-topics
-title: Managing partitioned topics
-sidebar_label: "Partitioned topics"
-original_id: admin-api-partitioned-topics
----
-
-
-You can use Pulsar's [admin API](admin-api-overview.md) to create and manage partitioned topics.
-
-In all of the instructions and commands below, the topic name structure is:
-
-```shell
-
-persistent://tenant/namespace/topic
-
-```
-
-## Partitioned topics resources
-
-### Create
-
-Partitioned topics in Pulsar must be explicitly created. When creating a new partitioned topic you
-need to provide a name for the topic as well as the desired number of partitions.
-
-#### pulsar-admin
-
-You can create partitioned topics using the [`create-partitioned-topic`](reference-pulsar-admin.md#create-partitioned-topic)
-command and specifying the topic name as an argument and the number of partitions using the `-p` or `--partitions` flag.
-Here's an example:
-
-```shell
-
-$ bin/pulsar-admin topics create-partitioned-topic \
-  persistent://my-tenant/my-namespace/my-topic \
-  --partitions 4
-
-```
-
-#### REST API
-
-{@inject: endpoint|PUT|/admin/v2/:schema/:tenant/:namespace/:topic/partitions|operation/createPartitionedTopic}
-
-#### Java
-
-```java
-
-String topicName = "persistent://my-tenant/my-namespace/my-topic";
-int numPartitions = 4;
-admin.persistentTopics().createPartitionedTopic(topicName, numPartitions);
-
-```
-
-### Get metadata
-
-Partitioned topics have metadata associated with them that you can fetch as a JSON object.
-The following metadata fields are currently available:
-
-Field | Meaning
-:-----|:-------
-`partitions` | The number of partitions into which the topic is divided
-
-#### pulsar-admin
-
-You can see the number of partitions in a partitioned topic using the [`get-partitioned-topic-metadata`](reference-pulsar-admin.md#get-partitioned-topic-metadata)
-subcommand. Here's an example:
-
-```shell
-
-$ pulsar-admin topics get-partitioned-topic-metadata \
-  persistent://my-tenant/my-namespace/my-topic
-{
-  "partitions": 4
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/partitions|operation/getPartitionedMetadata}
-
-#### Java
-
-```java
-
-String topicName = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().getPartitionedTopicMetadata(topicName);
-
-```
-
-### Update
-
-You can update the number of partitions on an existing partitioned topic
-*if* the topic is non-global. To update, the new number of partitions must be greater
-than the existing number.
-
-Decrementing the number of partitions would deleting the topic, which is not supported in Pulsar.
-
-Already created partitioned producers and consumers can’t see newly created partitions and
-it requires to recreate them at application so, newly created producers and consumers can connect
-to newly added partitions as well. Therefore, it can violate partition ordering at producers until
-all producers are restarted at application.
-
-#### pulsar-admin
-
-Partitioned topics can be updated using the [`update-partitioned-topic`](reference-pulsar-admin.md#update-partitioned-topic) command.
-
-```shell
-
-$ pulsar-admin topics update-partitioned-topic \
-  persistent://my-tenant/my-namespace/my-topic \
-  --partitions 8
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/:schema/:tenant/:cluster/:namespace/:destination/partitions|operation/updatePartitionedTopic}
-
-#### Java
-
-```java
-
-admin.persistentTopics().updatePartitionedTopic(persistentTopic, numPartitions);
-
-```
-
-### Delete
-
-#### pulsar-admin
-
-Partitioned topics can be deleted using the [`delete-partitioned-topic`](reference-pulsar-admin.md#delete-partitioned-topic) command, specifying the topic by name:
-
-```shell
-
-$ bin/pulsar-admin topics delete-partitioned-topic \
-  persistent://my-tenant/my-namespace/my-topic
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/:schema/:topic/:namespace/:destination/partitions|operation/deletePartitionedTopic}
-
-#### Java
-
-```java
-
-admin.persistentTopics().delete(persistentTopic);
-
-```
-
-### List
-
-It provides a list of persistent topics existing under a given namespace.  
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics list tenant/namespace
-persistent://tenant/namespace/topic1
-persistent://tenant/namespace/topic2
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace|operation/getPartitionedTopicList}
-
-#### Java
-
-```java
-
-admin.persistentTopics().getList(namespace);
-
-```
-
-### Stats
-
-It shows current statistics of a given partitioned topic. Here's an example payload:
-
-```json
-
-{
-  "msgRateIn": 4641.528542257553,
-  "msgThroughputIn": 44663039.74947473,
-  "msgRateOut": 0,
-  "msgThroughputOut": 0,
-  "averageMsgSize": 1232439.816728665,
-  "storageSize": 135532389160,
-  "publishers": [
-    {
-      "msgRateIn": 57.855383881403576,
-      "msgThroughputIn": 558994.7078932219,
-      "averageMsgSize": 613135,
-      "producerId": 0,
-      "producerName": null,
-      "address": null,
-      "connectedSince": null
-    }
-  ],
-  "subscriptions": {
-    "my-topic_subscription": {
-      "msgRateOut": 0,
-      "msgThroughputOut": 0,
-      "msgBacklog": 116632,
-      "type": null,
-      "msgRateExpired": 36.98245516804671,
-      "consumers": []
-    }
-  },
-  "replication": {}
-}
-
-```
-
-The following stats are available:
-
-|Stat|Description|
-|----|-----------|
-|msgRateIn|The sum of all local and replication publishers’ publish rates in messages per second|
-|msgThroughputIn|Same as msgRateIn but in bytes per second instead of messages per second|
-|msgRateOut|The sum of all local and replication consumers’ dispatch rates in messages per second|
-|msgThroughputOut|Same as msgRateOut but in bytes per second instead of messages per second|
-|averageMsgSize|Average message size, in bytes, from this publisher within the last interval|
-|storageSize|The sum of the ledgers’ storage size for this topic|
-|publishers|The list of all local publishers into the topic. There can be anywhere from zero to thousands.|
-|producerId|Internal identifier for this producer on this topic|
-|producerName|Internal identifier for this producer, generated by the client library|
-|address|IP address and source port for the connection of this producer|
-|connectedSince|Timestamp this producer was created or last reconnected|
-|subscriptions|The list of all local subscriptions to the topic|
-|my-subscription|The name of this subscription (client defined)|
-|msgBacklog|The count of messages in backlog for this subscription|
-|type|This subscription type|
-|msgRateExpired|The rate at which messages were discarded instead of dispatched from this subscription due to TTL|
-|consumers|The list of connected consumers for this subscription|
-|consumerName|Internal identifier for this consumer, generated by the client library|
-|availablePermits|The number of messages this consumer has space for in the client library’s listen queue. A value of 0 means the client library’s queue is full and receive() isn’t being called. A nonzero value means this consumer is ready to be dispatched messages.|
-|replication|This section gives the stats for cross-colo replication of this topic|
-|replicationBacklog|The outbound replication backlog in messages|
-|connected|Whether the outbound replicator is connected|
-|replicationDelayInSeconds|How long the oldest message has been waiting to be sent through the connection, if connected is true|
-|inboundConnection|The IP and port of the broker in the remote cluster’s publisher connection to this broker|
-|inboundConnectedSince|The TCP connection being used to publish messages to the remote cluster. If there are no local publishers connected, this connection is automatically closed after a minute.|
-
-#### pulsar-admin
-
-The stats for the partitioned topic and its connected producers and consumers can be fetched by using the [`partitioned-stats`](reference-pulsar-admin.md#partitioned-stats) command, specifying the topic by name:
-
-```shell
-
-$ pulsar-admin topics partitioned-stats \
-  persistent://test-tenant/namespace/topic \
-  --per-partition
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/partitioned-stats|operation/getPartitionedStats}
-
-#### Java
-
-```java
-
-admin.persistentTopics().getStats(persistentTopic);
-
-```
-
-### Internal stats
-
-It shows detailed statistics of a topic.
-
-|Stat|Description|
-|----|-----------|
-|entriesAddedCounter|Messages published since this broker loaded this topic|
-|numberOfEntries|Total number of messages being tracked|
-|totalSize|Total storage size in bytes of all messages|
-|currentLedgerEntries|Count of messages written to the ledger currently open for writing|
-|currentLedgerSize|Size in bytes of messages written to ledger currently open for writing|
-|lastLedgerCreatedTimestamp|Time when last ledger was created|
-|lastLedgerCreationFailureTimestamp|time when last ledger was failed|
-|waitingCursorsCount|How many cursors are caught up and waiting for a new message to be published|
-|pendingAddEntriesCount|How many messages have (asynchronous) write requests we are waiting on completion|
-|lastConfirmedEntry|The ledgerid:entryid of the last message successfully written. If the entryid is -1, then the ledger has been opened or is currently being opened but has no entries written yet.|
-|state|The state of the cursor ledger. Open means we have a cursor ledger for saving updates of the markDeletePosition.|
-|ledgers|The ordered list of all ledgers for this topic holding its messages|
-|cursors|The list of all cursors on this topic. There will be one for every subscription you saw in the topic stats.|
-|markDeletePosition|The ack position: the last message the subscriber acknowledged receiving|
-|readPosition|The latest position of subscriber for reading message|
-|waitingReadOp|This is true when the subscription has read the latest message published to the topic and is waiting on new messages to be published.|
-|pendingReadOps|The counter for how many outstanding read requests to the BookKeepers we have in progress|
-|messagesConsumedCounter|Number of messages this cursor has acked since this broker loaded this topic|
-|cursorLedger|The ledger being used to persistently store the current markDeletePosition|
-|cursorLedgerLastEntry|The last entryid used to persistently store the current markDeletePosition|
-|individuallyDeletedMessages|If Acks are being done out of order, shows the ranges of messages Acked between the markDeletePosition and the read-position|
-|lastLedgerSwitchTimestamp|The last time the cursor ledger was rolled over|
-
-```json
-
-{
-  "entriesAddedCounter": 20449518,
-  "numberOfEntries": 3233,
-  "totalSize": 331482,
-  "currentLedgerEntries": 3233,
-  "currentLedgerSize": 331482,
-  "lastLedgerCreatedTimestamp": "2016-06-29 03:00:23.825",
-  "lastLedgerCreationFailureTimestamp": null,
-  "waitingCursorsCount": 1,
-  "pendingAddEntriesCount": 0,
-  "lastConfirmedEntry": "324711539:3232",
-  "state": "LedgerOpened",
-  "ledgers": [
-    {
-      "ledgerId": 324711539,
-      "entries": 0,
-      "size": 0
-    }
-  ],
-  "cursors": {
-    "my-subscription": {
-      "markDeletePosition": "324711539:3133",
-      "readPosition": "324711539:3233",
-      "waitingReadOp": true,
-      "pendingReadOps": 0,
-      "messagesConsumedCounter": 20449501,
-      "cursorLedger": 324702104,
-      "cursorLedgerLastEntry": 21,
-      "individuallyDeletedMessages": "[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]",
-      "lastLedgerSwitchTimestamp": "2016-06-29 01:30:19.313",
-      "state": "Open"
-    }
-  }
-}
-
-```
-
-#### pulsar-admin
-
-The internal stats for the partitioned topic can be fetched by using the [`stats-internal`](reference-pulsar-admin.md#stats-internal) command, specifying the topic by name:
-
-```shell
-
-$ pulsar-admin topics stats-internal \
-  persistent://test-tenant/namespace/topic
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/internalStats|operation/getInternalStats}
-
-#### Java
-
-```java
-
-admin.persistentTopics().getInternalStats(persistentTopic);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-permissions.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-permissions.md
deleted file mode 100644
index c7ab724eb12c0..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-permissions.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-id: admin-api-permissions
-title: Managing permissions
-sidebar_label: "Permissions"
-original_id: admin-api-permissions
----
-
-Permissions in Pulsar are managed at the [namespace](reference-terminology.md#namespace) level
-(that is, within [tenants](reference-terminology.md#tenant) and [clusters](reference-terminology.md#cluster)).
-
-## Grant permissions
-
-You can grant permissions to specific roles for lists of operations such as `produce` and `consume`.
-
-### pulsar-admin
-
-Use the [`grant-permission`](reference-pulsar-admin.md#grant-permission) subcommand and specify a namespace, actions using the `--actions` flag, and a role using the `--role` flag:
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-  --actions produce,consume \
-  --role admin10
-
-```
-
-Wildcard authorization can be performed when `authorizationAllowWildcardsMatching` is set to `true` in `broker.conf`.
-
-e.g.
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                        --actions produce,consume \
-                        --role 'my.role.*'
-
-```
-
-Then, roles `my.role.1`, `my.role.2`, `my.role.foo`, `my.role.bar`, etc. can produce and consume.  
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                        --actions produce,consume \
-                        --role '*.role.my'
-
-```
-
-Then, roles `1.role.my`, `2.role.my`, `foo.role.my`, `bar.role.my`, etc. can produce and consume.
-
-**Note**: A wildcard matching works at **the beginning or end of the role name only**.
-
-e.g.
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                        --actions produce,consume \
-                        --role 'my.*.role'
-
-```
-
-In this case, only the role `my.*.role` has permissions.  
-Roles `my.1.role`, `my.2.role`, `my.foo.role`, `my.bar.role`, etc. **cannot** produce and consume.
-
-### REST API
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/permissions/:role|operation/grantPermissionOnNamespace}
-
-### Java
-
-```java
-
-admin.namespaces().grantPermissionOnNamespace(namespace, role, getAuthActions(actions));
-
-```
-
-## Get permissions
-
-You can see which permissions have been granted to which roles in a namespace.
-
-### pulsar-admin
-
-Use the [`permissions`](reference-pulsar-admin#permissions) subcommand and specify a namespace:
-
-```shell
-
-$ pulsar-admin namespaces permissions test-tenant/ns1
-{
-  "admin10": [
-    "produce",
-    "consume"
-  ]
-}
-
-```
-
-### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/permissions|operation/getPermissions}
-
-### Java
-
-```java
-
-admin.namespaces().getPermissions(namespace);
-
-```
-
-## Revoke permissions
-
-You can revoke permissions from specific roles, which means that those roles will no longer have access to the specified namespace.
-
-### pulsar-admin
-
-Use the [`revoke-permission`](reference-pulsar-admin.md#revoke-permission) subcommand and specify a namespace and a role using the `--role` flag:
-
-```shell
-
-$ pulsar-admin namespaces revoke-permission test-tenant/ns1 \
-  --role admin10
-
-```
-
-### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/permissions/:role|operation/revokePermissionsOnNamespace}
-
-### Java
-
-```java
-
-admin.namespaces().revokePermissionsOnNamespace(namespace, role);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-persistent-topics.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-persistent-topics.md
deleted file mode 100644
index 1a815bbe59ba1..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-persistent-topics.md
+++ /dev/null
@@ -1,665 +0,0 @@
----
-id: admin-api-persistent-topics
-title: Managing persistent topics
-sidebar_label: "Persistent topics"
-original_id: admin-api-persistent-topics
----
-
-Persistent helps to access topic which is a logical endpoint for publishing and consuming messages. Producers publish messages to the topic and consumers subscribe to the topic, to consume messages published to the topic.
-
-In all of the instructions and commands below, the topic name structure is:
-
-```shell
-
-persistent://tenant/namespace/topic
-
-```
-
-## Persistent topics resources
-
-### List of topics
-
-It provides a list of persistent topics exist under a given namespace.
-
-#### pulsar-admin
-
-List of topics can be fetched using [`list`](../../reference/CliTools#list) command.
-
-```shell
-
-$ pulsar-admin topics list \
-  my-tenant/my-namespace
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace|operation/getList}
-
-#### Java
-
-```java
-
-String namespace = "my-tenant/my-namespace";
-admin.persistentTopics().getList(namespace);
-
-```
-
-### Grant permission
-
-It grants permissions on a client role to perform specific actions on a given topic.
-
-#### pulsar-admin
-
-Permission can be granted using [`grant-permission`](../../reference/CliTools#grant-permission) command.
-
-```shell
-
-$ pulsar-admin topics grant-permission \
-  --actions produce,consume --role application1 \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/:schema/:tenant/:namespace/:topic/permissions/:role|operation/grantPermissionsOnTopic}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String role = "test-role";
-Set actions  = Sets.newHashSet(AuthAction.produce, AuthAction.consume);
-admin.persistentTopics().grantPermission(topic, role, actions);
-
-```
-
-### Get permission
-
-Permission can be fetched using [`permissions`](../../reference/CliTools#permissions) command.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics permissions \
-  persistent://test-tenant/ns1/tp1 \
-
-{
-    "application1": [
-        "consume",
-        "produce"
-    ]
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/permissions|operation/getPermissionsOnTopic}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().getPermissions(topic);
-
-```
-
-### Revoke permission
-
-It revokes a permission which was granted on a client role.
-
-#### pulsar-admin
-
-Permission can be revoked using [`revoke-permission`](../../reference/CliTools#revoke-permission) command.
-
-```shell
-
-$ pulsar-admin topics revoke-permission \
-  --role application1 \
-  persistent://test-tenant/ns1/tp1 \
-
-{
-  "application1": [
-    "consume",
-    "produce"
-  ]
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/:schema/:tenant/:namespace/:topic/permissions/:role|operation/revokePermissionsOnTopic}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String role = "test-role";
-admin.persistentTopics().revokePermissions(topic, role);
-
-```
-
-### Delete topic
-
-It deletes a topic. The topic cannot be deleted if there's any active subscription or producers connected to it.
-
-#### pulsar-admin
-
-Topic can be deleted using [`delete`](../../reference/CliTools#delete) command.
-
-```shell
-
-$ pulsar-admin topics delete \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/:schema/:tenant/:namespace/:topic|operation/deleteTopic}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().delete(topic);
-
-```
-
-### Unload topic
-
-It unloads a topic.
-
-#### pulsar-admin
-
-Topic can be unloaded using [`unload`](../../reference/CliTools#unload) command.
-
-```shell
-
-$ pulsar-admin topics unload \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|PUT|/admin/v2/:schema/:tenant/:namespace/:topic/unload|operation/unloadTopic}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().unload(topic);
-
-```
-
-### Get stats
-
-It shows current statistics of a given non-partitioned topic.
-
-  -   **msgRateIn**: The sum of all local and replication publishers' publish rates in messages per second
-
-  -   **msgThroughputIn**: Same as above, but in bytes per second instead of messages per second
-
-  -   **msgRateOut**: The sum of all local and replication consumers' dispatch rates in messages per second
-
-  -   **msgThroughputOut**: Same as above, but in bytes per second instead of messages per second
-
-  -   **averageMsgSize**: The average size in bytes of messages published within the last interval
-
-  -   **storageSize**: The sum of the ledgers' storage size for this topic. See
-
-  -   **publishers**: The list of all local publishers into the topic. There can be zero or thousands
-
-  -   **averageMsgSize**: Average message size in bytes from this publisher within the last interval
-
-  -   **producerId**: Internal identifier for this producer on this topic
-
-  -   **producerName**: Internal identifier for this producer, generated by the client library
-
-  -   **address**: IP address and source port for the connection of this producer
-
-  -   **connectedSince**: Timestamp this producer was created or last reconnected
-
-  -   **subscriptions**: The list of all local subscriptions to the topic
-
-  -   **my-subscription**: The name of this subscription (client defined)
-
-  -   **msgBacklog**: The count of messages in backlog for this subscription
-
-  -   **type**: This subscription type
-
-  -   **msgRateExpired**: The rate at which messages were discarded instead of dispatched from this subscription due to TTL
-
-  -   **consumers**: The list of connected consumers for this subscription
-
-  -   **consumerName**: Internal identifier for this consumer, generated by the client library
-
-  -   **availablePermits**: The number of messages this consumer has space for in the client library's listen queue. A value of 0 means the client library's queue is full and receive() isn't being called. A nonzero value means this consumer is ready to be dispatched messages.
-
-  -   **replication**: This section gives the stats for cross-colo replication of this topic
-
-  -   **replicationBacklog**: The outbound replication backlog in messages
-
-  -   **connected**: Whether the outbound replicator is connected
-
-  -   **replicationDelayInSeconds**: How long the oldest message has been waiting to be sent through the connection, if connected is true
-
-  -   **inboundConnection**: The IP and port of the broker in the remote cluster's publisher connection to this broker
-
-  -   **inboundConnectedSince**: The TCP connection being used to publish messages to the remote cluster. If there are no local publishers connected, this connection is automatically closed after a minute.
-
-```json
-
-{
-  "msgRateIn": 4641.528542257553,
-  "msgThroughputIn": 44663039.74947473,
-  "msgRateOut": 0,
-  "msgThroughputOut": 0,
-  "averageMsgSize": 1232439.816728665,
-  "storageSize": 135532389160,
-  "publishers": [
-    {
-      "msgRateIn": 57.855383881403576,
-      "msgThroughputIn": 558994.7078932219,
-      "averageMsgSize": 613135,
-      "producerId": 0,
-      "producerName": null,
-      "address": null,
-      "connectedSince": null
-    }
-  ],
-  "subscriptions": {
-    "my-topic_subscription": {
-      "msgRateOut": 0,
-      "msgThroughputOut": 0,
-      "msgBacklog": 116632,
-      "type": null,
-      "msgRateExpired": 36.98245516804671,
-      "consumers": []
-    }
-  },
-  "replication": {}
-}
-
-```
-
-#### pulsar-admin
-
-Topic stats can be fetched using [`stats`](../../reference/CliTools#stats) command.
-
-```shell
-
-$ pulsar-admin topics stats \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/stats|operation/getStats}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().getStats(topic);
-
-```
-
-### Get internal stats
-
-It shows detailed statistics of a topic.
-
-  -   **entriesAddedCounter**: Messages published since this broker loaded this topic
-
-  -   **numberOfEntries**: Total number of messages being tracked
-
-  -   **totalSize**: Total storage size in bytes of all messages
-
-  -   **currentLedgerEntries**: Count of messages written to the ledger currently open for writing
-
-  -   **currentLedgerSize**: Size in bytes of messages written to ledger currently open for writing
-
-  -   **lastLedgerCreatedTimestamp**: time when last ledger was created
-
-  -   **lastLedgerCreationFailureTimestamp:** time when last ledger was failed
-
-  -   **waitingCursorsCount**: How many cursors are "caught up" and waiting for a new message to be published
-
-  -   **pendingAddEntriesCount**: How many messages have (asynchronous) write requests we are waiting on completion
-
-  -   **lastConfirmedEntry**: The ledgerid:entryid of the last message successfully written. If the entryid is -1, then the ledger has been opened or is currently being opened but has no entries written yet.
-
-  -   **state**: The state of this ledger for writing. LedgerOpened means we have a ledger open for saving published messages.
-
-  -   **ledgers**: The ordered list of all ledgers for this topic holding its messages
-
-  -   **cursors**: The list of all cursors on this topic. There will be one for every subscription you saw in the topic stats.
-
-  -   **markDeletePosition**: The ack position: the last message the subscriber acknowledged receiving
-
-  -   **readPosition**: The latest position of subscriber for reading message
-
-  -   **waitingReadOp**: This is true when the subscription has read the latest message published to the topic and is waiting on new messages to be published.
-
-  -   **pendingReadOps**: The counter for how many outstanding read requests to the BookKeepers we have in progress
-
-  -   **messagesConsumedCounter**: Number of messages this cursor has acked since this broker loaded this topic
-
-  -   **cursorLedger**: The ledger being used to persistently store the current markDeletePosition
-
-  -   **cursorLedgerLastEntry**: The last entryid used to persistently store the current markDeletePosition
-
-  -   **individuallyDeletedMessages**: If Acks are being done out of order, shows the ranges of messages Acked between the markDeletePosition and the read-position
-
-  -   **lastLedgerSwitchTimestamp**: The last time the cursor ledger was rolled over
-
-  -   **state**: The state of the cursor ledger: Open means we have a cursor ledger for saving updates of the markDeletePosition.
-
-```json
-
-{
-    "entriesAddedCounter": 20449518,
-    "numberOfEntries": 3233,
-    "totalSize": 331482,
-    "currentLedgerEntries": 3233,
-    "currentLedgerSize": 331482,
-    "lastLedgerCreatedTimestamp": "2016-06-29 03:00:23.825",
-    "lastLedgerCreationFailureTimestamp": null,
-    "waitingCursorsCount": 1,
-    "pendingAddEntriesCount": 0,
-    "lastConfirmedEntry": "324711539:3232",
-    "state": "LedgerOpened",
-    "ledgers": [
-        {
-            "ledgerId": 324711539,
-            "entries": 0,
-            "size": 0
-        }
-    ],
-    "cursors": {
-        "my-subscription": {
-            "markDeletePosition": "324711539:3133",
-            "readPosition": "324711539:3233",
-            "waitingReadOp": true,
-            "pendingReadOps": 0,
-            "messagesConsumedCounter": 20449501,
-            "cursorLedger": 324702104,
-            "cursorLedgerLastEntry": 21,
-            "individuallyDeletedMessages": "[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]",
-            "lastLedgerSwitchTimestamp": "2016-06-29 01:30:19.313",
-            "state": "Open"
-        }
-    }
-}
-
-```
-
-#### pulsar-admin
-
-Topic internal-stats can be fetched using [`stats-internal`](../../reference/CliTools#stats-internal) command.
-
-```shell
-
-$ pulsar-admin topics stats-internal \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/internalStats|operation/getInternalStats}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().getInternalStats(topic);
-
-```
-
-### Peek messages
-
-It peeks N messages for a specific subscription of a given topic.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics peek-messages \
-  --count 10 --subscription my-subscription \
-  persistent://test-tenant/ns1/tp1 \
-
-Message ID: 315674752:0
-Properties:  {  "X-Pulsar-publish-time" : "2015-07-13 17:40:28.451"  }
-msg-payload
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String subName = "my-subscription";
-int numMessages = 1;
-admin.persistentTopics().peekMessages(topic, subName, numMessages);
-
-```
-
-### Skip messages
-
-It skips N messages for a specific subscription of a given topic.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics skip \
-  --count 10 --subscription my-subscription \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/skip/:numMessages|operation/skipMessages}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String subName = "my-subscription";
-int numMessages = 1;
-admin.persistentTopics().skipMessages(topic, subName, numMessages);
-
-```
-
-### Skip all messages
-
-It skips all old messages for a specific subscription of a given topic.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics skip-all \
-  --subscription my-subscription \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/skip_all|operation/skipAllMessages}
-
-[More info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/subscription/:subName/skip_all)
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String subName = "my-subscription";
-admin.persistentTopics().skipAllMessages(topic, subName);
-
-```
-
-### Reset cursor
-
-It resets a subscription’s cursor position back to the position which was recorded X minutes before. It essentially calculates time and position of cursor at X minutes before and resets it at that position.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics reset-cursor \
-  --subscription my-subscription --time 10 \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/resetcursor/:timestamp|operation/resetCursor}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String subName = "my-subscription";
-long timestamp = 2342343L;
-admin.persistentTopics().skipAllMessages(topic, subName, timestamp);
-
-```
-
-### Lookup of topic
-
-It locates broker url which is serving the given topic.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics lookup \
-  persistent://test-tenant/ns1/tp1 \
-
- "pulsar://broker1.org.com:4480"
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/lookup/v2/topic/:schema/:tenant:namespace/:topic|/}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.lookup().lookupDestination(topic);
-
-```
-
-### Get bundle
-
-It gives range of the bundle which contains given topic
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics bundle-range \
-  persistent://test-tenant/ns1/tp1 \
-
- "0x00000000_0xffffffff"
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/lookup/v2/topic/:topic_domain/:tenant/:namespace/:topic/bundle|/}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.lookup().getBundleRange(topic);
-
-```
-
-### Get subscriptions
-
-It shows all subscription names for a given topic.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics subscriptions \
-  persistent://test-tenant/ns1/tp1 \
-
- my-subscription
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscriptions|operation/getSubscriptions}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-admin.persistentTopics().getSubscriptions(topic);
-
-```
-
-### Unsubscribe
-
-It can also help to unsubscribe a subscription which is no more processing further messages.
-
-#### pulsar-admin
-
-```shell
-
-$ pulsar-admin topics unsubscribe \
-  --subscription my-subscription \
-  persistent://test-tenant/ns1/tp1 \
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/:topic/subscription/:subscription|operation/deleteSubscription}
-
-#### Java
-
-```java
-
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-String subscriptionName = "my-subscription";
-admin.persistentTopics().deleteSubscription(topic, subscriptionName);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-schemas.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-schemas.md
deleted file mode 100644
index 161f1ee3a3491..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-schemas.md
+++ /dev/null
@@ -1,109 +0,0 @@
----
-id: admin-api-schemas
-title: Managing Schemas
-sidebar_label: "Schemas"
-original_id: admin-api-schemas
----
-
-Schemas, like other entities in Pulsar, can be managed using the [admin API](admin-api-overview.md). 
-
-## Schema resources
-
-A Pulsar schema is a fairly simple data structure stored in Pulsar for representing the structure of messages stored in a Pulsar topic. The schema structure consists of:
-
-- *Name*: A schema's name is the topic that the schema is associated to.
-- *Type*: A schema type represents the type of the schema. The predefined schema types can be found [here](concepts-schema-registry.md#supported-schema-formats). If it 
-  is a customized schema, it is left as an empty string.
-- *Payload*: It is a binary representation of the schema. How to interpret it is up to the implementation of the schema.
-- *Properties*: It is a user defined properties as a string/string map. Applications can use this bag for carrying any application specific logics. Possible properties
-  might be the Git hash associated with the schema, an environment string like `dev` or `prod`, etc.
-
-All the schemas are versioned with versions. So you can retrieve the schema definition of a given version if the version is not deleted.
-
-### Upload Schema
-
-#### pulsar-admin
-
-You can upload a new schema using the [`upload`](reference-pulsar-admin.md#get-5) subcommand:
-
-```shell
-
-$ pulsar-admin schemas upload  --filename /path/to/schema-definition-file
-
-```
-
-The schema definition file should contain following json string on defining how the schema look like:
-
-```json
-
-{
-    "type": "STRING",
-    "schema": "",
-    "properties": {
-        "key1" : "value1"
-    }
-}
-
-```
-
-An example of the schema definition file can be found at {@inject: github:SchemaExample:/conf/schema_example.conf}.
-
-#### REST
-
-{@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema}
-
-### Get Schema
-
-#### pulsar-admin
-
-You can get the latest version of Schema using the [`get`](reference-pulsar-admin.md#get-5) subcommand.
-
-```shell
-
-$ pulsar-admin schemas get 
-{
-    "version": 0,
-    "type": "String",
-    "timestamp": 0,
-    "data": "string",
-    "properties": {
-        "property1": "string",
-        "property2": "string"
-    }
-}
-
-```
-
-You can also retrieve the Schema of a given version by specifying `--version` option.
-
-```shell
-
-$ pulsar-admin schemas get  --version 
-
-```
-
-#### REST API
-
-Retrieve the latest version of the schema:
-
-{@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema}
-
-Retrieve the schema of a given version:
-
-{@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema}
-
-### Delete Schema
-
-#### pulsar-admin
-
-You can delete a schema using the [`delete`](reference-pulsar-admin.md#delete-8) subcommand.
-
-```shell
-
-$ pulsar-admin schemas delete 
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/deleteSchema}
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-tenants.md b/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-tenants.md
deleted file mode 100644
index 27764d6da3885..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/admin-api-tenants.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-id: admin-api-tenants
-title: Managing Tenants
-sidebar_label: "Tenants"
-original_id: admin-api-tenants
----
-
-Tenants, like namespaces, can be managed using the [admin API](admin-api-overview.md). There are currently two configurable aspects of tenants:
-
-* Admin roles
-* Allowed clusters
-
-## Tenant resources
-
-### List
-
-#### pulsar-admin
-
-You can list all of the tenants associated with an [instance](reference-terminology.md#instance) using the [`list`](reference-pulsar-admin.md#tenants-list) subcommand:
-
-```shell
-
-$ pulsar-admin tenants list
-
-```
-
-That will return a simple list, like this:
-
-```
-
-my-tenant-1
-my-tenant-2
-
-```
-
-### Create
-
-#### pulsar-admin
-
-You can create a new tenant using the [`create`](reference-pulsar-admin.md#tenants-create) subcommand:
-
-```shell
-
-$ pulsar-admin tenants create my-tenant
-
-```
-
-When creating a tenant, you can assign admin roles using the `-r`/`--admin-roles` flag. You can specify multiple roles as a comma-separated list. Here are some examples:
-
-```shell
-
-$ pulsar-admin tenants create my-tenant \
-  --admin-roles role1,role2,role3
-
-$ pulsar-admin tenants create my-tenant \
-  -r role1
-
-```
-
-### Get configuration
-
-#### pulsar-admin
-
-You can see a tenant's configuration as a JSON object using the [`get`](reference-pulsar-admin.md#tenants-get) subcommand and specifying the name of the tenant:
-
-```shell
-
-$ pulsar-admin tenants get my-tenant
-{
-  "adminRoles": [
-    "admin1",
-    "admin2"
-  ],
-  "allowedClusters": [
-    "cl1",
-    "cl2"
-  ]
-}
-
-```
-
-### Delete
-
-#### pulsar-admin
-
-You can delete a tenant using the [`delete`](reference-pulsar-admin.md#tenants-delete) subcommand and specifying the tenant name:
-
-```shell
-
-$ pulsar-admin tenants delete my-tenant
-
-```
-
-### Updating
-
-#### pulsar-admin
-
-You can update a tenant's configuration using the [`update`](reference-pulsar-admin.md#tenants-update) subcommand
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/administration-dashboard.md b/site2/website/versioned_docs/version-2.1.0-incubating/administration-dashboard.md
deleted file mode 100644
index 7b0538306d23d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/administration-dashboard.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-id: administration-dashboard
-title: The Pulsar dashboard
-sidebar_label: "Dashboard"
-original_id: administration-dashboard
----
-
-The Pulsar dashboard is a web application that enables users to monitor current stats for all [topics](reference-terminology.md#topic) in tabular form.
-
-The dashboard is a data collector that polls stats from all the brokers in a Pulsar instance (across multiple clusters) and stores all the information in a [PostgreSQL](https://www.postgresql.org/) database.
-
-A [Django](https://www.djangoproject.com) web app is used to render the collected data.
-
-## Install
-
-The easiest way to use the dashboard is to run it inside a [Docker](https://www.docker.com/products/docker) container. A {@inject: github:Dockerfile:/dashboard/Dockerfile} to generate the image is provided.
-
-To generate the Docker image:
-
-```shell
-
-$ docker build -t apachepulsar/pulsar-dashboard dashboard
-
-```
-
-To run the dashboard:
-
-```shell
-
-$ SERVICE_URL=http://broker.example.com:8080/
-$ docker run -p 80:80 \
-  -e SERVICE_URL=$SERVICE_URL \
-  apachepulsar/pulsar-dashboard
-
-```
-
-You need to specify only one service URL for a Pulsar cluster. Internally, the collector will figure out all the existing clusters and the brokers from where it needs to pull the metrics. If you're connecting the dashboard to Pulsar running in standalone mode, the URL will be `http://:8080` by default. `` is the ip address or hostname of the machine running Pulsar standalone. The ip address or hostname should be accessible from the docker instance running dashboard.
-
-Once the Docker container is running, the web dashboard will be accessible via `localhost` or whichever host is being used by Docker.
-
-> The `SERVICE_URL` that the dashboard uses needs to be reachable from inside the Docker container
-
-If the Pulsar service is running in standalone mode in `localhost`, the `SERVICE_URL` would have to
-be the IP of the machine.
-
-Similarly, given the Pulsar standalone advertises itself with localhost by default, we need to
-explicitly set the advertise address to the host IP. For example:
-
-```shell
-
-$ bin/pulsar standalone --advertised-address 1.2.3.4
-
-```
-
-### Known issues
-
-Pulsar [authentication](security-overview.md#authentication-providers) is not supported at this point. The dashboard's data collector does not pass any authentication-related data and will be denied access if the Pulsar broker requires authentication.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/administration-geo.md b/site2/website/versioned_docs/version-2.1.0-incubating/administration-geo.md
deleted file mode 100644
index 2b30491803c9f..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/administration-geo.md
+++ /dev/null
@@ -1,137 +0,0 @@
----
-id: administration-geo
-title: Pulsar geo-replication
-sidebar_label: "Geo-replication"
-original_id: administration-geo
----
-
-*Geo-replication* is the replication of persistently stored message data across multiple clusters of a Pulsar instance.
-
-## How it works
-
-The diagram below illustrates the process of geo-replication across Pulsar clusters:
-
-![Replication Diagram](/assets/geo-replication.png)
-
-In this diagram, whenever producers **P1**, **P2**, and **P3** publish messages to the topic **T1** on clusters **Cluster-A**, **Cluster-B**, and **Cluster-C**, respectively, those messages are instantly replicated across clusters. Once replicated, consumers **C1** and **C2** can consume those messages from their respective clusters.
-
-Without geo-replication, consumers **C1** and **C2** wouldn't be able to consume messages published by producer **P3**.
-
-## Geo-replication and Pulsar properties
-
-Geo-replication must be enabled on a per-tenant basis in Pulsar. Geo-replication can be enabled between clusters only when a tenant has been created that allows access to both clusters.
-
-Although geo-replication must be enabled between two clusters, it's actually managed at the namespace level. You must do the following to enable geo-replication for a namespace:
-
-* [Create a global namespace](#creating-global-namespaces)
-* Configure that namespace to replicate between two or more provisioned clusters
-
-Any message published on *any* topic in that namespace will then be replicated to all clusters in the specified set.
-
-## Local persistence and forwarding
-
-When messages are produced on a Pulsar topic, they are first persisted in the local cluster and then forwarded asynchronously to the remote clusters.
-
-In normal cases, when there are no connectivity issues, messages are replicated immediately, at the same time as they are dispatched to local consumers. Typically, end-to-end delivery latency is defined by the network [round-trip time](https://en.wikipedia.org/wiki/Round-trip_delay_time) (RTT) between the remote regions.
-
-Applications can create producers and consumers in any of the clusters, even when the remote clusters are not reachable (like during a network partition).
-
-> #### Subscriptions are local to a cluster
-> While producers and consumers can publish to and consume from any cluster in a Pulsar instance, subscriptions are local to the clusters in which they are created and cannot be transferred between clusters. If you do need to transfer a subscription, you’ll need to create a new subscription in the desired cluster.
-
-In the example in the image above, the topic **T1** is being replicated between 3 clusters, **Cluster-A**, **Cluster-B**, and **Cluster-C**.
-
-All messages produced in any cluster will be delivered to all subscriptions in all the other clusters. In this case, consumers **C1** and **C2** will receive all messages published by producers **P1**, **P2**, and **P3**. Ordering is still guaranteed on a per-producer basis.
-
-## Configuring replication
-
-As stated [above](#geo-replication-and-pulsar-properties), geo-replication in Pulsar is managed at the [tenant](reference-terminology.md#tenant) level.
-
-### Granting permissions to properties
-
-To establish replication to a cluster, the tenant needs permission to use that cluster. This permission can be granted when the tenant is created or later on.
-
-At creation time, specify all the intended clusters:
-
-```shell
-
-$ bin/pulsar-admin properties create my-tenant \
-  --admin-roles my-admin-role \
-  --allowed-clusters us-west,us-east,us-cent
-
-```
-
-To update permissions of an existing tenant, use `update` instead of `create`.
-
-### Creating global namespaces
-
-Replication must be used with *global* topics, meaning topics that belong to a global namespace and are thus not tied to any particular cluster.
-
-Global namespaces need to be created in the `global` virtual cluster. For example:
-
-```shell
-
-$ bin/pulsar-admin namespaces create my-tenant/my-namespace
-
-```
-
-Initially, the namespace is not assigned to any cluster. You can assign the namespace to clusters using the `set-clusters` subcommand:
-
-```shell
-
-$ bin/pulsar-admin namespaces set-clusters my-tenant/my-namespace \
-  --clusters us-west,us-east,us-cent
-
-```
-
-The replication clusters for a namespace can be changed at any time, with no disruption to ongoing traffic. Replication channels will be immediately set up or stopped in all the clusters as soon as the configuration changes.
-
-### Using global topics
-
-Once you've created a global namespace, any topics that producers or consumers create within that namespace will be global. Typically, each application will use the `serviceUrl` for the local cluster.
-
-#### Selective replication
-
-By default, messages are replicated to all clusters configured for the namespace. You can restrict replication selectively by specifying a replication list for a message. That message will then be replicated only to the subset in the replication list.
-
-Below is an example for the [Java API](client-libraries-java.md). Note the use of the `setReplicationClusters` method when constructing the {@inject: javadoc:Message:/client/org/apache/pulsar/client/api/Message} object:
-
-```java
-
-List restrictReplicationTo = Arrays.asList(
-        "us-west",
-        "us-east"
-);
-
-Producer producer = client.newProducer()
-        .topic("some-topic")
-        .create();
-
-producer.newMessage()
-        .value("my-payload".getBytes())
-        .setReplicationClusters(restrictReplicationTo)
-        .send();
-
-```
-
-#### Topic stats
-
-Topic-specific statistics for global topics are available via the [`pulsar-admin`](reference-pulsar-admin.md) tool and {@inject: rest:REST:/} API:
-
-```shell
-
-$ bin/pulsar-admin persistent stats persistent://my-tenant/my-namespace/my-topic
-
-```
-
-Each cluster reports its own local stats, including incoming and outgoing replication rates and backlogs.
-
-#### Deleting a global topic
-
-Given that global topics exist in multiple regions, it's not possible to directly delete a global topic. Instead, you should rely on automatic topic garbage collection.
-
-In Pulsar, a topic is automatically deleted when it's no longer used, that is to say, when no producers or consumers are connected *and* there are no subscriptions *and* no more messages are kept for retention. For global topics, each region will use a fault-tolerant mechanism to decide when it's safe to delete the topic locally.
-
-You can explicitly disable topic garbage collection by setting `brokerDeleteInactiveTopicsEnabled` to `false` in your [broker configuration](reference-configuration#broker).
-
-To delete a global topic, close all producers and consumers on the topic and delete all its local subscriptions in every replication cluster. When Pulsar determines that no valid subscription for the topic remains across the system, it will garbage collect the topic.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/administration-load-distribution.md b/site2/website/versioned_docs/version-2.1.0-incubating/administration-load-distribution.md
deleted file mode 100644
index 07f7e7033b3b6..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/administration-load-distribution.md
+++ /dev/null
@@ -1,235 +0,0 @@
----
-id: administration-load-distribution
-title: Pulsar load distribution
-sidebar_label: "Load distribution"
-original_id: administration-load-distribution
----
-
-## Load distribution across Pulsar brokers
-
-Pulsar is an horizontally scalable messaging system, so it is a core requirement that the traffic
-in a logical cluster must be spread across all the available Pulsar brokers, as evenly as possible.
-
-In most cases, this is true out of the box and one shouldn't worry about it. There are, though,
-multiple settings and tools to control the traffic distribution and they require a bit of
-context to understand how the traffic is managed in Pulsar.
-
-## Pulsar load manager architecture
-
-### Dynamic assignment of topics to brokers
-
-Topics are dynamically assigned to brokers based on the load conditions of all brokers in the
-cluster.
-
-When a clients starts using new topics that are not assigned to any broker, it will trigger a
-process that, given the load conditions, it will choose the best suited broker to acquire ownership
-of such topic.
-
-In case of partitioned topics, different partitions might be assigned to different brokers. We talk
-about "topic" in this context to mean either a non-partitioned topic or one partition of a topic.
-
-The assignment is "dynamic" because it can change very quickly. For example, if the broker owning
-the topic crashes, the topic will be reassigned immediately to another broker. Another scenario is
-that the broker owning the topic becomes overloaded. In this case too, the topic will be
-reassigned to a less loaded broker.
-
-The dynamic assignment is made possible by the stateless nature of brokers. This also ensure that
-we can quickly expand or shrink the cluster based on usage.
-
-### Assignment granularity
-
-The assignment of topics/partitions to brokers is not done at the individual level. The reason for
-it is to amortize the amount of information that we need to keep track (eg. which topics are
-assigned to a particular broker, what's the load on topics for a broker and similar).
-
-Instead of individual topic/partition assignment, each broker takes ownership of a subset of the
-topics for a namespace. This subset is called a "*bundle*" and effectively it's a sharding
-mechanism.
-
-The namespace is the "administrative" unit: many config knobs or operations are done at the
-namespace level.
-
-For assignment, a namespaces is sharded into a list of "bundles", with each bundle comprising
-a portion of overall hash range of the namespace.
-
-Topics are assigned to a particular bundle by taking the hash of the topic name and seeing in which
-bundle the hash falls into.
-
-Each bundle is independent of the others and thus is independently assigned to different brokers.
-
-### Creating namespaces and bundles
-
-When creating a new namespace, it will set to use the default number of bundles. This is set in
-`conf/broker.conf`:
-
-```properties
-
-# When a namespace is created without specifying the number of bundle, this
-# value will be used as the default
-defaultNumberOfNamespaceBundles=4
-
-```
-
-One can either change the system default, or override it when creating a new namespace:
-
-```shell
-
-$ bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16
-
-```
-
-With this command, we're creating a namespace with 16 initial bundles. Therefore the topics for
-this namespaces can immediately be spread across up to 16 brokers.
-
-In general, if the expected traffic and number of topics is known in advance, it's a good idea to
-start with a reasonable number of bundles instead of waiting for the system to auto-correct the
-distribution.
-
-On a same note, it is normally beneficial to start with more bundles than number of brokers,
-primarily because of the hashing nature of the distribution of topics into bundles. For example,
-for a namespace with 1000 topics, using something like 64 bundles will achieve a good distribution
-of traffic across 16 brokers.
-
-### Unloading topics and bundles
-
-In Pulsar there is an admin operation of "unloading" a topic. Unloading means to close the topics,
-release ownership and reassign the topics to a new broker, based on current load.
-
-When unload happens, the client will experience a small latency blip, typically in the order of
-tens of milliseconds, while the topic is reassigned.
-
-Unloading is the mechanism used by the load-manager to perform the load shedding, but it can
-also be triggered manually, for example to correct the assignments and redistribute traffic
-even before having any broker overloaded.
-
-Unloading a topic has no effect on the assignment, but it will just close and reopen the
-particular topic:
-
-```shell
-
-pulsar-admin topics unload persistent://tenant/namespace/topic
-
-```
-
-To unload all topics for a namespace and trigger reassignments:
-
-```shell
-
-pulsar-admin namespaces unload tenant/namespace
-
-```
-
-### Namespace bundles splitting
-
-Since the load for the topics in a bundle might change over time, or could just be hard to predict
-upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned
-to different brokers.
-
-The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any
-of the threshold is a candidate to be split. By default the newly split bundles are also
-immediately offloaded to other brokers, to facilitate the traffic distribution.
-
-```properties
-
-# enable/disable namespace bundle auto split
-loadBalancerAutoBundleSplitEnabled=true
-
-# enable/disable automatic unloading of split bundles
-loadBalancerAutoUnloadSplitBundlesEnabled=true
-
-# maximum topics in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxTopics=1000
-
-# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxSessions=1000
-
-# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxMsgRate=30000
-
-# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxBandwidthMbytes=100
-
-# maximum number of bundles in a namespace (for auto-split)
-loadBalancerNamespaceMaximumBundles=128
-
-```
-
-### Automatic load shedding
-
-In Pulsar's load manager there is support for automatic load shedding. This means that whenever
-the system recognized a particular broker is overloaded, it will force some traffic to be
-reassigned to less loaded brokers.
-
-When a broker is identifies as overloaded, it will force to "unload" a subset of the bundles, the
-ones with higher traffic, that make up for the overload percentage.
-
-For example, the default threshold is 85% and if a broker is over quota at 95% CPU usage, then
-it will unload the percent difference plus a 5% margin: `(95% - 85%) + 5% = 15%`.
-
-Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network
-and memory), broker will unload bundles for at least 15% of traffic.
-
-The automatic load shedding is enabled by default and can be disabled with this setting:
-
-```properties
-
-# Enable/disable automatic bundle unloading for load-shedding
-loadBalancerSheddingEnabled=true
-
-```
-
-There are additional settings that apply to shedding:
-
-```properties
-
-# Load shedding interval. Broker periodically checks whether some traffic should be offload from
-# some over-loaded broker to other under-loaded brokers
-loadBalancerSheddingIntervalMinutes=1
-
-# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe
-loadBalancerSheddingGracePeriodMinutes=30
-
-```
-
-#### Broker overload thresholds
-
-The determinations of when a broker is overloaded is based on threshold of CPU, network and
-memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding
-(if enabled).
-
-By default, overload threshold is set at 85%:
-
-```properties
-
-# Usage threshold to determine a broker as over-loaded
-loadBalancerBrokerOverloadedThresholdPercentage=85
-
-```
-
-The usage stats are gathered by Pulsar from the system metrics.
-
-In case of network utilization, in some cases the network interface speed reported by Linux is
-not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps
-NIC speed for which the OS report 10Gbps speed.
-
-Because of the incorrect max speed, the Pulsar load manager might think the broker has not
-reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
-being slowed down.
-
-There is a setting to correct the max NIC speed:
-
-```properties
-
-# Override the auto-detection of the network interfaces max speed.
-# This option is useful in some environments (eg: EC2 VMs) where the max speed
-# reported by Linux is not reflecting the real bandwidth available to the broker.
-# Since the network usage is employed by the load manager to decide when a broker
-# is overloaded, it is important to make sure the info is correct or override it
-# with the right value here. The configured value can be a double (eg: 0.8) and that
-# can be used to trigger load-shedding even before hitting on NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
-
-```
-
-When the value is empty, Pulsar will use the value reported by the OS.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/administration-proxy.md b/site2/website/versioned_docs/version-2.1.0-incubating/administration-proxy.md
deleted file mode 100644
index c3948e979bebb..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/administration-proxy.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-id: administration-proxy
-title: The Pulsar proxy
-sidebar_label: "Pulsar proxy"
-original_id: administration-proxy
----
-
-The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) is an optional gateway that you can run over the brokers in a Pulsar cluster. We recommend running a Pulsar proxy in cases when direction connections between clients and Pulsar brokers are either infeasible, undesirable, or both, for example when running Pulsar in a cloud environment or on [Kubernetes](https://kubernetes.io) or an analogous platform.
-
-## Running the proxy
-
-In order to run the Pulsar proxy, you need to have both a local [ZooKeeper](https://zookeeper.apache.org) and configuration store quorum set up for use by your Pulsar cluster. For instructions, see [this document](deploy-bare-metal.md). Once you have ZooKeeper set up and have connection strings for both ZooKeeper quorums, you can use the [`proxy`](reference-cli-tools.md#pulsar-proxy) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool to start up the proxy (preferably on its own machine or in its own VM):
-
-To start the proxy:
-
-```bash
-
-$ cd /path/to/pulsar/directory
-$ bin/pulsar proxy \
-  --zookeeper-servers zk-0,zk-1,zk-2 \
-  --configuration-store-servers zk-0,zk-1,zk-2
-
-```
-
-> You can run as many instances of the Pulsar proxy in a cluster as you would like.
-
-
-## Stopping the proxy
-
-The Pulsar proxy runs by default in the foreground. To stop the proxy, simply stop the process in which it's running.
-
-## Proxy frontends
-
-We recommend running the Pulsar proxy behind some kind of load-distributing frontend, such as an [HAProxy](https://www.digitalocean.com/community/tutorials/an-introduction-to-haproxy-and-load-balancing-concepts) load balancer.
-
-## Using Pulsar clients with the proxy
-
-Once your Pulsar proxy is up and running, preferably behind a load-distributing [frontend](#proxy-frontends), clients can connect to the proxy via whichever address is used by the frontend. If the address were the DNS address `pulsar.cluster.default`, for example, then the connection URL for clients would be `pulsar://pulsar.cluster.default:6650`.
-
-## Proxy configuration
-
-The Pulsar proxy can be configured using the [`proxy.conf`](reference-configuration.md#proxy) configuration file. The following parameters are available in that file:
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  The ZooKeeper quorum connection string (as a comma-separated list)  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|zookeeperSessionTimeoutMs| ZooKeeper session timeout (in milliseconds) |30000|
-|servicePort| The port to use for server binary Protobuf requests |6650|
-|servicePortTls|  The port to use to server binary Protobuf TLS requests  |6651|
-|statusFilePath | Path for the file used to determine the rotation status for the proxy instance when responding to service discovery health checks ||
-|authenticationEnabled| Whether authentication is enabled for the Pulsar proxy  |false|
-|authenticationProviders| Authentication provider name list (a comma-separated list of class names) ||
-|authorizationEnabled|  Whether authorization is enforced by the Pulsar proxy |false|
-|authorizationProvider| Authorization provider as a fully qualified class name  |org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider|
-|brokerClientAuthenticationPlugin|  The authentication plugin used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientAuthenticationParameters|  The authentication parameters used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientTrustCertsFilePath|  The path to trusted certificates used by the Pulsar proxy to authenticate with Pulsar brokers ||
-|superUserRoles|  Role names that are treated as "super-users," meaning that they will be able to perform all admin ||
-|forwardAuthorizationCredentials| Whether client authorization credentials are forwarded to the broker for re-authorization. Authentication must be enabled via authenticationEnabled=true for this to take effect.  |false|
-|maxConcurrentInboundConnections| Max concurrent inbound connections. The proxy will reject requests beyond that. |10000|
-|maxConcurrentLookupRequests| Max concurrent outbound connections. The proxy will error out requests beyond that. |10000|
-|tlsEnabledInProxy| Whether TLS is enabled for the proxy  |false|
-|tlsEnabledWithBroker|  Whether TLS is enabled when communicating with Pulsar brokers |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-|tlsTrustCertsFilePath| Path for the trusted TLS certificate pem file ||
-|tlsHostnameVerificationEnabled|  Whether the hostname is validated when the proxy creates a TLS connection with brokers  |false|
-|tlsRequireTrustedClientCertOnConnect|  Whether client certificates are required for TLS. Connections are rejected if the client certificate isn’t trusted. |false|
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/administration-stats.md b/site2/website/versioned_docs/version-2.1.0-incubating/administration-stats.md
deleted file mode 100644
index 51626747fe17c..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/administration-stats.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-id: administration-stats
-title: Pulsar stats
-sidebar_label: "Pulsar statistics"
-original_id: administration-stats
----
-
-## Partitioned topics
-
-|Stat|Description|
-|---|---|
-|msgRateIn| The sum of all local and replication publishers’ publish rates in messages per second|
-|msgThroughputIn| Same as msgRateIn but in bytes per second instead of messages per second|
-|msgRateOut|  The sum of all local and replication consumers’ dispatch rates in messages per second|
-|msgThroughputOut|  Same as msgRateOut but in bytes per second instead of messages per second|
-|averageMsgSize|  Average message size, in bytes, from this publisher within the last interval|
-|storageSize| The sum of the ledgers’ storage size for this topic|
-|publishers|  The list of all local publishers into the topic. There can be anywhere from zero to thousands.|
-|producerId|  Internal identifier for this producer on this topic|
-|producerName|  Internal identifier for this producer, generated by the client library|
-|address| IP address and source port for the connection of this producer|
-|connectedSince|  Timestamp this producer was created or last reconnected|
-|subscriptions| The list of all local subscriptions to the topic|
-|my-subscription| The name of this subscription (client defined)|
-|msgBacklog|  The count of messages in backlog for this subscription|
-|type|  This subscription type|
-|msgRateExpired|  The rate at which messages were discarded instead of dispatched from this subscription due to TTL|
-|consumers| The list of connected consumers for this subscription|
-|consumerName|  Internal identifier for this consumer, generated by the client library|
-|availablePermits|  The number of messages this consumer has space for in the client library’s listen queue. A value of 0 means the client library’s queue is full and receive() isn’t being called. A nonzero value means this consumer is ready to be dispatched messages.|
-|replication| This section gives the stats for cross-colo replication of this topic|
-|replicationBacklog|  The outbound replication backlog in messages|
-|connected| Whether the outbound replicator is connected|
-|replicationDelayInSeconds| How long the oldest message has been waiting to be sent through the connection, if connected is true|
-|inboundConnection| The IP and port of the broker in the remote cluster’s publisher connection to this broker|
-|inboundConnectedSince| The TCP connection being used to publish messages to the remote cluster. If there are no local publishers connected, this connection is automatically closed after a minute.|
-
-
-## Topics
-
-|Stat|Description|
-|---|---|
-|entriesAddedCounter| Messages published since this broker loaded this topic|
-|numberOfEntries| Total number of messages being tracked|
-|totalSize| Total storage size in bytes of all messages|
-|currentLedgerEntries|  Count of messages written to the ledger currently open for writing|
-|currentLedgerSize| Size in bytes of messages written to ledger currently open for writing|
-|lastLedgerCreatedTimestamp|  Time when last ledger was created|
-|lastLedgerCreationFailureTimestamp|  time when last ledger was failed|
-|waitingCursorsCount| How many cursors are caught up and waiting for a new message to be published|
-|pendingAddEntriesCount|  How many messages have (asynchronous) write requests we are waiting on completion|
-|lastConfirmedEntry|  The ledgerid:entryid of the last message successfully written. If the entryid is -1, then the ledger has been opened or is currently being opened but has no entries written yet.|
-|state| The state of the cursor ledger. Open means we have a cursor ledger for saving updates of the markDeletePosition.|
-|ledgers| The ordered list of all ledgers for this topic holding its messages|
-|cursors| The list of all cursors on this topic. There will be one for every subscription you saw in the topic stats.|
-|markDeletePosition|  The ack position: the last message the subscriber acknowledged receiving|
-|readPosition|  The latest position of subscriber for reading message|
-|waitingReadOp| This is true when the subscription has read the latest message published to the topic and is waiting on new messages to be published.|
-|pendingReadOps|  The counter for how many outstanding read requests to the BookKeepers we have in progress|
-|messagesConsumedCounter| Number of messages this cursor has acked since this broker loaded this topic|
-|cursorLedger|  The ledger being used to persistently store the current markDeletePosition|
-|cursorLedgerLastEntry| The last entryid used to persistently store the current markDeletePosition|
-|individuallyDeletedMessages| If Acks are being done out of order, shows the ranges of messages Acked between the markDeletePosition and the read-position|
-|lastLedgerSwitchTimestamp| The last time the cursor ledger was rolled over|
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/administration-zk-bk.md b/site2/website/versioned_docs/version-2.1.0-incubating/administration-zk-bk.md
deleted file mode 100644
index bdc41b5e07d3d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/administration-zk-bk.md
+++ /dev/null
@@ -1,350 +0,0 @@
----
-id: administration-zk-bk
-title: ZooKeeper and BookKeeper administration
-sidebar_label: "ZooKeeper and BookKeeper"
-original_id: administration-zk-bk
----
-
-Pulsar relies on two external systems for essential tasks:
-
-* [ZooKeeper](https://zookeeper.apache.org/) is responsible for a wide variety of configuration- and coordination-related tasks.
-* [BookKeeper](http://bookkeeper.apache.org/) is responsible for [persistent storage](concepts-architecture-overview.md#persistent-storage) of message data.
-
-ZooKeeper and BookKeeper are both open-source [Apache](https://www.apache.org/) projects.
-
-> Skip to the [How Pulsar uses ZooKeeper and BookKeeper](#how-pulsar-uses-zookeeper-and-bookkeeper) section below for a more schematic explanation of the role of these two systems in Pulsar.
-' %}
-
-## ZooKeeper
-
-Each Pulsar instance relies on two separate ZooKeeper quorums.
-
-* [Local ZooKeeper](#deploying-local-zookeeper) operates at the cluster level and provides cluster-specific configuration management and coordination. Each Pulsar cluster needs to have a dedicated ZooKeeper cluster.
-* [Configuration Store](#deploying-configuration-store) operates at the instance level and provides configuration management for the entire system (and thus across clusters). The configuration store quorum can be provided by an independent cluster of machines or by the same machines used by local ZooKeeper.
-
-### Deploying local ZooKeeper
-
-ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.
-
-Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster *per Pulsar cluster*. 
-
-To begin, add all ZooKeeper servers to the quorum configuration specified in the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. Add a `server.N` line for each node in the cluster to the configuration, where `N` is the number of the ZooKeeper node. Here's an example for a three-node cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-On each host, you need to specify the ID of the node in each node's `myid` file, which is in each server's `data/zookeeper` folder by default (this can be changed via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
-
-> See the [Multi-server setup guide](https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup) in the ZooKeeper documentation for detailed info on `myid` and more.
-
-
-On a ZooKeeper server at `zk1.us-west.example.com`, for example, you could set the `myid` value like this:
-
-```shell
-
-$ mkdir -p data/zookeeper
-$ echo 1 > data/zookeeper/myid
-
-```
-
-On `zk2.us-west.example.com` the command would be `echo 2 > data/zookeeper/myid` and so on.
-
-Once each server has been added to the `zookeeper.conf` configuration and has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```shell
-
-$ bin/pulsar-daemon start zookeeper
-
-```
-
-### Deploying the configuration store {#configuration-store}
-
-The ZooKeeper cluster configured and started up in the section above is a *local* ZooKeeper cluster used to manage a single Pulsar cluster. In addition to a local cluster, however, a full Pulsar instance also requires a configuration store for handling some instance-level configuration and coordination tasks.
-
-If you're deploying a [single-cluster](#single-cluster-pulsar-instance) instance, then you will not need a separate cluster for the configuration store. If, however, you're deploying a [multi-cluster](#multi-cluster-pulsar-instance) instance, then you should stand up a separate ZooKeeper cluster for configuration tasks.
-
-#### Single-cluster Pulsar instance
-
-If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.
-
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorum to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). Here's an example that uses port 2184 for a three-node ZooKeeper cluster:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-
-```
-
-As before, create the `myid` files for each server on `data/global-zookeeper/myid`.
-
-#### Multi-cluster Pulsar instance
-
-When deploying a global Pulsar instance, with clusters distributed across different geographical regions, the configuration store serves as a highly available and strongly consistent metadata store that can tolerate failures and partitions spanning whole regions.
-
-The key here is to make sure the ZK quorum members are spread across at least 3
-regions and that other regions are running as observers.
-
-Again, given the very low expected load on the configuration store servers, we can
-share the same hosts used for the local ZooKeeper quorum.
-
-For example, let's assume a Pulsar instance with the following clusters `us-west`,
-`us-east`, `us-central`, `eu-central`, `ap-south`. Also let's assume, each cluster
-will have its own local ZK servers named such as
-
-```
-
-zk[1-3].${CLUSTER}.example.com
-
-```
-
-In this scenario we want to pick the quorum participants from few clusters and
-let all the others be ZK observers. For example, to form a 7 servers quorum, we
-can pick 3 servers from `us-west`, 2 from `us-central` and 2 from `us-east`.
-
-This will guarantee that writes to configuration store will be possible even if one
-of these regions is unreachable.
-
-The ZK configuration in all the servers will look like:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-server.4=zk1.us-central.example.com:2185:2186
-server.5=zk2.us-central.example.com:2185:2186
-server.6=zk3.us-central.example.com:2185:2186:observer
-server.7=zk1.us-east.example.com:2185:2186
-server.8=zk2.us-east.example.com:2185:2186
-server.9=zk3.us-east.example.com:2185:2186:observer
-server.10=zk1.eu-central.example.com:2185:2186:observer
-server.11=zk2.eu-central.example.com:2185:2186:observer
-server.12=zk3.eu-central.example.com:2185:2186:observer
-server.13=zk1.ap-south.example.com:2185:2186:observer
-server.14=zk2.ap-south.example.com:2185:2186:observer
-server.15=zk3.ap-south.example.com:2185:2186:observer
-
-```
-
-Additionally, ZK observers will need to have:
-
-```properties
-
-peerType=observer
-
-```
-
-##### Starting the service
-
-Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
-
-```shell
-
-$ bin/pulsar-daemon start configuration-store
-
-```
-
-### ZooKeeper configuration
-
-In Pulsar, ZooKeeper configuration is handled by two separate configuration files found in the `conf` directory of your Pulsar installation: `conf/zookeeper.conf` for [local ZooKeeper](#local-zookeeper) and `conf/global-zookeeper.conf` for [configuration store](#configuration-store).
-
-#### Local ZooKeeper
-
-Configuration for local ZooKeeper is handled by the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. The table below shows the available parameters:
-
-|Name|Description|Default|
-|---|---|---|
-|tickTime|  The tick is the basic unit of time in ZooKeeper, measured in milliseconds and used to regulate things like heartbeats and timeouts. tickTime is the length of a single tick.  |2000|
-|initLimit| The maximum time, in ticks, that the leader ZooKeeper server allows follower ZooKeeper servers to successfully connect and sync. The tick time is set in milliseconds using the tickTime parameter. |10|
-|syncLimit| The maximum time, in ticks, that a follower ZooKeeper server is allowed to sync with other ZooKeeper servers. The tick time is set in milliseconds using the tickTime parameter.  |5|
-|dataDir| The location where ZooKeeper will store in-memory database snapshots as well as the transaction log of updates to the database. |data/zookeeper|
-|clientPort|  The port on which the ZooKeeper server will listen for connections. |2181|
-|autopurge.snapRetainCount| In ZooKeeper, auto purge determines how many recent snapshots of the database stored in dataDir to retain within the time interval specified by autopurge.purgeInterval (while deleting the rest).  |3|
-|autopurge.purgeInterval| The time interval, in hours, by which the ZooKeeper database purge task is triggered. Setting to a non-zero number will enable auto purge; setting to 0 will disable. Read this guide before enabling auto purge. |1|
-|maxClientCnxns|  The maximum number of client connections. Increase this if you need to handle more ZooKeeper clients. |60|
-
-
-#### Configuration Store
-
-Configuration for configuration store is handled by the [`conf/global-zookeeper.conf`](reference-configuration.md#configuration-store) file. The table below shows the available parameters:
-
-
-## BookKeeper
-
-BookKeeper is responsible for all durable message storage in Pulsar. BookKeeper is a distributed [write-ahead log](https://en.wikipedia.org/wiki/Write-ahead_logging) WAL system that guarantees read consistency of independent message logs called ledgers. Individual BookKeeper servers are also called *bookies*.
-
-> For a guide to managing message persistence, retention, and expiry in Pulsar, see [this cookbook](cookbooks-retention-expiry.md).
-
-### Deploying BookKeeper
-
-BookKeeper provides [persistent message storage](concepts-architecture-overview.md#persistent-storage) for Pulsar.
-
-Each Pulsar broker needs to have its own cluster of bookies. The BookKeeper cluster shares a local ZooKeeper quorum with the Pulsar cluster.
-
-### Configuring bookies
-
-BookKeeper bookies can be configured using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. The most important aspect of configuring each bookie is ensuring that the [`zkServers`](reference-configuration.md#bookkeeper-zkServers) parameter is set to the connection string for the Pulsar cluster's local ZooKeeper.
-
-### Starting up bookies
-
-You can start up a bookie in two ways: in the foreground or as a background daemon.
-
-To start up a bookie in the foreground, use the [`bookkeeper`](reference-cli-tools.md#bookkeeper)
-
-```shell
-
-$ bin/pulsar-daemon start bookie
-
-```
-
-You can verify that the bookie is working properly using the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
-
-```shell
-
-$ bin/bookkeeper shell bookiesanity
-
-```
-
-This will create a new ledger on the local bookie, write a few entries, read them back and finally delete the ledger.
-
-### Hardware considerations
-
-Bookie hosts are responsible for storing message data on disk. In order for bookies to provide optimal performance, it's essential that they have a suitable hardware configuration. There are two key dimensions to bookie hardware capacity:
-
-* Disk I/O capacity read/write
-* Storage capacity
-
-Message entries written to bookies are always synced to disk before returning an acknowledgement to the Pulsar broker. To ensure low write latency, BookKeeper is
-designed to use multiple devices:
-
-* A **journal** to ensure durability. For sequential writes, it's critical to have fast [fsync](https://linux.die.net/man/2/fsync) operations on bookie hosts. Typically, small and fast [solid-state drives](https://en.wikipedia.org/wiki/Solid-state_drive) (SSDs) should suffice, or [hard disk drives](https://en.wikipedia.org/wiki/Hard_disk_drive) (HDDs) with a [RAID](https://en.wikipedia.org/wiki/RAID)s controller and a battery-backed write cache. Both solutions can reach fsync latency of ~0.4 ms.
-* A **ledger storage device** is where data is stored until all consumers have acknowledged the message. Writes will happen in the background, so write I/O is not a big concern. Reads will happen sequentially most of the time and the backlog is drained only in case of consumer drain. To store large amounts of data, a typical configuration will involve multiple HDDs with a RAID controller.
-
-
-
-### Configuring BookKeeper
-
-Configurable parameters for BookKeeper bookies can be found in the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) file.
-
-Minimum configuration changes required  in `conf/bookkeeper.conf` are:
-
-```properties
-
-# Change to point to journal disk mount point
-journalDirectory=data/bookkeeper/journal
-
-# Point to ledger storage disk mount point
-ledgerDirectories=data/bookkeeper/ledgers
-
-# Point to local ZK quorum
-zkServers=zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181
-
-#It is recommended to set this parameter. Otherwise, BookKeeper can't start normally in certain environments (for example, Huawei Cloud).
-advertisedAddress=
-
-```
-
-> Consult the official [BookKeeper docs](http://bookkeeper.apache.org) for more information about BookKeeper.
-
-## BookKeeper persistence policies
-
-In Pulsar, you can set *persistence policies*, at the namespace level, that determine how BookKeeper handles persistent storage of messages. Policies determine four things:
-
-* The number of acks (guaranteed copies) to wait for each ledger entry
-* The number of bookies to use for a topic
-* How many writes to make for each ledger entry
-* The throttling rate for mark-delete operations
-
-### Set persistence policies
-
-You can set persistence policies for BookKeeper at the [namespace](reference-terminology.md#namespace) level.
-
-#### pulsar-admin
-
-Use the [`set-persistence`](reference-pulsar-admin.md#namespaces-set-persistence) subcommand and specify a namespace as well as any policies that you want to apply. The available flags are:
-
-Flag | Description | Default
-:----|:------------|:-------
-`-a`, `--bookkeeper-ack-quorum` | The number of acks (guaranteed copies) to wait on for each entry | 0
-`-e`, `--bookkeeper-ensemble` | The number of [bookies](reference-terminology.md#bookie) to use for topics in the namespace | 0
-`-w`, `--bookkeeper-write-quorum` | How many writes to make for each entry | 0
-`-r`, `--ml-mark-delete-max-rate` | Throttling rate for mark-delete operations (0 means no throttle) | 0
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces set-persistence my-tenant/my-ns \
-  --bookkeeper-ack-quorum 3 \
-  --bookkeeper-ensemble 2
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence}
-
-#### Java
-
-```java
-
-int bkEnsemble = 2;
-int bkQuorum = 3;
-int bkAckQuorum = 2;
-double markDeleteRate = 0.7;
-PersistencePolicies policies =
-  new PersistencePolicies(ensemble, quorum, ackQuorum, markDeleteRate);
-admin.namespaces().setPersistence(namespace, policies);
-
-```
-
-### List persistence policies
-
-You can see which persistence policy currently applies to a namespace.
-
-#### pulsar-admin
-
-Use the [`get-persistence`](reference-pulsar-admin.md#namespaces-get-persistence) subcommand and specify the namespace.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces get-persistence my-tenant/my-ns
-{
-  "bookkeeperEnsemble": 1,
-  "bookkeeperWriteQuorum": 1,
-  "bookkeeperAckQuorum", 1,
-  "managedLedgerMaxMarkDeleteRate": 0
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence}
-
-#### Java
-
-```java
-
-PersistencePolicies policies = admin.namespaces().getPersistence(namespace);
-
-```
-
-## How Pulsar uses ZooKeeper and BookKeeper
-
-This diagram illustrates the role of ZooKeeper and BookKeeper in a Pulsar cluster:
-
-![ZooKeeper and BookKeeper](/assets/pulsar-system-architecture.png)
-
-Each Pulsar cluster consists of one or more message brokers. Each broker relies on an ensemble of bookies.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-cpp.md
deleted file mode 100644
index dc925903ea110..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-cpp.md
+++ /dev/null
@@ -1,210 +0,0 @@
----
-id: client-libraries-cpp
-title: The Pulsar C++ client
-sidebar_label: "C++"
-original_id: client-libraries-cpp
----
-
-## Supported platforms
-
-The Pulsar C++ client has been successfully tested on **MacOS** and **Linux**.
-
-## Linux
-
-### Install
-
-> Since the 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can choose to download
-> and install those packages instead of building them yourself.
-
-#### RPM
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:rpm:client@) | [asc](@pulsar:rpm:client@.asc), [sha512](@pulsar:rpm:client@.sha512) |
-| [client-debuginfo](@pulsar:rpm:client-debuginfo@) | [asc](@pulsar:rpm:client-debuginfo@.asc),  [sha512](@pulsar:rpm:client-debuginfo@.sha512) |
-| [client-devel](@pulsar:rpm:client-devel@) | [asc](@pulsar:rpm:client-devel@.asc),  [sha512](@pulsar:rpm:client-devel@.sha512) |
-
-To install a RPM package, download the RPM packages and install them using the following command:
-
-```bash
-
-$ rpm -ivh apache-pulsar-client*.rpm
-
-```
-
-#### DEB
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:deb:client@) | [asc](@pulsar:deb:client@.asc), [sha1](@pulsar:deb:client@.sha1), [sha512](@pulsar:deb:client@.sha512) |
-| [client-devel](@pulsar:deb:client-devel@) | [asc](@pulsar:deb:client-devel@.asc), [sha1](@pulsar:deb:client-devel@.sha1), [sha512](@pulsar:deb:client-devel@.sha512) |
-
-To install a DEB package, download the DEB packages and install them using the following command:
-
-```bash
-
-$ apt-install apache-pulsar-client*.deb
-
-```
-
-### Build
-
-> If you want to build RPM and Debian packages off latest master, you can follow the instructions
-> below to do so. All the instructions are run at the root directory of your cloned Pulsar
-> repo.
-
-There are recipes that build RPM and Debian packages containing a
-statically linked `libpulsar.so` / `libpulsar.a` with all the required
-dependencies.
-
-To build the C++ library packages, first build the Java packages:
-
-```shell
-
-mvn install -DskipTests
-
-```
-
-#### RPM
-
-```shell
-
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
-
-```
-
-This will build the RPM inside a Docker container and it will leave the RPMs
-in `pulsar-client-cpp/pkg/rpm/RPMS/x86_64/`.
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` |
-| pulsar-client-devel | Static library `libpulsar.a` and C++ and C headers |
-| pulsar-client-debuginfo | Debug symbols for `libpulsar.so` |
-
-#### Deb
-
-To build Debian packages:
-
-```shell
-
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
-
-```
-
-Debian packages will be created at `pulsar-client-cpp/pkg/deb/BUILD/DEB/`
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` |
-| pulsar-client-dev | Static library `libpulsar.a` and C++ and C headers |
-
-## MacOS
-
-Use the [Homebrew](https://brew.sh/) supplied recipe to build the Pulsar
-client lib on MacOS.
-
-```shell
-
-brew install https://raw.githubusercontent.com/apache/incubator-pulsar/master/pulsar-client-cpp/homebrew/libpulsar.rb
-
-```
-
-If using Python 3 on MacOS, add the flag `--with-python3` to the above command.
-
-This will install the package with the library and headers.
-
-## Connection URLs
-
-
-To connect to Pulsar using client libraries, you need to specify a Pulsar protocol URL.
-
-Pulsar protocol URLs are assigned to specific clusters, use the pulsar URI scheme and have a default port of 6650. Here’s an example for localhost:
-
-```http
-
-pulsar://localhost:6650
-
-```
-
-A URL for a production Pulsar cluster may look something like this:
-
-```http
-
-pulsar://pulsar.us-west.example.com:6650
-
-```
-
-If you’re using TLS authentication, the URL will look like something like this:
-
-```http
-
-pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-## Consumer
-
-```c++
-
-Client client("pulsar://localhost:6650");
-
-Consumer consumer;
-Result result = client.subscribe("my-topic", "my-subscribtion-name", consumer);
-if (result != ResultOk) {
-    LOG_ERROR("Failed to subscribe: " << result);
-    return -1;
-}
-
-Message msg;
-
-while (true) {
-    consumer.receive(msg);
-    LOG_INFO("Received: " << msg
-            << "  with payload '" << msg.getDataAsString() << "'");
-
-    consumer.acknowledge(msg);
-}
-
-client.close();
-
-```
-
-## Producer
-
-```c++
-
-Client client("pulsar://localhost:6650");
-
-Producer producer;
-Result result = client.createProducer("my-topic", producer);
-if (result != ResultOk) {
-    LOG_ERROR("Error creating producer: " << result);
-    return -1;
-}
-
-// Publish 10 messages to the topic
-for (int i = 0; i < 10; i++){
-    Message msg = MessageBuilder().setContent("my-message").build();
-    Result res = producer.send(msg);
-    LOG_INFO("Message sent: " << res);
-}
-client.close();
-
-```
-
-## Authentication
-
-```cpp
-
-ClientConfiguration config = ClientConfiguration();
-config.setUseTls(true);
-config.setTlsTrustCertsFilePath("/path/to/cacert.pem");
-config.setTlsAllowInsecureConnection(false);
-config.setAuth(pulsar::AuthTls::create(
-            "/path/to/client-cert.pem", "/path/to/client-key.pem"););
-
-Client client("pulsar+ssl://my-broker.com:6651", config);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-go.md b/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-go.md
deleted file mode 100644
index 05082c38bfdd6..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-go.md
+++ /dev/null
@@ -1,497 +0,0 @@
----
-id: client-libraries-go
-title: The Pulsar Go client
-sidebar_label: "Go"
-original_id: client-libraries-go
----
-
-The Pulsar Go client can be used to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Go (aka Golang).
-
-> **API docs available as well**  
-> For standard API docs, consult the [Godoc](https://godoc.org/github.com/apache/incubator-pulsar/pulsar-client-go/pulsar).
-
-
-## Installation
-
-### Requirements
-
-Pulsar Go client library is based on the C++ client library. Follow
-the instructions for [C++ library](client-libraries-cpp.md) for installing the binaries
-through [RPM](client-libraries-cpp.md#rpm), [Deb](client-libraries-cpp.md#deb) or [Homebrew packages](client-libraries-cpp.md#macos).
-
-### Installing go package
-
-You can install the `pulsar` library locally using `go get`:
-
-> **NOTE**
-> 
-> `go get` doesn't support fetching a specific tag. so it will always pull in pulsar go client
-> from latest master. You need to make sure you have installed the right pulsar cpp client library.
-
-```bash
-
-$ go get -u github.com/apache/incubator-pulsar/pulsar-client-go/pulsar
-
-```
-
-Or you can use [dep](https://github.com/golang/dep) for managing the dependencies.
-
-```bash
-
-$ dep ensure -add github.com/apache/incubator-pulsar/pulsar-client-go/pulsar@v@pulsar:version@
-
-```
-
-Once installed locally, you can import it into your project:
-
-```go
-
-import "github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"
-
-```
-
-## Connection URLs
-
-To connect to Pulsar using client libraries, you need to specify a [Pulsar protocol](developing-binary-protocol.md) URL.
-
-Pulsar protocol URLs are assigned to specific clusters, use the `pulsar` scheme and have a default port of 6650. Here's an example for `localhost`:
-
-```http
-
-pulsar://localhost:6650
-
-```
-
-A URL for a production Pulsar cluster may look something like this:
-
-```http
-
-pulsar://pulsar.us-west.example.com:6650
-
-```
-
-If you're using [TLS](security-tls-authentication.md) authentication, the URL will look like something like this:
-
-```http
-
-pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-## Creating a client
-
-In order to interact with Pulsar, you'll first need a `Client` object. You can create a client object using the `NewClient` function, passing in a `ClientOptions` object (more on configuration [below](#client-configuration)). Here's an example:
-
-```go
-
-import (
-    "log"
-    "runtime"
-
-    "github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"
-)
-
-func main() {
-    client, err := pulsar.NewClient(pulsar.ClientOptions{
-        URL: "pulsar://localhost:6650",
-        OperationTimeoutSeconds: 5,
-        MessageListenerThreads: runtime.NumCPU(),
-    })
-
-    if err != nil {
-        log.Fatalf("Could not instantiate Pulsar client: %v", err)
-    }
-}
-
-```
-
-The following configurable parameters are available for Pulsar clients:
-
-Parameter | Description | Default
-:---------|:------------|:-------
-`URL` | The connection URL for the Pulsar cluster. See [above](#urls) for more info |
-`IOThreads` | The number of threads to use for handling connections to Pulsar [brokers](reference-terminology.md#broker) | 1
-`OperationTimeoutSeconds` | The timeout for some Go client operations (creating producers, subscribing to and unsubscribing from [topics](reference-terminology.md#topic)). Retries will occur until this threshold is reached, at which point the operation will fail. | 30
-`MessageListenerThreads` | The number of threads used by message listeners ([consumers](#consumers) and [readers](#readers)) | 1
-`ConcurrentLookupRequests` | The number of concurrent lookup requests that can be sent on each broker connection. Setting a maximum helps to keep from overloading brokers. You should set values over the default of 5000 only if the client needs to produce and/or subscribe to thousands of Pulsar topics. | 5000
-`Logger` | A custom logger implementation for the client (as a function that takes a log level, file path, line number, and message). All info, warn, and error messages will be routed to this function. | `nil`
-`TLSTrustCertsFilePath` | The file path for the trusted TLS certificate |
-`TLSAllowInsecureConnection` | Whether the client accepts untrusted TLS certificates from the broker | `false`
-`Authentication` | Configure the authentication provider. (default: no authentication). Example: `Authentication: NewAuthenticationTLS("my-cert.pem", "my-key.pem")` | `nil`
-`StatsIntervalInSeconds` | The interval (in seconds) at which client stats are published | 60
-
-## Producers
-
-Pulsar producers publish messages to Pulsar topics. You can [configure](#producer-configuration) Go producers using a `ProducerOptions` object. Here's an example:
-
-```go
-
-producer, err := client.CreateProducer(pulsar.ProducerOptions{
-    Topic: "my-topic",
-})
-
-if err != nil {
-    log.Fatalf("Could not instantiate Pulsar producer: %v", err)
-}
-
-defer producer.Close()
-
-msg := pulsar.ProducerMessage{
-    Payload: []byte("Hello, Pulsar"),
-}
-
-if err := producer.Send(msg); err != nil {
-    log.Fatalf("Producer could not send message: %v", err)
-}
-
-```
-
-> **Blocking operation**  
-> When you create a new Pulsar producer, the operation will block (waiting on a go channel) until either a producer is successfully created or an error is thrown.
-
-
-### Producer operations
-
-Pulsar Go producers have the following methods available:
-
-Method | Description | Return type
-:------|:------------|:-----------
-`Topic()` | Fetches the producer's [topic](reference-terminology.md#topic)| `string`
-`Name()` | Fetches the producer's name | `string`
-`Send(context.Context, ProducerMessage) error` | Publishes a [message](#messages) to the producer's topic. This call will block until the message is successfully acknowledged by the Pulsar broker, or an error will be thrown if the timeout set using the `SendTimeout` in the producer's [configuration](#producer-configuration) is exceeded. | `error`
-`SendAsync(context.Context, ProducerMessage, func(ProducerMessage, error))` | Publishes a [message](#messages) to the producer's topic asynchronously. The third argument is a callback function that specifies what happens either when the message is acknowledged or an error is thrown. |
-`Close()` | Closes the producer and releases all resources allocated to it. If `Close()` is called then no more messages will be accepted from the publisher. This method will block until all pending publish requests have been persisted by Pulsar. If an error is thrown, no pending writes will be retried. | `error`
-
-Here's a more involved example usage of a producer:
-
-```go
-
-import (
-    "context"
-    "fmt"
-    "log"
-
-    "github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"
-)
-
-func main() {
-    // Instantiate a Pulsar client
-    client, err := pulsar.NewClient(pulsar.ClientOptions{
-        URL: "pulsar://localhost:6650",
-    })
-
-    if err != nil { log.Fatal(err) }
-
-    // Use the client to instantiate a producer
-    producer, err := client.CreateProducer(pulsar.ProducerOptions{
-        Topic: "my-topic",
-    })
-
-    if err != nil { log.Fatal(err) }
-
-    ctx := context.Background()
-
-    // Send 10 messages synchronously and 10 messages asynchronously
-    for i := 0; i < 10; i++ {
-        // Create a message
-        msg := pulsar.ProducerMessage{
-            Payload: []byte(fmt.Sprintf("message-%d", i)),
-        }
-
-        // Attempt to send the message
-        if err := producer.Send(ctx, msg); err != nil {
-            log.Fatal(err)
-        }
-
-        // Create a different message to send asynchronously
-        asyncMsg := pulsar.ProducerMessage{
-            Payload: []byte(fmt.Sprintf("async-message-%d", i)),
-        }
-
-        // Attempt to send the message asynchronously and handle the response
-        producer.SendAsync(ctx, asyncMsg, func(msg pulsar.ProducerMessage, err error) {
-            if err != nil { log.Fatal(err) }
-
-            fmt.Printf("Message %s successfully published", msg.ID())
-        })
-    }
-}
-
-```
-
-### Producer configuration
-
-Parameter | Description | Default
-:---------|:------------|:-------
-`Topic` | The Pulsar [topic](reference-terminology.md#topic) to which the producer will publish messages |
-`Name` | A name for the producer. If you don't explicitly assign a name, Pulsar will automatically generate a globally unique name that you can access later using the `Name()` method.  If you choose to explicitly assign a name, it will need to be unique across *all* Pulsar clusters, otherwise the creation operation will throw an error. |
-`SendTimeout` | When publishing a message to a topic, the producer will wait for an acknowledgment from the responsible Pulsar [broker](reference-terminology.md#broker). If a message is not acknowledged within the threshold set by this parameter, an error will be thrown. If you set `SendTimeout` to -1, the timeout will be set to infinity (and thus removed). Removing the send timeout is recommended when using Pulsar's [message de-duplication](cookbooks-deduplication.md) feature. | 30 seconds
-`MaxPendingMessages` | The maximum size of the queue holding pending messages (i.e. messages waiting to receive an acknowledgment from the [broker](reference-terminology.md#broker)). By default, when the queue is full all calls to the `Send` and `SendAsync` methods will fail *unless* `BlockIfQueueFull` is set to `true`. |
-`MaxPendingMessagesAcrossPartitions` | |
-`BlockIfQueueFull` | If set to `true`, the producer's `Send` and `SendAsync` methods will block when the outgoing message queue is full rather than failing and throwing an error (the size of that queue is dictated by the `MaxPendingMessages` parameter); if set to `false` (the default), `Send` and `SendAsync` operations will fail and throw a `ProducerQueueIsFullError` when the queue is full. | `false`
-`MessageRoutingMode` | The message routing logic (for producers on [partitioned topics](concepts-architecture-overview.md#partitioned-topics)). This logic is applied only when no key is set on messages. The available options are: round robin (`pulsar.RoundRobinDistribution`, the default), publishing all messages to a single partition (`pulsar.UseSinglePartition`), or a custom partitioning scheme (`pulsar.CustomPartition`). | `pulsar.RoundRobinDistribution`
-`HashingScheme` | The hashing function that determines the partition on which a particular message is published (partitioned topics only). The available options are: `pulsar.JavaStringHash` (the equivalent of `String.hashCode()` in Java), `pulsar.Murmur3_32Hash` (applies the [Murmur3](https://en.wikipedia.org/wiki/MurmurHash) hashing function), or `pulsar.BoostHash` (applies the hashing function from C++'s [Boost](https://www.boost.org/doc/libs/1_62_0/doc/html/hash.html) library) | `pulsar.JavaStringHash`
-`CompressionType` | The message data compression type used by the producer. The available options are [`LZ4`](https://github.com/lz4/lz4) and [`ZLIB`](https://zlib.net/). | No compression
-`MessageRouter` | By default, Pulsar uses a round-robin routing scheme for [partitioned topics](cookbooks-partitioned.md). The `MessageRouter` parameter enables you to specify custom routing logic via a function that takes the Pulsar message and topic metadata as an argument and returns an integer (where the ), i.e. a function signature of `func(Message, TopicMetadata) int`. |
-
-## Consumers
-
-Pulsar consumers subscribe to one or more Pulsar topics and listen for incoming messages produced on that topic/those topics. You can [configure](#consumer-configuration) Go consumers using a `ConsumerOptions` object. Here's a basic example that uses channels:
-
-```go
-
-msgChannel := make(chan pulsar.ConsumerMessage)
-
-consumerOpts := pulsar.ConsumerOptions{
-    Topic:            "my-topic",
-    SubscriptionName: "my-subscription-1",
-    Type:             pulsar.Exclusive,
-    MessageChannel:   msgChannel,
-}
-
-consumer, err := client.Subscribe(consumerOpts)
-
-if err != nil {
-    log.Fatalf("Could not establish subscription: %v", err)
-}
-
-defer consumer.Close()
-
-for cm := range channel {
-    msg := cm.Message
-
-    fmt.Printf("Message ID: %s", msg.ID())
-    fmt.Printf("Message value: %s", string(msg.Payload()))
-
-    consumer.Ack(msg)
-}
-
-```
-
-> **Blocking operation**  
-> When you create a new Pulsar consumer, the operation will block (on a go channel) until either a producer is successfully created or an error is thrown.
-
-
-### Consumer operations
-
-Pulsar Go consumers have the following methods available:
-
-Method | Description | Return type
-:------|:------------|:-----------
-`Topic()` | Returns the consumer's [topic](reference-terminology.md#topic) | `string`
-`Subscription()` | Returns the consumer's subscription name | `string`
-`Unsubcribe()` | Unsubscribes the consumer from the assigned topic. Throws an error if the unsubscribe operation is somehow unsuccessful. | `error`
-`Receive(context.Context)` | Receives a single message from the topic. This method blocks until a message is available. | `(Message, error)`
-`Ack(Message)` | [Acknowledges](reference-terminology.md#acknowledgment-ack) a message to the Pulsar [broker](reference-terminology.md#broker) | `error`
-`AckID(MessageID)` | [Acknowledges](reference-terminology.md#acknowledgment-ack) a message to the Pulsar [broker](reference-terminology.md#broker) by message ID | `error`
-`AckCumulative(Message)` | [Acknowledges](reference-terminology.md#acknowledgment-ack) *all* the messages in the stream, up to and including the specified message. The `AckCumulative` method will block until the ack has been sent to the broker. After that, the messages will *not* be redelivered to the consumer. Cumulative acking can only be used with a [shared](concepts-messaging.md#shared) subscription type.
-`Close()` | Closes the consumer, disabling its ability to receive messages from the broker | `error`
-`RedeliverUnackedMessages()` | Redelivers *all* unacknowledged messages on the topic. In [failover](concepts-messaging.md#failover) mode, this request is ignored if the consumer isn't active on the specified topic; in [shared](concepts-messaging.md#shared) mode, redelivered messages are distributed across all consumers connected to the topic. **Note**: this is a *non-blocking* operation that doesn't throw an error. |
-
-#### Receive example
-
-Here's an example usage of a Go consumer that uses the `Receive()` method to process incoming messages:
-
-```go
-
-import (
-    "context"
-    "log"
-
-    "github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"
-)
-
-func main() {
-    // Instantiate a Pulsar client
-    client, err := pulsar.NewClient(pulsar.ClientOptions{
-            URL: "pulsar://localhost:6650",
-    })
-
-    if err != nil { log.Fatal(err) }
-
-    // Use the client object to instantiate a consumer
-    consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-        Topic:            "my-golang-topic",
-        SubscriptionName: "sub-1",
-        SubscriptionType: pulsar.Exclusive,
-    })
-
-    if err != nil { log.Fatal(err) }
-
-    defer consumer.Close()
-
-    ctx := context.Background()
-
-    // Listen indefinitely on the topic
-    for {
-        msg, err := consumer.Receive(ctx)
-        if err != nil { log.Fatal(err) }
-
-        // Do something with the message
-
-        consumer.Ack(msg)
-    }
-}
-
-```
-
-### Consumer configuration
-
-Parameter | Description | Default
-:---------|:------------|:-------
-`Topic` | The Pulsar [topic](reference-terminology.md#topic) on which the consumer will establish a subscription and listen for messages |
-`SubscriptionName` | The subscription name for this consumer |
-`Name` | The name of the consumer |
-`AckTimeout` | | 0
-`SubscriptionType` | Available options are `Exclusive`, `Shared`, and `Failover` | `Exclusive`
-`MessageChannel` | The Go channel used by the consumer. Messages that arrive from the Pulsar topic(s) will be passed to this channel. |
-`ReceiverQueueSize` | Sets the size of the consumer's receiver queue, i.e. the number of messages that can be accumulated by the consumer before the application calls `Receive`. A value higher than the default of 1000 could increase consumer throughput, though at the expense of more memory utilization. | 1000
-`MaxTotalReceiverQueueSizeAcrossPartitions` |Set the max total receiver queue size across partitions. This setting will be used to reduce the receiver queue size for individual partitions if the total exceeds this value | 50000
-
-## Readers
-
-Pulsar readers process messages from Pulsar topics. Readers are different from consumers because with readers you need to explicitly specify which message in the stream you want to begin with (consumers, on the other hand, automatically begin with the most recent unacked message). You can [configure](#reader-configuration) Go readers using a `ReaderOptions` object. Here's an example:
-
-```go
-
-reader, err := client.CreateReader(pulsar.ReaderOptions{
-    Topic: "my-golang-topic",
-    StartMessageId: pulsar.LatestMessage,
-})
-
-```
-
-> **Blocking operation**  
-> When you create a new Pulsar reader, the operation will block (on a go channel) until either a reader is successfully created or an error is thrown.
-
-
-### Reader operations
-
-Pulsar Go readers have the following methods available:
-
-Method | Description | Return type
-:------|:------------|:-----------
-`Topic()` | Returns the reader's [topic](reference-terminology.md#topic) | `string`
-`Next(context.Context)` | Receives the next message on the topic (analogous to the `Receive` method for [consumers](#consumer-operations)). This method blocks until a message is available. | `(Message, error)`
-`Close()` | Closes the reader, disabling its ability to receive messages from the broker | `error`
-
-#### "Next" example
-
-Here's an example usage of a Go reader that uses the `Next()` method to process incoming messages:
-
-```go
-
-import (
-    "context"
-    "log"
-
-    "github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"
-)
-
-func main() {
-    // Instantiate a Pulsar client
-    client, err := pulsar.NewClient(pulsar.ClientOptions{
-            URL: "pulsar://localhost:6650",
-    })
-
-    if err != nil { log.Fatalf("Could not create client: %v", err) }
-
-    // Use the client to instantiate a reader
-    reader, err := client.CreateReader(pulsar.ReaderOptions{
-        Topic:          "my-golang-topic",
-        StartMessageID: pulsar.EarliestMessage,
-    })
-
-    if err != nil { log.Fatalf("Could not create reader: %v", err) }
-
-    defer reader.Close()
-
-    ctx := context.Background()
-
-    // Listen on the topic for incoming messages
-    for {
-        msg, err := reader.Next(ctx)
-        if err != nil { log.Fatalf("Error reading from topic: %v", err) }
-
-        // Process the message
-    }
-}
-
-```
-
-In the example above, the reader begins reading from the earliest available message (specified by `pulsar.EarliestMessage`). The reader can also begin reading from the latest message (`pulsar.LatestMessage`) or some other message ID specified by bytes using the `DeserializeMessageID` function, which takes a byte array and returns a `MessageID` object. Here's an example:
-
-```go
-
-lastSavedId := // Read last saved message id from external store as byte[]
-
-reader, err := client.CreateReader(pulsar.ReaderOptions{
-    Topic:          "my-golang-topic",
-    StartMessageID: DeserializeMessageID(lastSavedId),
-})
-
-```
-
-### Reader configuration
-
-Parameter | Description | Default
-:---------|:------------|:-------
-`Topic` | The Pulsar [topic](reference-terminology.md#topic) on which the reader will establish a subscription and listen for messages |
-`Name` | The name of the reader |
-`StartMessageID` | The initial reader position, i.e. the message at which the reader begins processing messages. The options are `pulsar.EarliestMessage` (the earliest available message on the topic), `pulsar.LatestMessage` (the latest available message on the topic), or a `MessageID` object for a position that isn't earliest or latest. |
-`MessageChannel` | The Go channel used by the reader. Messages that arrive from the Pulsar topic(s) will be passed to this channel. |
-`ReceiverQueueSize` | Sets the size of the reader's receiver queue, i.e. the number of messages that can be accumulated by the reader before the application calls `Next`. A value higher than the default of 1000 could increase reader throughput, though at the expense of more memory utilization. | 1000
-`SubscriptionRolePrefix` | The subscription role prefix. | `reader`
-
-## Messages
-
-The Pulsar Go client provides a `ProducerMessage` interface that you can use to construct messages to producer on Pulsar topics. Here's an example message:
-
-```go
-
-msg := pulsar.ProducerMessage{
-    Payload: []byte("Here is some message data"),
-    Key: "message-key",
-    Properties: map[string]string{
-        "foo": "bar",
-    },
-    EventTime: time.Now(),
-    ReplicationClusters: []string{"cluster1", "cluster3"},
-}
-
-if err := producer.send(msg); err != nil {
-    log.Fatalf("Could not publish message due to: %v", err)
-}
-
-```
-
-The following methods parameters are available for `ProducerMessage` objects:
-
-Parameter | Description
-:---------|:-----------
-`Payload` | The actual data payload of the message
-`Key` | The optional key associated with the message (particularly useful for things like topic compaction)
-`Properties` | A key-value map (both keys and values must be strings) for any application-specific metadata attached to the message
-`EventTime` | The timestamp associated with the message
-`ReplicationClusters` | The clusters to which this message will be replicated. Pulsar brokers handle message replication automatically; you should only change this setting if you want to override the broker default.
-
-## TLS encryption and authentication
-
-In order to use [TLS encryption](security-tls-transport.md), you'll need to configure your client to do so:
-
- * Use `pulsar+ssl` URL type
- * Set `TLSTrustCertsFilePath` to the path to the TLS certs used by your client and the Pulsar broker
- * Configure `Authentication` option
-
-Here's an example:
-
-```go
-
-opts := pulsar.ClientOptions{
-    URL: "pulsar+ssl://my-cluster.com:6651",
-    TLSTrustCertsFilePath: "/path/to/certs/my-cert.csr",
-    Authentication: NewAuthenticationTLS("my-cert.pem", "my-key.pem"),
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-java.md b/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-java.md
deleted file mode 100644
index c0b6c0762a24f..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-java.md
+++ /dev/null
@@ -1,534 +0,0 @@
----
-id: client-libraries-java
-title: The Pulsar Java client
-sidebar_label: "Java"
-original_id: client-libraries-java
----
-
-The Pulsar Java client can be used both to create Java producers, consumers, and [readers](#readers) of messages and to perform [administrative tasks](admin-api-overview.md). The current version of the Java client is **@pulsar:version@**.
-
-Javadoc for the Pulsar client is divided up into two domains, by package:
-
-Package | Description | Maven Artifact
-:-------|:------------|:--------------
-[`org.apache.pulsar.client.api`](/api/client) | The producer and consumer API | [org.apache.pulsar:pulsar-client:@pulsar:version@](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client%7C@pulsar:version@%7Cjar)
-[`org.apache.pulsar.client.admin`](/api/admin) | The Java [admin API](admin-api-overview.md) | [org.apache.pulsar:pulsar-client-admin:@pulsar:version@](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client-admin%7C@pulsar:version@%7Cjar)
-
-This document will focus only on the client API for producing and consuming messages on Pulsar topics. For a guide to using the Java admin client, see [The Pulsar admin interface](admin-api-overview.md).
-
-## Installation
-
-The latest version of the Pulsar Java client library is available via [Maven Central](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client%7C@pulsar:version@%7Cjar). To use the latest version, add the `pulsar-client` library to your build configuration.
-
-### Maven
-
-If you're using Maven, add this to your `pom.xml`:
-
-```xml
-
-
-@pulsar:version@
-
-
-
-  org.apache.pulsar
-  pulsar-client
-  ${pulsar.version}
-
-
-```
-
-### Gradle
-
-If you're using Gradle, add this to your `build.gradle` file:
-
-```groovy
-
-def pulsarVersion = '@pulsar:version@'
-
-dependencies {
-    compile group: 'org.apache.pulsar', name: 'pulsar-client', version: pulsarVersion
-}
-
-```
-
-## Connection URLs
-
-To connect to Pulsar using client libraries, you need to specify a [Pulsar protocol](developing-binary-protocol.md) URL.
-
-Pulsar protocol URLs are assigned to specific clusters, use the `pulsar` scheme and have a default port of 6650. Here's an example for `localhost`:
-
-```http
-
-pulsar://localhost:6650
-
-```
-
-A URL for a production Pulsar cluster may look something like this:
-
-```http
-
-pulsar://pulsar.us-west.example.com:6650
-
-```
-
-If you're using [TLS](security-tls-authentication.md) authentication, the URL will look like something like this:
-
-```http
-
-pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-## Client configuration
-
-You can instantiate a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object using just a URL for the target Pulsar [cluster](reference-terminology.md#cluster), like this:
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-
-```
-
-> #### Default broker URLs for standalone clusters
-> If you're running a cluster in [standalone mode](getting-started-standalone.md), the broker will be available at the `pulsar://localhost:6650` URL by default.
-
-Check out the Javadoc for the {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} class for a full listing of configurable parameters.
-
-> In addition to client-level configuration, you can also apply [producer](#configuring-producers) and [consumer](#configuring-consumers) specific configuration, as you'll see in the sections below.
-
-
-## Producers
-
-In Pulsar, producers write messages to topics. Once you've instantiated a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object (as in the section [above](#client-configuration)), you can create a {@inject: javadoc:Producer:/client/org/apache/pulsar/client/api/Producer} for a specific Pulsar [topic](reference-terminology.md#topic).
-
-```java
-
-Producer producer = client.newProducer()
-        .topic("my-topic")
-        .create();
-
-// You can then send messages to the broker and topic you specified:
-producer.send("My message".getBytes());
-
-```
-
-By default, producers produce messages that consist of byte arrays. You can produce different types, however, by specifying a message [schema](#schemas).
-
-```java
-
-Producer stringProducer = client.newProducer(Schema.STRING)
-        .topic("my-topic")
-        .create();
-stringProducer.send("My message");
-
-```
-
-> You should always make sure to close your producers, consumers, and clients when they are no longer needed:
-
-> ```java
-> 
-> producer.close();
-> consumer.close();
-> client.close();
->
-> 
-> ```
-
->
-> Close operations can also be asynchronous:
-
-> ```java
-> 
-> producer.closeAsync()
->    .thenRun(() -> System.out.println("Producer closed"));
->    .exceptionally((ex) -> {
->        System.err.println("Failed to close producer: " + ex);
->        return ex;
->    });
->
-> 
-> ```
-
-' %}
-
-### Configuring producers
-
-If you instantiate a `Producer` object specifying only a topic name, as in the example above, the producer will use the default configuration. To use a non-default configuration, there's a variety of configurable parameters that you can set. For a full listing, see the Javadoc for the {@inject javadoc:ProducerBuilder:/client/org/apache/pulsar/client/api/ProducerBuilder} class. Here's an example:
-
-```java
-
-Producer producer = client.newProducer()
-    .topic("my-topic")
-    .batchingMaxPublishDelay(10, TimeUnit.MILLISECONDS)
-    .sendTimeout(10, TimeUnit.SECONDS)
-    .blockIfQueueFull(true)
-    .create();
-
-```
-
-### Message routing
-
-When using partitioned topics, you can specify the routing mode whenever you publish messages using a producer. For more on specifying a routing mode using the Java client, see the [Partitioned Topics](cookbooks-partitioned.md) cookbook.
-
-### Async send
-
-You can also publish messages [asynchronously](concepts-messaging.md#send-modes) using the Java client. With async send, the producer will put the message in a blocking queue and return immediately. The client library will then send the message to the broker in the background. If the queue is full (max size configurable), the producer could be blocked or fail immediately when calling the API, depending on arguments passed to the producer.
-
-Here's an example async send operation:
-
-```java
-
-producer.sendAsync("my-async-message".getBytes()).thenAccept(msgId -> {
-    System.out.printf("Message with ID %s successfully sent", msgId);
-});
-
-```
-
-As you can see from the example above, async send operations return a {@inject javadoc:MessageId:/client/org/apache/pulsar/client/api/MessageId} wrapped in a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture).
-
-### Configuring messages
-
-In addition to a value, it's possible to set additional items on a given message:
-
-```java
-
-producer.newMessage()
-    .key("my-message-key")
-    .value("my-async-message".getBytes())
-    .property("my-key", "my-value")
-    .property("my-other-key", "my-other-value")
-    .send();
-
-```
-
-As for the previous case, it's also possible to terminate the builder chain with `sendAsync()` and
-get a future returned.
-
-## Consumers
-
-In Pulsar, consumers subscribe to topics and handle messages that producers publish to those topics. You can instantiate a new [consumer](reference-terminology.md#consumer) by first instantiating a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object and passing it a URL for a Pulsar broker (as [above](#client-configuration)).
-
-Once you've instantiated a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object, you can create a {@inject: javadoc:Consumer:/client/org/apache/pulsar/client/api/Consumer} by specifying a [topic](reference-terminology.md#topic) and a [subscription](concepts-messaging.md#subscription-modes).
-
-```java
-
-Consumer consumer = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscribe();
-
-```
-
-The `subscribe` method will automatically subscribe the consumer to the specified topic and subscription. One way to make the consumer listen on the topic is to set up a `while` loop. In this example loop, the consumer listens for messages, prints the contents of any message that's received, and then [acknowledges](reference-terminology.md#acknowledgment-ack) that the message has been processed:
-
-```java
-
-do {
-  // Wait for a message
-  Message msg = consumer.receive();
-
-  System.out.printf("Message received: %s", new String(msg.getData()));
-
-  // Acknowledge the message so that it can be deleted by the message broker
-  consumer.acknowledge(msg);
-} while (true);
-
-```
-
-### Configuring consumers
-
-If you instantiate a `Consumer` object specifying only a topic and subscription name, as in the example above, the consumer will use the default configuration. To use a non-default configuration, there's a variety of configurable parameters that you can set. For a full listing, see the Javadoc for the {@inject: javadoc:ConsumerBuilder:/client/org/apache/pulsar/client/api/ConsumerBuilder} class. Here's an example:
-
-Here's an example configuration:
-
-```java
-
-Consumer consumer = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .ackTimeout(10, TimeUnit.SECONDS)
-        .subscriptionType(SubscriptionType.Exclusive)
-        .subscribe();
-
-```
-
-### Async receive
-
-The `receive` method will receive messages synchronously (the consumer process will be blocked until a message is available). You can also use [async receive](concepts-messaging.md#receive-modes), which will return immediately with a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture) object that completes once a new message is available.
-
-Here's an example:
-
-```java
-
-CompletableFuture asyncMessage = consumer.receiveAsync();
-
-```
-
-Async receive operations return a {@inject javadoc:Message:/client/org/apache/pulsar/client/api/Message} wrapped inside of a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture).
-
-### Multi-topic subscriptions
-
-In addition to subscribing a consumer to a single Pulsar topic, you can also subscribe to multiple topics simultaneously using [multi-topic subscriptions](concepts-messaging.md#multi-topic-subscriptions). To use multi-topic subscriptions you can supply either a regular expression (regex) or a `List` of topics. If you select topics via regex, all topics must be within the same Pulsar namespace.
-
-Here are some examples:
-
-```java
-
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.PulsarClient;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-
-ConsumerBuilder consumerBuilder = pulsarClient.newConsumer()
-        .subscriptionName(subscription);
-
-// Subscribe to all topics in a namespace
-Pattern allTopicsInNamespace = Pattern.compile("persistent://public/default/.*");
-Consumer allTopicsConsumer = consumerBuilder
-        .topicsPattern(allTopicsInNamespace)
-        .subscribe();
-
-// Subscribe to a subsets of topics in a namespace, based on regex
-Pattern someTopicsInNamespace = Pattern.compile("persistent://public/default/foo.*");
-Consumer allTopicsConsumer = consumerBuilder
-        .topicsPattern(someTopicsInNamespace)
-        .subscribe();
-
-```
-
-You can also subscribe to an explicit list of topics (across namespaces if you wish):
-
-```java
-
-List topics = Arrays.asList(
-        "topic-1",
-        "topic-2",
-        "topic-3"
-);
-
-Consumer multiTopicConsumer = consumerBuilder
-        .topics(topics)
-        .subscribe();
-
-// Alternatively:
-Consumer multiTopicConsumer = consumerBuilder
-        .topics(
-            "topic-1",
-            "topic-2",
-            "topic-3"
-        )
-        .subscribe();
-
-```
-
-You can also subscribe to multiple topics asynchronously using the `subscribeAsync` method rather than the synchronous `subscribe` method. Here's an example:
-
-```java
-
-Pattern allTopicsInNamespace = Pattern.compile("persistent://public/default.*");
-consumerBuilder
-        .topics(topics)
-        .subscribeAsync()
-        .thenAccept(consumer -> {
-            do {
-                try {
-                    Message msg = consumer.receive();
-                    // Do something with the received message
-                } catch (PulsarClientException e) {
-                    e.printStackTrace();
-                }
-            } while (true);
-        });
-
-```
-
-## Reader interface {#readers}
-
-With the [reader interface](concepts-clients.md#reader-interface), Pulsar clients can "manually position" themselves within a topic, reading all messages from a specified message onward. The Pulsar API for Java enables you to create  {@inject: javadoc:Reader:/client/org/apache/pulsar/client/api/Reader} objects by specifying a topic, a {@inject: javadoc:MessageId:/client/org/apache/pulsar/client/api/MessageId}, and {@inject javadoc:ReaderConfiguration:/client/org/apache/pulsar/client/api/ReaderConfiguration}.
-
-Here's an example:
-
-```java
-
-ReaderConfiguration conf = new ReaderConfiguration();
-byte[] msgIdBytes = // Some message ID byte array
-MessageId id = MessageId.fromByteArray(msgIdBytes);
-Reader reader = pulsarClient.newReader()
-        .topic(topic)
-        .startMessageId(id)
-        .create();
-
-while (true) {
-    Message message = reader.readNext();
-    // Process message
-}
-
-```
-
-In the example above, a `Reader` object is instantiated for a specific topic and message (by ID); the reader then iterates over each message in the topic after the message identified by `msgIdBytes` (how that value is obtained depends on the application).
-
-The code sample above shows pointing the `Reader` object to a specific message (by ID), but you can also use `MessageId.earliest` to point to the earliest available message on the topic of `MessageId.latest` to point to the most recent available message.
-
-## Schemas
-
-In Pulsar, all message data consists of byte arrays "under the hood." [Message schemas](concepts-schema-registry.md) enable you to use other types of data when constructing and handling messages (from simple types like strings to more complex, application-specific types.md). If you construct, say, a [producer](#producers) without specifying a schema, then the producer can only produce messages of type `byte[]`. Here's an example:
-
-```java
-
-Producer producer = client.newProducer()
-        .topic(topic)
-        .create();
-
-```
-
-The producer above is equivalent to a `Producer` (in fact, you should *always* explicitly specify the type). If you'd like to use a producer for a different type of data, you'll need to specify a **schema** that informs Pulsar which data type will be transmitted over the [topic](reference-terminology.md#topic).
-
-### Schema example
-
-Let's say that you have a `SensorReading` class that you'd like to transmit over a Pulsar topic:
-
-```java
-
-public class SensorReading {
-    public float temperature;
-
-    public SensorReading(float temperature) {
-        this.temperature = temperature;
-    }
-
-    // A no-arg constructor is required
-    public SensorReading() {
-    }
-
-    public float getTemperature() {
-        return temperature;
-    }
-
-    public void setTemperature(float temperature) {
-        this.temperature = temperature;
-    }
-}
-
-```
-
-You could then create a `Producer` (or `Consumer`) like so:
-
-```java
-
-Producer producer = client.newProducer(JSONSchema.of(SensorReading.class))
-        .topic("sensor-readings")
-        .create();
-
-```
-
-The following schema formats are currently available for Java:
-
-* No schema or the byte array schema (which can be applied using `Schema.BYTES`):
-
-  ```java
-  
-  Producer bytesProducer = client.newProducer(Schema.BYTES)
-      .topic("some-raw-bytes-topic")
-      .create();
-  
-  ```
-
-  Or, equivalently:
-
-  ```java
-  
-  Producer bytesProducer = client.newProducer()
-      .topic("some-raw-bytes-topic")
-      .create();
-  
-  ```
-
-* `String` for normal UTF-8-encoded string data. This schema can be applied using `Schema.STRING`:
-
-  ```java
-  
-  Producer stringProducer = client.newProducer(Schema.STRING)
-      .topic("some-string-topic")
-      .create();
-  
-  ```
-
-* JSON schemas can be created for POJOs using the `JSONSchema` class. Here's an example:
-
-  ```java
-  
-  Schema pojoSchema = JSONSchema.of(MyPojo.class);
-  Producer pojoProducer = client.newProducer(pojoSchema)
-      .topic("some-pojo-topic")
-      .create();
-  
-  ```
-
-## Authentication
-
-Pulsar currently supports two authentication schemes: [TLS](security-tls-authentication.md) and [Athenz](security-athenz.md). The Pulsar Java client can be used with both.
-
-### TLS Authentication
-
-To use [TLS](security-tls-authentication.md), `enableTls` method is deprecated and you need to use "pulsar+ssl://" in serviceUrl to enable, point your Pulsar client to a TLS cert path, and provide paths to cert and key files.
-
-Here's an example configuration:
-
-```java
-
-Map authParams = new HashMap();
-authParams.put("tlsCertFile", "/path/to/client-cert.pem");
-authParams.put("tlsKeyFile", "/path/to/client-key.pem");
-
-Authentication tlsAuth = AuthenticationFactory
-        .create(AuthenticationTls.class.getName(), authParams);
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar+ssl://my-broker.com:6651")
-        .tlsTrustCertsFilePath("/path/to/cacert.pem")
-        .authentication(tlsAuth)
-        .build();
-
-```
-
-### Athenz
-
-To use [Athenz](security-athenz.md) as an authentication provider, you need to [use TLS](#tls-authentication) and provide values for four parameters in a hash:
-
-* `tenantDomain`
-* `tenantService`
-* `providerDomain`
-* `privateKey`
-
-You can also set an optional `keyId`. Here's an example configuration:
-
-```java
-
-Map authParams = new HashMap();
-authParams.put("tenantDomain", "shopping"); // Tenant domain name
-authParams.put("tenantService", "some_app"); // Tenant service name
-authParams.put("providerDomain", "pulsar"); // Provider domain name
-authParams.put("privateKey", "file:///path/to/private.pem"); // Tenant private key path
-authParams.put("keyId", "v1"); // Key id for the tenant private key (optional, default: "0")
-
-Authentication athenzAuth = AuthenticationFactory
-        .create(AuthenticationAthenz.class.getName(), authParams);
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar+ssl://my-broker.com:6651")
-        .tlsTrustCertsFilePath("/path/to/cacert.pem")
-        .authentication(athenzAuth)
-        .build();
-
-```
-
-> #### Supported pattern formats
-> The `privateKey` parameter supports the following three pattern formats:
-> * `file:///path/to/file`
-> * `file:/path/to/file`
-> * `data:application/x-pem-file;base64,`
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-python.md b/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-python.md
deleted file mode 100644
index 013802db1bfc4..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-python.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-id: client-libraries-python
-title: The Pulsar Python client
-sidebar_label: "Python"
-original_id: client-libraries-python
----
-
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/incubator-pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
-
-## Installation
-
-You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from source.
-
-### Installation using pip
-
-To install the `pulsar-client` library as a pre-built package using the [pip](https://pip.pypa.io/en/stable/) package manager:
-
-```shell
-
-$ pip install pulsar-client==@pulsar:version_number@
-
-```
-
-Installation via PyPi is available for the following Python versions:
-
-Platform | Supported Python versions
-:--------|:-------------------------
-MacOS 10.12 (Sierra) and 10.13 (High Sierra) | 2.7, 3.6
-Linux | 2.7, 3.3, 3.4, 3.5, 3.6
-
-### Installing from source
-
-To install the `pulsar-client` library by building from source, follow [these instructions](client-libraries-cpp.md#compilation) and compile the Pulsar C++ client library. That will also build the Python binding for the library.
-
-To install the built Python bindings:
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-$ cd pulsar/pulsar-client-cpp/python
-$ sudo python setup.py install
-
-```
-
-## API Reference
-
-The complete Python API reference is available at [api/python](/api/python).
-
-## Examples
-
-Below you'll find a variety of Python code examples for the `pulsar-client` library.
-
-### Producer example
-
-This creates a Python producer for the `my-topic` topic and send 10 messages on that topic:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-
-producer = client.create_producer('my-topic')
-
-for i in range(10):
-    producer.send(('Hello-%d' % i).encode('utf-8'))
-
-client.close()
-
-```
-
-### Consumer example
-
-This creates a consumer with the `my-subscription` subscription on the `my-topic` topic, listen for incoming messages, print the content and ID of messages that arrive, and acknowledge each message to the Pulsar broker:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-
-consumer = client.subscribe('my-topic', 'my-subscription')
-
-while True:
-    msg = consumer.receive()
-    print("Received message '{}' id='{}'".format(msg.data(), msg.message_id()))
-    consumer.acknowledge(msg)
-
-client.close()
-
-```
-
-### Reader interface example
-
-You can use the Pulsar Python API to use the Pulsar [reader interface](concepts-clients.md#reader-interface). Here's an example:
-
-```python
-
-# MessageId taken from a previously fetched message
-msg_id = msg.message_id()
-
-reader = client.create_reader('my-topic', msg_id)
-
-while True:
-    msg = reader.read_next()
-    print("Received message '{}' id='{}'".format(msg.data(), msg.message_id()))
-    # No acknowledgment
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-websocket.md b/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-websocket.md
deleted file mode 100644
index dfc9cbde2f443..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries-websocket.md
+++ /dev/null
@@ -1,455 +0,0 @@
----
-id: client-libraries-websocket
-title: Pulsar's WebSocket API
-sidebar_label: "WebSocket"
-original_id: client-libraries-websocket
----
-
-Pulsar's [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) API is meant to provide a simple way to interact with Pulsar using languages that do not have an official [client library](getting-started-clients.md). Through WebSockets you can publish and consume messages and use all the features available in the [Java](client-libraries-java.md), [Python](client-libraries-python.md), and [C++](client-libraries-cpp.md) client libraries.
-
-
-> You can use Pulsar's WebSocket API with any WebSocket client library. See examples for Python and Node.js [below](#client-examples).
-
-## Running the WebSocket service
-
-The standalone variant of Pulsar that we recommend using for [local development](getting-started-standalone.md) already has the WebSocket service enabled.
-
-In non-standalone mode, there are two ways to deploy the WebSocket service:
-
-* [embedded](#embedded-with-a-pulsar-broker) with a Pulsar broker
-* as a [separate component](#as-a-separate-component)
-
-### Embedded with a Pulsar broker
-
-In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the [`webSocketServiceEnabled`](reference-configuration.md#broker-webSocketServiceEnabled) parameter in the [`conf/broker.conf`](reference-configuration.md#broker) configuration file in your installation.
-
-```properties
-
-webSocketServiceEnabled=true
-
-```
-
-### As a separate component
-
-In this mode, the WebSocket service will be run from a Pulsar [broker](reference-terminology.md#broker) as a separate service. Configuration for this mode is handled in the [`conf/websocket.conf`](reference-configuration.md#websocket) configuration file. You'll need to set *at least* the following parameters:
-
-* [`configurationStoreServers`](reference-configuration.md#websocket-configurationStoreServers)
-* [`webServicePort`](reference-configuration.md#websocket-webServicePort)
-* [`clusterName`](reference-configuration.md#websocket-clusterName)
-
-Here's an example:
-
-```properties
-
-configurationStoreServers=zk1:2181,zk2:2181,zk3:2181
-webServicePort=8080
-clusterName=my-cluster
-
-```
-
-### Starting the broker
-
-When the configuration is set, you can start the service using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) tool:
-
-```shell
-
-$ bin/pulsar-daemon start websocket
-
-```
-
-## API Reference
-
-Pulsar's WebSocket API offers three endpoints for [producing](#producer-endpoint) messages, [consuming](#consumer-endpoint) messages and [reading](#reader-endpoint) messages.
-
-All exchanges via the WebSocket API use JSON.
-
-### Producer endpoint
-
-The producer endpoint requires you to specify a tenant, namespace, and topic in the URL:
-
-```http
-
-ws://broker-service-url:8080/ws/v2/producer/persistent/:tenant/:namespace/:topic
-
-```
-
-##### Query param
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`sendTimeoutMillis` | long | no | Send timeout (default: 30 secs)
-`batchingEnabled` | boolean | no | Enable batching of messages (default: false)
-`batchingMaxMessages` | int | no | Maximum number of messages permitted in a batch (default: 1000)
-`maxPendingMessages` | int | no | Set the max size of the internal-queue holding the messages (default: 1000)
-`batchingMaxPublishDelay` | long | no | Time period within which the messages will be batched (default: 10ms)
-`messageRoutingMode` | string | no | Message [routing mode](https://pulsar.incubator.apache.org/api/client/index.html?org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html) for the partitioned producer: `SinglePartition`, `RoundRobinPartition`
-`compressionType` | string | no | Compression [type](https://pulsar.incubator.apache.org/api/client/index.html?org/apache/pulsar/client/api/CompressionType.html): `LZ4`, `ZLIB`
-`producerName` | string | no | Specify the name for the producer. Pulsar will enforce only one producer with same name can be publishing on a topic
-`initialSequenceId` | long | no | Set the baseline for the sequence ids for messages published by the producer.
-`hashingScheme` | string | no | [Hashing function](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html) to use when publishing on a partitioned topic: `JavaStringHash`, `Murmur3_32Hash`
-
-
-#### Publishing a message
-
-```json
-
-{
-  "payload": "SGVsbG8gV29ybGQ=",
-  "properties": {"key1": "value1", "key2": "value2"},
-  "context": "1"
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`payload` | string | yes | Base-64 encoded payload
-`properties` | key-value pairs | no | Application-defined properties
-`context` | string | no | Application-defined request identifier
-`key` | string | no | For partitioned topics, decides which partition to use
-`replicationClusters` | array | no | Restrict replication to this list of [clusters](reference-terminology.md#cluster), specified by name
-
-
-##### Example success response
-
-```json
-
-{
-   "result": "ok",
-   "messageId": "CAAQAw==",
-   "context": "1"
- }
-
-```
-
-##### Example failure response
-
-```json
-
- {
-   "result": "send-error:3",
-   "errorMsg": "Failed to de-serialize from JSON",
-   "context": "1"
- }
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`result` | string | yes | `ok` if successful or an error message if unsuccessful
-`messageId` | string | yes | Message ID assigned to the published message
-`context` | string | no | Application-defined request identifier
-
-
-### Consumer endpoint
-
-The consumer endpoint requires you to specify a tenant, namespace, and topic, as well as a subscription, in the URL:
-
-```http
-
-ws://broker-service-url:8080/ws/v2/consumer/persistent/:tenant/:namespace/:topic/:subscription
-
-```
-
-##### Query param
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`ackTimeoutMillis` | long | no | Set the timeout for unacked messages (default: 0)
-`subscriptionType` | string | no | [Subscription type](https://pulsar.incubator.apache.org/api/client/index.html?org/apache/pulsar/client/api/SubscriptionType.html): `Exclusive`, `Failover`, `Shared`
-`receiverQueueSize` | int | no | Size of the consumer receive queue (default: 1000)
-`consumerName` | string | no | Consumer name
-`priorityLevel` | int | no | Define a [priority](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setPriorityLevel-int-) for the consumer
-
-##### Receiving messages
-
-Server will push messages on the WebSocket session:
-
-```json
-
-{
-  "messageId": "CAAQAw==",
-  "payload": "SGVsbG8gV29ybGQ=",
-  "properties": {"key1": "value1", "key2": "value2"},
-  "publishTime": "2016-08-30 16:45:57.785"
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId` | string | yes | Message ID
-`payload` | string | yes | Base-64 encoded payload
-`publishTime` | string | yes | Publish timestamp
-`properties` | key-value pairs | no | Application-defined properties
-`key` | string | no |  Original routing key set by producer
-
-#### Acknowledging the message
-
-Consumer needs to acknowledge the successful processing of the message to
-have the Pulsar broker delete it.
-
-```json
-
-{
-  "messageId": "CAAQAw=="
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId`| string | yes | Message ID of the processed message
-
-
-### Reader endpoint
-
-The reader endpoint requires you to specify a tenant, namespace, and topic in the URL:
-
-```http
-
-ws://broker-service-url:8080/ws/v2/reader/persistent/:tenant/:namespace/:topic
-
-```
-
-##### Query param
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`readerName` | string | no | Reader name
-`receiverQueueSize` | int | no | Size of the consumer receive queue (default: 1000)
-`messageId` | int or enum | no | Message ID to start from, `earliest` or `latest` (default: `latest`)
-
-##### Receiving messages
-
-Server will push messages on the WebSocket session:
-
-```json
-
-{
-  "messageId": "CAAQAw==",
-  "payload": "SGVsbG8gV29ybGQ=",
-  "properties": {"key1": "value1", "key2": "value2"},
-  "publishTime": "2016-08-30 16:45:57.785"
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId` | string | yes | Message ID
-`payload` | string | yes | Base-64 encoded payload
-`publishTime` | string | yes | Publish timestamp
-`properties` | key-value pairs | no | Application-defined properties
-`key` | string | no |  Original routing key set by producer
-
-#### Acknowledging the message
-
-**In WebSocket**, Reader needs to acknowledge the successful processing of the message to
-have the Pulsar WebSocket service update the number of pending messages.
-If you don't send acknowledgements, Pulsar WebSocket service will stop sending messages after reaching the pendingMessages limit.
-
-```json
-
-{
-  "messageId": "CAAQAw=="
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId`| string | yes | Message ID of the processed message
-
-
-### Error codes
-
-In case of error the server will close the WebSocket session using the
-following error codes:
-
-Error Code | Error Message
-:----------|:-------------
-1 | Failed to create producer
-2 | Failed to subscribe
-3 | Failed to deserialize from JSON
-4 | Failed to serialize to JSON
-5 | Failed to authenticate client
-6 | Client is not authorized
-7 | Invalid payload encoding
-8 | Unknown error
-
-> The application is responsible for re-establishing a new WebSocket session after a backoff period.
-
-## Client examples
-
-Below you'll find code examples for the Pulsar WebSocket API in [Python](#python) and [Node.js](#nodejs).
-
-### Python
-
-This example uses the [`websocket-client`](https://pypi.python.org/pypi/websocket-client) package. You can install it using [pip](https://pypi.python.org/pypi/pip):
-
-```shell
-
-$ pip install websocket-client
-
-```
-
-You can also download it from [PyPI](https://pypi.python.org/pypi/websocket-client).
-
-#### Python producer
-
-Here's an example Python producer that sends a simple message to a Pulsar [topic](reference-terminology.md#topic):
-
-```python
-
-import websocket, base64, json
-
-TOPIC = 'ws://localhost:8080/ws/producer/persistent/public/default/my-topic'
-
-ws = websocket.create_connection(TOPIC)
-
-# Send one message as JSON
-ws.send(json.dumps({
-    'payload' : base64.b64encode('Hello World'),
-    'properties': {
-        'key1' : 'value1',
-        'key2' : 'value2'
-    },
-    'context' : 5
-}))
-
-response =  json.loads(ws.recv())
-if response['result'] == 'ok':
-    print 'Message published successfully'
-else:
-    print 'Failed to publish message:', response
-ws.close()
-
-```
-
-#### Python consumer
-
-Here's an example Python consumer that listens on a Pulsar topic and prints the message ID whenever a message arrives:
-
-```python
-
-import websocket, base64, json
-
-TOPIC = 'ws://localhost:8080/ws/v2/consumer/persistent/public/default/my-topic/my-sub'
-
-ws = websocket.create_connection(TOPIC)
-
-while True:
-    msg = json.loads(ws.recv())
-    if not msg: break
-
-    print "Received: {} - payload: {}".format(msg, base64.b64decode(msg['payload']))
-
-    # Acknowledge successful processing
-    ws.send(json.dumps({'messageId' : msg['messageId']}))
-
-ws.close()
-
-```
-
-#### Python reader
-
-Here's an example Python reader that listens on a Pulsar topic and prints the message ID whenever a message arrives:
-
-```python
-
-import websocket, base64, json
-
-TOPIC = 'ws://localhost:8080/ws/v2/reader/persistent/public/default/my-topic'
-
-ws = websocket.create_connection(TOPIC)
-
-while True:
-    msg = json.loads(ws.recv())
-    if not msg: break
-
-    print "Received: {} - payload: {}".format(msg, base64.b64decode(msg['payload']))
-
-    # Acknowledge successful processing
-    ws.send(json.dumps({'messageId' : msg['messageId']}))
-
-ws.close()
-
-```
-
-### Node.js
-
-This example uses the [`ws`](https://websockets.github.io/ws/) package. You can install it using [npm](https://www.npmjs.com/):
-
-```shell
-
-$ npm install ws
-
-```
-
-#### Node.js producer
-
-Here's an example Node.js producer that sends a simple message to a Pulsar topic:
-
-```javascript
-
-var WebSocket = require('ws'),
-    topic = "ws://localhost:8080/ws/v2/producer/persistent/public/default/my-topic",
-    ws = new WebSocket(topic);
-
-var message = {
-  "payload" : new Buffer("Hello World").toString('base64'),
-  "properties": {
-    "key1" : "value1",
-    "key2" : "value2"
-  },
-  "context" : "1"
-};
-
-ws.on('open', function() {
-  // Send one message
-  ws.send(JSON.stringify(message));
-});
-
-ws.on('message', function(message) {
-  console.log('received ack: %s', message);
-});
-
-```
-
-#### Node.js consumer
-
-Here's an example Node.js consumer that listens on the same topic used by the producer above:
-
-```javascript
-
-var WebSocket = require('ws'),
-    topic = "ws://localhost:8080/ws/v2/consumer/persistent/public/default/my-topic/my-sub",
-    ws = new WebSocket(topic);
-
-ws.on('message', function(message) {
-    var receiveMsg = JSON.parse(message);
-    console.log('Received: %s - payload: %s', message, new Buffer(receiveMsg.payload, 'base64').toString());
-    var ackMsg = {"messageId" : receiveMsg.messageId};
-    ws.send(JSON.stringify(ackMsg));
-});
-
-```
-
-#### NodeJS reader
-
-```javascript
-
-var WebSocket = require('ws'),
-    topic = "ws://localhost:8080/ws/v2/reader/persistent/public/default/my-topic",
-    ws = new WebSocket(topic);
-
-ws.on('message', function(message) {
-    var receiveMsg = JSON.parse(message);
-    console.log('Received: %s - payload: %s', message, new Buffer(receiveMsg.payload, 'base64').toString());
-    var ackMsg = {"messageId" : receiveMsg.messageId};
-    ws.send(JSON.stringify(ackMsg));
-});
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries.md b/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries.md
deleted file mode 100644
index c8f9d4b83a0a2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/client-libraries.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-id: client-libraries
-title: Pulsar client libraries
-sidebar_label: "Client libraries"
-original_id: client-libraries
----
-
-Pulsar currently has client libraries available for following languages:
-
-* [Java](#java-client)
-* [Go](#go-client)
-* [Python](#python-client)
-* [C++](#c-client)
-
-## Java client
-
-For a tutorial on using the Pulsar Java client to produce and consume messages, see [The Pulsar Java client](client-libraries-java.md).
-
-There are also two independent sets of Javadoc API docs available:
-
-Library | Purpose
-:-------|:-------
-[`org.apache.pulsar.client.api`](/api/client) | The [Pulsar Java client](client-libraries-java.md) for producing and consuming messages on Pulsar topics [`org.apache.pulsar.client.admin`](/api/admin) | The Java client for the [Pulsar admin interface](admin-api-overview.md)
-
-
-## Go client
-
-For a tutorial on using the Pulsar Go client, see [The Pulsar Go client](client-libraries-go.md).
-
-
-## Python client
-
-For a tutorial on using the Pulsar Python client, see [The Pulsar Python client](client-libraries-python.md).
-
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](/api/python).
-
-## C++ client
-
-For a tutorial on using the Pulsar C++ clent, see [The Pulsar C++ client](client-libraries-cpp.md).
-
-There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API docs for the C++ client [here](/api/cpp).
-
-## Feature Matrix
-
-This matrix lists all the features among different languages in Pulsar @pulsar:version@ release.
-
-| Feature                                   | Java | C++ | Go | Python | WebSocket |
-|:------------------------------------------|:----:|:---:|:--:|:------:|:---------:|
-| Partitioned topics                        |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| Batching                                  |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| Compression                               |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| TLS                                       |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| Authentication                            |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| Reader API                                |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| Proxy Support                             |  ✅   |  ✅  | ✅  |   ✅    |     ✅     |
-| Effectively-Once                          |  ✅   |  ✅  | ✅  |   ✅    |     ❌     |
-| Schema                                    |  ✅   |      |     |         |     ❌     |
-| Consumer seek                             |  ✅   |  ✅  |     |   ✅    |     ❌     |
-| Multi-topics consumer                     |  ✅   |      |     |         |     ❌     |
-| Topics regex consumer                     |  ✅   |      |     |         |     ❌     |
-| Compacted topics                          |  ✅   |  ✅  |     |   ✅    |      ❌    |
-| User defined properties producer/consumer |  ✅   |      |     |         |     ❌     |
-| Reader hasMessageAvailable                |  ✅   |  ✅  |     |   ✅    |     ❌     |
-| Hostname verification                     |  ✅   |      |     |         |     ❌     |
-
-## Thirdparty Clients
-
-Besides the official released clients, there are also multiple projects on developing a Pulsar client in different languages.
-
-> if you have developed a Pulsar client, but it doesn't show up here. Feel free to submit a pull request to add your client to the list below.
-
-| Language | Project | Maintainer | License | Description |
-|----------|---------|------------|---------|-------------|
-| Go | [pulsar-client-go](https://github.com/Comcast/pulsar-client-go) | [Comcast](https://github.com/Comcast) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | A native golang client |
-| Go | [go-pulsar](https://github.com/t2y/go-pulsar) | [t2y](https://github.com/t2y) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | |
-| Scala | [pulsar4s](https://github.com/sksamuel/pulsar4s) | [sksamuel](https://github.com/sksamuel) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | Idomatic, typesafe, and reactive Scala client for Apache Pulsar |
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-architecture-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-architecture-overview.md
deleted file mode 100644
index 7dd93f7115eee..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-architecture-overview.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-id: concepts-architecture-overview
-title: Architecture Overview
-sidebar_label: "Architecture"
-original_id: concepts-architecture-overview
----
-
-At the highest level, a Pulsar instance is composed of one or more Pulsar clusters. Clusters within an instance can [replicate](concepts-replication.md) data amongst themselves.
-
-In a Pulsar cluster:
-
-* One or more brokers handles and load balances incoming messages from producers, dispatches messages to consumers, communicates with the Pulsar configuration store to handle various coordination tasks, stores messages in BookKeeper instances (aka bookies), relies on a cluster-specific ZooKeeper cluster for certain tasks, and more.
-* A BookKeeper cluster consisting of one or more bookies handles [persistent storage](#persistent-storage) of messages.
-* A ZooKeeper cluster specific to that cluster handles coordination tasks between Pulsar clusters.
-
-The diagram below provides an illustration of a Pulsar cluster:
-
-![Pulsar architecture diagram](/assets/pulsar-system-architecture.png)
-
-At the broader instance level, an instance-wide ZooKeeper cluster called the configuration store handles coordination tasks involving multiple clusters, for example [geo-replication](concepts-replication.md).
-
-## Brokers
-
-The Pulsar message broker is a stateless component that's primarily responsible for running two other components:
-
-* An HTTP server that exposes a {@inject: rest:REST:/} API for both administrative tasks and [topic lookup](concepts-clients.md#client-setup-phase) for producers and consumers
-* A dispatcher, which is an asynchronous TCP server over a custom [binary protocol](developing-binary-protocol.md) used for all data transfers
-
-Messages are typically dispatched out of a [managed ledger](#managed-ledgers) cache for the sake of performance, *unless* the backlog exceeds the cache size. If the backlog grows too large for the cache, the broker will start reading entries from BookKeeper.
-
-Finally, to support geo-replication on global topics, the broker manages replicators that tail the entries published in the local region and republish them to the remote region using the Pulsar [Java client library](client-libraries-java.md).
-
-> For a guide to managing Pulsar brokers, see the [brokers](admin-api-brokers.md) guide.
-
-## Clusters
-
-A Pulsar instance consists of one or more Pulsar *clusters*. Clusters, in turn, consist of:
-
-* One or more Pulsar [brokers](#brokers)
-* A ZooKeeper quorum used for cluster-level configuration and coordination
-* An ensemble of bookies used for [persistent storage](#persistent-storage) of messages
-
-Clusters can replicate amongst themselves using [geo-replication](concepts-replication.md).
-
-> For a guide to managing Pulsar clusters, see the [clusters](admin-api-clusters.md) guide.
-
-## Metadata store
-
-Pulsar uses [Apache Zookeeper](https://zookeeper.apache.org/) for metadata storage, cluster configuration, and coordination. In a Pulsar instance:
-
-* A configuration store quorum stores configuration for tenants, namespaces, and other entities that need to be globally consistent.
-* Each cluster has its own local ZooKeeper ensemble that stores cluster-specific configuration and coordination such as ownership metadata, broker load reports, BookKeeper ledger metadata, and more.
-
-## Persistent storage
-
-Pulsar provides guaranteed message delivery for applications. If a message successfully reaches a Pulsar broker, it will be delivered to its intended target.
-
-This guarantee requires that non-acknowledged messages are stored in a durable manner until they can be delivered to and acknowledged by consumers. This mode of messaging is commonly called *persistent messaging*. In Pulsar, N copies of all messages are stored and synced on disk, for example 4 copies across two servers with mirrored [RAID](https://en.wikipedia.org/wiki/RAID) volumes on each server.
-
-### Apache BookKeeper
-
-Pulsar uses a system called [Apache BookKeeper](http://bookkeeper.apache.org/) for persistent message storage. BookKeeper is a distributed [write-ahead log](https://en.wikipedia.org/wiki/Write-ahead_logging) (WAL) system that provides a number of crucial advantages for Pulsar:
-
-* It enables Pulsar to utilize many independent logs, called [ledgers](#ledgers). Multiple ledgers can be created for topics over time.
-* It offers very efficient storage for sequential data that handles entry replication.
-* It guarantees read consistency of ledgers in the presence of various system failures.
-* It offers even distribution of I/O across bookies.
-* It's horizontally scalable in both capacity and throughput. Capacity can be immediately increased by adding more bookies to a cluster.
-* Bookies are designed to handle thousands of ledgers with concurrent reads and writes. By using multiple disk devices---one for journal and another for general storage--bookies are able to isolate the effects of read operations from the latency of ongoing write operations.
-
-In addition to message data, *cursors* are also persistently stored in BookKeeper. Cursors are [subscription](reference-terminology.md#subscription) positions for [consumers](reference-terminology.md#consumer). BookKeeper enables Pulsar to store consumer position in a scalable fashion.
-
-At the moment, Pulsar supports persistent message storage. This accounts for the `persistent` in all topic names. Here's an example:
-
-```http
-
-persistent://my-tenant/my-namespace/my-topic
-
-```
-
-> Pulsar also supports ephemeral ([non-persistent](concepts-messaging.md#non-persistent-topics)) message storage.
-
-
-You can see an illustration of how brokers and bookies interact in the diagram below:
-
-![Brokers and bookies](/assets/broker-bookie.png)
-
-
-### Ledgers
-
-A ledger is an append-only data structure with a single writer that is assigned to multiple BookKeeper storage nodes, or bookies. Ledger entries are replicated to multiple bookies. Ledgers themselves have very simple semantics:
-
-* A Pulsar broker can create a ledger, append entries to the ledger, and close the ledger.
-* After the ledger has been closed---either explicitly or because the writer process crashed---it can then be opened only in read-only mode.
-* Finally, when entries in the ledger are no longer needed, the whole ledger can be deleted from the system (across all bookies).
-
-#### Ledger read consistency
-
-The main strength of Bookkeeper is that it guarantees read consistency in ledgers in the presence of failures. Since the ledger can only be written to by a single process, that process is free to append entries very efficiently, without need to obtain consensus. After a failure, the ledger will go through a recovery process that will finalize the state of the ledger and establish which entry was last committed to the log. After that point, all readers of the ledger are guaranteed to see the exact same content.
-
-#### Managed ledgers
-
-Given that Bookkeeper ledgers provide a single log abstraction, a library was developed on top of the ledger called the *managed ledger* that represents the storage layer for a single topic. A managed ledger represents the abstraction of a stream of messages with a single writer that keeps appending at the end of the stream and multiple cursors that are consuming the stream, each with its own associated position.
-
-Internally, a single managed ledger uses multiple BookKeeper ledgers to store the data. There are two reasons to have multiple ledgers:
-
-1. After a failure, a ledger is no longer writable and a new one needs to be created.
-2. A ledger can be deleted when all cursors have consumed the messages it contains. This allows for periodic rollover of ledgers.
-
-### Journal storage
-
-In BookKeeper, *journal* files contain BookKeeper transaction logs. Before making an update to a [ledger](#ledgers), a bookie needs to ensure that a transaction describing the update is written to persistent (non-volatile) storage. A new journal file is created once the bookie starts or the older journal file reaches the journal file size threshold (configured using the [`journalMaxSizeMB`](reference-configuration.md#bookkeeper-journalMaxSizeMB) parameter).
-
-## Pulsar proxy
-
-One way for Pulsar clients to interact with a Pulsar [cluster](#clusters) is by connecting to Pulsar message [brokers](#brokers) directly. In some cases, however, this kind of direct connection is either infeasible or undesirable because the client doesn't have direct access to broker addresses. If you're running Pulsar in a cloud environment or on [Kubernetes](https://kubernetes.io) or an analogous platform, for example, then direct client connections to brokers are likely not possible.
-
-The **Pulsar proxy** provides a solution to this problem by acting as a single gateway for all of the brokers in a cluster. If you run the Pulsar proxy (which, again, is optional), all client connections with the Pulsar cluster will flow through the proxy rather than communicating with brokers.
-
-> 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:
-
-```bash
-
-$ bin/pulsar proxy \
-  --zookeeper-servers zk-0,zk-1,zk-2 \
-  --configuration-store-servers zk-0,zk-1,zk-2
-
-```
-
-> #### Pulsar proxy docs
-> For documentation on using the Pulsar proxy, see the [Pulsar proxy admin documentation](administration-proxy.md).
-
-
-Some important things to know about the Pulsar proxy:
-
-* Connecting clients don't need to provide *any* specific configuration to use the Pulsar proxy. You won't need to update the client configuration for existing applications beyond updating the IP used for the service URL (for example if you're running a load balancer over the Pulsar proxy).
-* [TLS encryption](security-tls-transport.md) and [authentication](security-tls-authentication.md) is supported by the Pulsar proxy
-
-## Service discovery
-
-[Clients](getting-started-clients.md) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL. Pulsar provides a built-in service discovery mechanism that you can set up using the instructions in the [Deploying a Pulsar instance](deploy-bare-metal.md#service-discovery-setup) guide.
-
-You can use your own service discovery system if you'd like. If you use your own system, there is just one requirement: when a client performs an HTTP request to an endpoint, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to *some* active broker in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
-
-The diagram below illustrates Pulsar service discovery:
-
-![alt-text](/assets/pulsar-service-discovery.png)
-
-In this diagram, the Pulsar cluster is addressable via a single DNS name: `pulsar-cluster.acme.com`. A [Python client](client-libraries-python.md), for example, could access this Pulsar cluster like this:
-
-```python
-
-from pulsar import Client
-
-client = Client('pulsar://pulsar-cluster.acme.com:6650')
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-authentication.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-authentication.md
deleted file mode 100644
index d48e25a1dff9d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-authentication.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-id: concepts-authentication
-title: Authentication and Authorization
-sidebar_label: "Authentication and Authorization"
-original_id: concepts-authentication
----
-
-Pulsar supports a pluggable [authentication](security-overview.md) mechanism which can be configured at broker and it also supports authorization to identify client and its access rights on topics and tenants.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-clients.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-clients.md
deleted file mode 100644
index f3b5ae3893212..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-clients.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-id: concepts-clients
-title: Pulsar Clients
-sidebar_label: "Clients"
-original_id: concepts-clients
----
-
-Pulsar exposes a client API with language bindings for [Java](client-libraries-java.md) and [C++](client-libraries-cpp.md). The client API optimizes and encapsulates Pulsar's client-broker communication protocol and exposes a simple and intuitive API for use by applications.
-
-Under the hood, the current official Pulsar client libraries support transparent reconnection and/or connection failover to brokers, queuing of messages until acknowledged by the broker, and heuristics such as connection retries with backoff.
-
-> #### Custom client libraries
-> If you'd like to create your own client library, we recommend consulting the documentation on Pulsar's custom [binary protocol](developing-binary-protocol.md)
-
-
-## Client setup phase
-
-When an application wants to create a producer/consumer, the Pulsar client library will initiate a setup phase that is composed of two steps:
-
-1. The client will attempt to determine the owner of the topic by sending an HTTP lookup request to the broker. The request could reach one of the active brokers which, by looking at the (cached) zookeeper metadata will know who is serving the topic or, in case nobody is serving it, will try to assign it to the least loaded broker.
-1. Once the client library has the broker address, it will create a TCP connection (or reuse an existing connection from the pool) and authenticate it. Within this connection, client and broker exchange binary commands from a custom protocol. At this point the client will send a command to create producer/consumer to the broker, which will comply after having validated the authorization policy.
-
-Whenever the TCP connection breaks, the client will immediately re-initiate this setup phase and will keep trying with exponential backoff to re-establish the producer or consumer until the operation succeeds.
-
-## Reader interface
-
-In Pulsar, the "standard" [consumer interface](concepts-messaging.md#consumers) involves using consumers to listen on [topics](reference-terminology.md#topic), process incoming messages, and finally acknowledge those messages when they've been processed. Whenever a consumer connects to a topic, it automatically begins reading from the earliest un-acked message onward because the topic's cursor is automatically managed by Pulsar.
-
-The **reader interface** for Pulsar enables applications to manually manage cursors. When you use a reader to connect to a topic---rather than a consumer---you need to specify *which* message the reader begins reading from when it connects to a topic. When connecting to a topic, the reader interface enables you to begin with:
-
-* The **earliest** available message in the topic
-* The **latest** available message in the topic
-* Some other message between the earliest and the latest. If you select this option, you'll need to explicitly provide a message ID. Your application will be responsible for "knowing" this message ID in advance, perhaps fetching it from a persistent data store or cache.
-
-The reader interface is helpful for use cases like using Pulsar to provide [effectively-once](https://streaml.io/blog/exactly-once/) processing semantics for a stream processing system. For this use case, it's essential that the stream processing system be able to "rewind" topics to a specific message and begin reading there. The reader interface provides Pulsar clients with the low-level abstraction necessary to "manually position" themselves within a topic.
-
-![The Pulsar consumer and reader interfaces](/assets/pulsar-reader-consumer-interfaces.png)
-
-> ### Non-partitioned topics only
-> The reader interface for Pulsar cannot currently be used with [partitioned topics](concepts-messaging.md#partitioned-topics).
-
-Here's a Java example that begins reading from the earliest available message on a topic:
-
-```java
-
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageId;
-import org.apache.pulsar.client.api.Reader;
-
-// Create a reader on a topic and for a specific message (and onward)
-Reader reader = pulsarClient.newReader()
-    .topic("reader-api-test")
-    .startMessageId(MessageId.earliest)
-    .create();
-
-while (true) {
-    Message message = reader.readNext();
-
-    // Process the message
-}
-
-```
-
-To create a reader that will read from the latest available message:
-
-```java
-
-Reader reader = pulsarClient.newReader()
-    .topic(topic)
-    .startMessageId(MessageId.latest)
-    .create();
-
-```
-
-To create a reader that will read from some message between earliest and latest:
-
-```java
-
-byte[] msgIdBytes = // Some byte array
-MessageId id = MessageId.fromByteArray(msgIdBytes);
-Reader reader = pulsarClient.newReader()
-    .topic(topic)
-    .startMessageId(id)
-    .create();
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md
deleted file mode 100644
index 9f66ba5e5c7e1..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md
+++ /dev/null
@@ -1,318 +0,0 @@
----
-id: concepts-messaging
-title: Messaging Concepts
-sidebar_label: "Messaging"
-original_id: concepts-messaging
----
-
-Pulsar is built on the [publish-subscribe](https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern) pattern, aka pub-sub. In this pattern, [producers](#producers) publish messages to [topics](#topics). [Consumers](#consumers) can then [subscribe](#subscription-types) to those topics, process incoming messages, and send an acknowledgement when processing is complete.
-
-Once a subscription has been created, all messages will be [retained](concepts-architecture-overview.md#persistent-storage) by Pulsar, even if the consumer gets disconnected. Retained messages will be discarded only when a consumer acknowledges that they've been successfully processed.
-
-## Messages
-
-Messages are the basic "unit" of Pulsar. They're what producers publish to topics and what consumers then consume from topics (and acknowledge when the message has been processed). Messages are the analogue of letters in a postal service system.
-
-Component | Purpose
-:---------|:-------
-Value / data payload | The data carried by the message. All Pulsar messages carry raw bytes, although message data can also conform to data [schemas](concepts-schema-registry.md)
-Key | Messages can optionally be tagged with keys, which can be useful for things like [topic compaction](concepts-topic-compaction.md)
-Properties | An optional key/value map of user-defined properties
-Producer name | The name of the producer that produced the message (producers are automatically given default names, but you can apply your own explicitly as well)
-Sequence ID | Each Pulsar message belongs to an ordered sequence on its topic. A message's sequence ID is its ordering in that sequence.
-Publish time | The timestamp of when the message was published (automatically applied by the producer)
-Event time | An optional timestamp that applications can attach to the message representing when something happened, e.g. when the message was processed. The event time of a message is 0 if none is explicitly set.
-
-
-> For a more in-depth breakdown of Pulsar message contents, see the documentation on Pulsar's [binary protocol](developing-binary-protocol.md).
-
-## Producers
-
-A producer is a process that attaches to a topic and publishes messages to a Pulsar [broker](reference-terminology.md#broker) for processing.
-
-### Send modes
-
-Producers can send messages to brokers either synchronously (sync) or asynchronously (async).
-
-| Mode       | Description                                                                                                                                                                                                                                                                                                                                                              |
-|:-----------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Sync send  | The producer will wait for acknowledgement from the broker after sending each message. If acknowledgment isn't received then the producer will consider the send operation a failure.                                                                                                                                                                                    |
-| Async send | The producer will put the message in a blocking queue and return immediately. The client library will then send the message to the broker in the background. If the queue is full (max size [configurable](reference-configuration.md#broker), the producer could be blocked or fail immediately when calling the API, depending on arguments passed to the producer. |
-
-### Compression
-
-Messages published by producers can be compressed during transportation in order to save bandwidth. Pulsar currently supports two types of compression:
-
-* [LZ4](https://github.com/lz4/lz4)
-* [ZLIB](https://zlib.net/)
-
-### Batching
-
-If batching is enabled, the producer will accumulate and send a batch of messages in a single request. Batching size is defined by the maximum number of messages and maximum publish latency.
-
-## Consumers
-
-A consumer is a process that attaches to a topic via a subscription and then receives messages.
-
-### Receive modes
-
-Messages can be received from [brokers](reference-terminology.md#broker) either synchronously (sync) or asynchronously (async).
-
-| Mode          | Description                                                                                                                                                                                                   |
-|:--------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Sync receive  | A sync receive will be blocked until a message is available.                                                                                                                                                  |
-| Async receive | An async receive will return immediately with a future value---a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture) in Java, for example---that completes once a new message is available. |
-
-### Acknowledgement
-
-When a consumer has successfully processed a message, it needs to send an acknowledgement to the broker so that the broker can discard the message (otherwise it [stores](concepts-architecture-overview.md#persistent-storage) the message).
-
-Messages can be acknowledged either one by one or cumulatively. With cumulative acknowledgement, the consumer only needs to acknowledge the last message it received. All messages in the stream up to (and including) the provided message will not be re-delivered to that consumer.
-
-
-> Cumulative acknowledgement cannot be used with [shared subscription type](#subscription-types), because shared mode involves multiple consumers having access to the same subscription.
-
-### Listeners
-
-Client libraries can provide their own listener implementations for consumers. The [Java client](client-libraries-java.md), for example, provides a {@inject: javadoc:MesssageListener:/client/org/apache/pulsar/client/api/MessageListener} interface. In this interface, the `received` method is called whenever a new message is received.
-
-## Topics
-
-As in other pub-sub systems, topics in Pulsar are named channels for transmitting messages from [producers](reference-terminology.md#producer) to [consumers](reference-terminology.md#consumer). Topic names are URLs that have a well-defined structure:
-
-```http
-
-{persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-Topic name component | Description
-:--------------------|:-----------
-`persistent` / `non-persistent` | This identifies the type of topic. Pulsar supports two kind of topics: [persistent](concepts-architecture-overview.md#persistent-storage) and [non-persistent](#non-persistent-topics) (persistent is the default, so if you don't specify a type the topic will be persistent). With persistent topics, all messages are durably [persisted](concepts-architecture-overview.md#persistent-storage) on disk (that means on multiple disks unless the broker is standalone), whereas data for [non-persistent](#non-persistent-topics) topics isn't persisted to storage disks.
-`tenant`             | The topic's tenant within the instance. Tenants are essential to multi-tenancy in Pulsar and can be spread across clusters.
-`namespace`          | The administrative unit of the topic, which acts as a grouping mechanism for related topics. Most topic configuration is performed at the [namespace](#namespaces) level. Each tenant can have multiple namespaces.
-`topic`              | The final part of the name. Topic names are freeform and have no special meaning in a Pulsar instance.
-
-
-> **No need to explicitly create new topics**  
-> You don't need to explicitly create topics in Pulsar. If a client attempts to write or receive messages to/from a topic that does not yet exist, Pulsar will automatically create that topic under the [namespace](#namespaces) provided in the [topic name](#topics).
-
-
-## Namespaces
-
-A namespace is a logical nomenclature within a tenant. A tenant can create multiple namespaces via the [admin API](admin-api-namespaces.md#create). For instance, a tenant with different applications can create a separate namespace for each application. A namespace allows the application to create and manage a hierarchy of topics. The topic `my-tenant/app1` is a namespace for the application `app1` for `my-tenant`. You can create any number of [topics](#topics) under the namespace.
-
-## Subscription types
-
-A subscription is a named configuration rule that determines how messages are delivered to consumers. There are three available subscription types in Pulsar: [exclusive](#exclusive), [shared](#shared), and [failover](#failover). These types are illustrated in the figure below.
-
-![Subscription types](/assets/pulsar-subscription-types.png)
-
-### Exclusive
-
-In *exclusive* type, only a single consumer is allowed to attach to the subscription. If more than one consumer attempts to subscribe to a topic using the same subscription, the consumer receives an error.
-
-In the diagram above, only **Consumer A-0** is allowed to consume messages.
-
-> Exclusive is the default subscription type.
-
-![Exclusive subscriptions](/assets/pulsar-exclusive-subscriptions.png)
-
-### Shared
-
-In *shared* or *round robin* mode, multiple consumers can attach to the same subscription. Messages are delivered in a round robin distribution across consumers, and any given message is delivered to only one consumer. When a consumer disconnects, all the messages that were sent to it and not acknowledged will be rescheduled for sending to the remaining consumers.
-
-In the diagram above, **Consumer-B-1** and **Consumer-B-2** are able to subscribe to the topic, but **Consumer-C-1** and others could as well.
-
-> **Limitations of Shared type**  
-> Be aware when using Shared type:
-> * Message ordering is not guaranteed.
-> * You cannot use cumulative acknowledgment with Shared type.
-
-![Shared subscriptions](/assets/pulsar-shared-subscriptions.png)
-
-### Failover
-
-In *Failover* type, multiple consumers can attach to the same subscription. The consumers will be lexically sorted by the consumer's name and the first consumer will initially be the only one receiving messages. This consumer is called the *master consumer*.
-
-When the master consumer disconnects, all (non-acked and subsequent) messages will be delivered to the next consumer in line.
-
-In the diagram above, Consumer-C-1 is the master consumer while Consumer-C-2 would be the next in line to receive messages if Consumer-C-1 disconnected.
-
-![Failover subscriptions](/assets/pulsar-failover-subscriptions.png)
-
-## Multi-topic subscriptions
-
-When a consumer subscribes to a Pulsar topic, by default it subscribes to one specific topic, such as `persistent://public/default/my-topic`. As of Pulsar version 1.23.0-incubating, however, Pulsar consumers can simultaneously subscribe to multiple topics. You can define a list of topics in two ways:
-
-* On the basis of a [**reg**ular **ex**pression](https://en.wikipedia.org/wiki/Regular_expression) (regex), for example `persistent://public/default/finance-.*`
-* By explicitly defining a list of topics
-
-> When subscribing to multiple topics by regex, all topics must be in the same [namespace](#namespaces)
-
-When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
-
-> **No ordering guarantees across multiple topics**  
-> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
-
-Here are some multi-topic subscription examples for Java:
-
-```java
-
-import java.util.regex.Pattern;
-
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient pulsarClient = // Instantiate Pulsar client object
-
-// Subscribe to all topics in a namespace
-Pattern allTopicsInNamespace = Pattern.compile("persistent://public/default/.*");
-Consumer allTopicsConsumer = pulsarClient.subscribe(allTopicsInNamespace, "subscription-1");
-
-// Subscribe to a subsets of topics in a namespace, based on regex
-Pattern someTopicsInNamespace = Pattern.compile("persistent://public/default/foo.*");
-Consumer someTopicsConsumer = pulsarClient.subscribe(someTopicsInNamespace, "subscription-1");
-
-```
-
-For code examples, see:
-
-* [Java](client-libraries-java.md#multi-topic-subscriptions)
-
-## Partitioned topics
-
-Normal topics can be served only by a single broker, which limits the topic's maximum throughput. *Partitioned topics* are a special type of topic that be handled by multiple brokers, which allows for much higher throughput.
-
-Behind the scenes, a partitioned topic is actually implemented as N internal topics, where N is the number of partitions. When publishing messages to a partitioned topic, each message is routed to one of several brokers. The distribution of partitions across brokers is handled automatically by Pulsar.
-
-The diagram below illustrates this:
-
-![](/assets/partitioning.png)
-
-Here, the topic **Topic1** has five partitions (**P0** through **P4**) split across three brokers. Because there are more partitions than brokers, two brokers handle two partitions a piece, while the third handles only one (again, Pulsar handles this distribution of partitions automatically).
-
-Messages for this topic are broadcast to two consumers. The [routing mode](#routing-modes) determines both which broker handles each partition, while the [subscription type](#subscription-types) determines which messages go to which consumers.
-
-Decisions about routing and subscription types can be made separately in most cases. In general, throughput concerns should guide partitioning/routing decisions while subscription decisions should be guided by application semantics.
-
-There is no difference between partitioned topics and normal topics in terms of how subscription types work, as partitioning only determines what happens between when a message is published by a producer and processed and acknowledged by a consumer.
-
-Partitioned topics need to be explicitly created via the [admin API](admin-api-overview.md). The number of partitions can be specified when creating the topic.
-
-### Routing modes
-
-When publishing to partitioned topics, you must specify a *routing mode*. The routing mode determines which partition---that is, which internal topic---each message should be published to.
-
-There are three routing modes available by default:
-
-Mode | Description | Ordering guarantee
-:----|:------------|:------------------
-Key hash | If a key property has been specified on the message, the partitioned producer will hash the key and assign it to a particular partition. | Per-key-bucket ordering
-Single default partition | If no key is provided, each producer's message will be routed to a dedicated partition, initially random selected | Per-producer ordering
-Round robin distribution | If no key is provided, all messages will be routed to different partitions in round-robin fashion to achieve maximum throughput. | None
-
-In addition to these default modes, you can also create a custom routing mode if you're using the [Java client](client-libraries-java.md) by implementing the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface.
-
-
-
-## Non-persistent topics
-
-
-By default, Pulsar persistently stores *all* unacknowledged messages on multiple [BookKeeper](concepts-architecture-overview.md#persistent-storage) bookies (storage nodes). Data for messages on persistent topics can thus survive broker restarts and subscriber failover.
-
-Pulsar also, however, supports **non-persistent topics**, which are topics on which messages are *never* persisted to disk and live only in memory. When using non-persistent delivery, killing a Pulsar broker or disconnecting a subscriber to a topic means that all in-transit messages are lost on that (non-persistent) topic, meaning that clients may see message loss.
-
-Non-persistent topics have names of this form (note the `non-persistent` in the name):
-
-```http
-
-non-persistent://tenant/namespace/topic
-
-```
-
-> For more info on using non-persistent topics, see the [Non-persistent messaging cookbook](cookbooks-non-persistent.md).
-
-In non-persistent topics, brokers immediately deliver messages to all connected subscribers *without persisting them* in [BookKeeper](concepts-architecture-overview.md#persistent-storage). If a subscriber is disconnected, the broker will not be able to deliver those in-transit messages, and subscribers will never be able to receive those messages again. Eliminating the persistent storage step makes messaging on non-persistent topics slightly faster than on persistent topics in some cases, but with the caveat that some of the core benefits of Pulsar are lost.
-
-> With non-persistent topics, message data lives only in memory. If a message broker fails or message data can otherwise not be retrieved from memory, your message data may be lost. Use non-persistent topics only if you're *certain* that your use case requires it and can sustain it.
-
-By default, non-persistent topics are enabled on Pulsar brokers. You can disable them in the broker's [configuration](reference-configuration.md#broker-enableNonPersistentTopics). You can manage non-persistent topics using the [`pulsar-admin topics`](referencereference--pulsar-admin/#topics-1) interface.
-
-### Performance
-
-Non-persistent messaging is usually faster than persistent messaging because brokers don't persist messages and immediately send acks back to the producer as soon as that message is deliver to all connected subscribers. Producers thus see comparatively low publish latency with non-persistent topic.
-
-### Client API
-
-Producers and consumers can connect to non-persistent topics in the same way as persistent topics, with the crucial difference that the topic name must start with `non-persistent`. All three subscription types---[exclusive](#exclusive), [shared](#shared), and [failover](#failover)---are supported for non-persistent topics.
-
-Here's an example [Java consumer](client-libraries-java.md#consumers) for a non-persistent topic:
-
-```java
-
-PulsarClient client = PulsarClient.create("pulsar://localhost:6650");
-String npTopic = "non-persistent://public/default/my-topic";
-String subscriptionName = "my-subscription-name";
-
-Consumer consumer = client.subscribe(npTopic, subscriptionName);
-
-```
-
-Here's an example [Java producer](client-libraries-java.md#producer) for the same non-persistent topic:
-
-```java
-
-Producer producer = client.createProducer(npTopic);
-
-```
-
-## Message retention and expiry
-
-By default, Pulsar message brokers:
-
-* immediately delete *all* messages that have been acknowledged by a consumer, and
-* [persistently store](concepts-architecture-overview.md#persistent-storage) all unacknowledged messages in a message backlog.
-
-Pulsar has two features, however, that enable you to override this default behavior:
-
-* Message **retention** enables you to store messages that have been acknowledged by a consumer
-* Message **expiry** enables you to set a time to live (TTL) for messages that have not yet been acknowledged
-
-> All message retention and expiry is managed at the [namespace](#namespaces) level. For a how-to, see the [Message retention and expiry](cookbooks-retention-expiry.md) cookbook.
-
-The diagram below illustrates both concepts:
-
-![Message retention and expiry](/assets/retention-expiry.png)
-
-With message retention, shown at the top, a retention policy applied to all topics in a namespace dictates that some messages are durably stored in Pulsar even though they've already been acknowledged. Acknowledged messages that are not covered by the retention policy are deleted. Without a retention policy, *all* of the acknowledged messages would be deleted.
-
-With message expiry, shown at the bottom, some messages are deleted, even though they haven't been acknowledged, because they've expired according to the TTL applied to the namespace (for example because a TTL of 5 minutes has been applied and the messages haven't been acknowledged but are 10 minutes old).
-
-## Message deduplication
-
-Message **duplication** occurs when a message is [persisted](concepts-architecture-overview.md#persistent-storage) by Pulsar more than once. Message ***de**duplication** is an optional Pulsar feature that prevents unnecessary message duplication by processing each message only once, **even if the message is received more than once*.
-
-The following diagram illustrates what happens when message deduplication is disabled vs. enabled:
-
-![Pulsar message deduplication](/assets/message-deduplication.png)
-
-
-Message deduplication is disabled in the scenario shown at the top. Here, a producer publishes message 1 on a topic; the message reaches a Pulsar broker and is [persisted](concepts-architecture-overview.md#persistent-storage) to BookKeeper. The producer then sends message 1 again (in this case due to some retry logic), and the message is received by the broker and stored in BookKeeper again, which means that duplication has occurred.
-
-In the second scenario at the bottom, the producer publishes message 1, which is received by the broker and persisted, as in the first scenario. When the producer attempts to publish the message again, however, the broker knows that it has already seen message 1 and thus does not persist the message.
-
-> Message deduplication is handled at the namespace level. For more instructions, see the [message deduplication cookbook](cookbooks-deduplication.md).
-
-
-### Producer idempotency
-
-The other available approach to message deduplication is to ensure that each message is *only produced once*. This approach is typically called **producer idempotency**. The drawback of this approach is that it defers the work of message deduplication to the application. In Pulsar, this is handled at the [broker](reference-terminology.md#broker) level, which means that you don't need to modify your Pulsar client code. Instead, you only need to make administrative changes (see the [Managing message deduplication](cookbooks-deduplication.md) cookbook for a guide).
-
-### Deduplication and effectively-once semantics
-
-Message deduplication makes Pulsar an ideal messaging system to be used in conjunction with stream processing engines (SPEs) and other systems seeking to provide [effectively-once](https://streaml.io/blog/exactly-once) processing semantics. Messaging systems that don't offer automatic message deduplication require the SPE or other system to guarantee deduplication, which means that strict message ordering comes at the cost of burdening the application with the responsibility of deduplication. With Pulsar, strict ordering guarantees come at no application-level cost.
-
-> More in-depth information can be found in [this post](https://streaml.io/blog/pulsar-effectively-once/) on the [Streamlio blog](https://streaml.io/blog)
-
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-multi-tenancy.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-multi-tenancy.md
deleted file mode 100644
index 8cba09547d2d3..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-multi-tenancy.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-id: concepts-multi-tenancy
-title: Multi Tenancy
-sidebar_label: "Multi Tenancy"
-original_id: concepts-multi-tenancy
----
-
-Pulsar was created from the ground up as a multi-tenant system. To support multi-tenancy, Pulsar has a concept of tenants. Tenants can be spread across clusters and can each have their own [authentication and authorization](security-overview.md) scheme applied to them. They are also the administrative unit at which storage quotas, [message TTL](cookbooks-retention-expiry.md#time-to-live-ttl), and isolation policies can be managed.
-
-The multi-tenant nature of Pulsar is reflected mostly visibly in topic URLs, which have this structure:
-
-```http
-
-persistent://tenant/namespace/topic
-
-```
-
-As you can see, the tenant is the most basic unit of categorization for topics (more fundamental than the namespace and topic name).
-
-## Tenants
-
-To each tenant in a Pulsar instance you can assign:
-
-* An [authorization](security-authorization.md) scheme
-* The set of [clusters](reference-terminology.md#cluster) to which the tenant's configuration applies
-
-## Namespaces
-
-Tenants and namespaces are two key concepts of Pulsar to support multi-tenancy.
-
-* Pulsar is provisioned for specified tenants with appropriate capacity allocated to the tenant.
-* A namespace is the administrative unit nomenclature within a tenant. The configuration policies set on a namespace apply to all the topics created in that namespace. A tenant may create multiple namespaces via self-administration using the REST API and the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool. For instance, a tenant with different applications can create a separate namespace for each application.
-
-Names for topics in the same namespace will look like this:
-
-```http
-
-persistent://tenant/app1/topic-1
-
-persistent://tenant/app1/topic-2
-
-persistent://tenant/app1/topic-3
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-overview.md
deleted file mode 100644
index 02b4ef3d5bb14..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-overview.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-id: concepts-overview
-title: Pulsar Overview
-sidebar_label: "Overview"
-original_id: concepts-overview
----
-
-Pulsar is a multi-tenant, high-performance solution for server-to-server messaging originally developed by [Yahoo](http://yahoo.github.io/) and now under the stewardship of the [Apache Software Foundation](https://www.apache.org/).
-
-Pulsar's key features include:
-
-* Native support for multiple clusters in a Pulsar instance, with seamless [geo-replication](administration-geo.md) of messages across clusters
-* Very low publish and end-to-end latency
-* Seamless scalability out to over a million topics
-* A simple [client API](concepts-clients.md) with bindings for [Java](client-libraries-java.md), [Python](client-libraries-python.md), and [C++](client-libraries-cpp.md)
-* Multiple [subscription types](concepts-messaging.md#subscription-types) for topics ([exclusive](concepts-messaging.md#exclusive), [shared](concepts-messaging.md#shared), and [failover](concepts-messaging.md#failover))
-* Guaranteed message delivery with [persistent message storage](concepts-architecture-overview.md#persistent-storage) provided by [Apache BookKeeper](http://bookkeeper.apache.org/)
-* A serverless lightweight computing framework [Pulsar Functions](functions-overview.md) offers stream native data processing.
-* A serverless connector framework [Pulsar IO](io-overview.md) built on-top-of Pulsar Functions to make moving data in and out Apache Pulsar easier.
-* [Tiered Storage](concepts-tiered-storage.md) offloads data from hot/warn storage to cold/long-term storage (such as S3 and GCS) when the data is aging out.
-
-## Contents
-
-- [Messaging Concepts](concepts-messaging.md)
-- [Architecture Overview](concepts-architecture-overview.md)
-- [Pulsar Clients](concepts-clients.md)
-- [Geo Replication](concepts-replication.md)
-- [Multi Tenancy](concepts-multi-tenancy.md)
-- [Authentication and Authorization](concepts-authentication.md)
-- [Topic Compaction](concepts-topic-compaction.md)
-- [Tiered Storage](concepts-tiered-storage.md)
-- [Schema Registry](concepts-schema-registry.md)
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-replication.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-replication.md
deleted file mode 100644
index 799f0eb4d92c6..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-replication.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-id: concepts-replication
-title: Geo Replication
-sidebar_label: "Geo Replication"
-original_id: concepts-replication
----
-
-Pulsar enables messages to be produced and consumed in different geo-locations. For instance, your application may be publishing data in one region or market and you would like to process it for consumption in other regions or markets. [Geo-replication](administration-geo.md) in Pulsar enables you to do that.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-schema-registry.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-schema-registry.md
deleted file mode 100644
index d08c0cfa0a99d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-schema-registry.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-id: concepts-schema-registry
-title: Schema Registry
-sidebar_label: "Schema Registry"
-original_id: concepts-schema-registry
----
-
-Type safety is extremely important in any application built around a message bus like Pulsar. Producers and consumers need some kind of mechanism for coordinating types at the topic level lest a wide variety of potential problems arise (for example serialization and deserialization issues). Applications typically adopt one of two basic approaches to type safety in messaging:
-
-1. A "client-side" approach in which message producers and consumers are responsible for not only serializing and deserializing messages (which consist of raw bytes) but also "knowing" which types are being transmitted via which topics. If a producer is sending temperature sensor data on the topic `topic-1`, consumers of that topic will run into trouble if they attempt to parse that data as, say, moisture sensor readings.
-1. A "server-side" approach in which producers and consumers inform the system which data types can be transmitted via the topic. With this approach, the messaging system enforces type safety and ensures that producers and consumers remain synced.
-
-Both approaches are available in Pulsar, and you're free to adopt one or the other or to mix and match on a per-topic basis.
-
-1. For the "client-side" approach, producers and consumers can send and receive messages consisting of raw byte arrays and leave all type safety enforcement to the application on an "out-of-band" basis.
-1. For the "server-side" approach, Pulsar has a built-in **schema registry** that enables clients to upload data schemas on a per-topic basis. Those schemas dictate which data types are recognized as valid for that topic.
-
-> The Pulsar schema registry is currently available only for the [Java client](client-libraries-java.md).
-
-## Basic architecture
-
-Schemas are automatically uploaded when you create a typed Producer with a Schema. Additionally, Schemas can be manually uploaded to, fetched from, and updated via Pulsar's {@inject: rest:REST:tag/schemas} API.
-
-> #### Other schema registry backends
-> Out of the box, Pulsar uses the [Apache BookKeeper](concepts-architecture-overview#persistent-storage) log storage system for schema storage. You can, however, use different backends if you wish. Documentation for custom schema storage logic is coming soon.
-
-## How schemas work
-
-Pulsar schemas are applied and enforced *at the topic level* (schemas cannot be applied at the namespace or tenant level). Producers and consumers upload schemas to Pulsar brokers.
-
-Pulsar schemas are fairly simple data structures that consist of:
-
-* A **name**. In Pulsar, a schema's name is the topic to which the schema is applied.
-* A **payload**, which is a binary representation of the schema
-* A schema [**type**](#supported-schema-formats)
-* User-defined **properties** as a string/string map. Usage of properties is wholly application specific. Possible properties might be the Git hash associated with a schema, an environment like `dev` or `prod`, etc.
-
-## Schema versions
-
-In order to illustrate how schema versioning works, let's walk through an example. Imagine that the Pulsar [Java client](client-libraries-java.md) created using the code below attempts to connect to Pulsar and begin sending messages:
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-
-Producer producer = client.newProducer(JSONSchema.of(SensorReading.class))
-        .topic("sensor-data")
-        .sendTimeout(3, TimeUnit.SECONDS)
-        .create();
-
-```
-
-The table below lists the possible scenarios when this connection attempt occurs and what will happen in light of each scenario:
-
-Scenario | What happens
-:--------|:------------
-No schema exists for the topic | The producer is created using the given schema. The schema is transmitted to the broker and stored (since no existing schema is "compatible" with the `SensorReading` schema). Any consumer created using the same schema/topic can consume messages from the `sensor-data` topic.
-A schema already exists; the producer connects using the same schema that's already stored | The schema is transmitted to the Pulsar broker. The broker determines that the schema is compatible. The broker attempts to store the schema in [BookKeeper](concepts-architecture-overview.md#persistent-storage) but then determines that it's already stored, so it's then used to tag produced messages.
-A schema already exists; the producer connects using a new schema that is compatible | The producer transmits the schema to the broker. The broker determines that the schema is compatible and stores the new schema as the current version (with a new version number).
-
-> Schemas are versioned in succession. Schema storage happens in the broker that handles the associated topic so that version assignments can be made. Once a version is assigned/fetched to/for a schema, all subsequent messages produced by that producer are tagged with the appropriate version.
-
-
-## Supported schema formats
-
-The following formats are supported by the Pulsar schema registry:
-
-* None. If no schema is specified for a topic, producers and consumers will handle raw bytes.
-* `String` (used for UTF-8-encoded strings)
-* [JSON](https://www.json.org/)
-* [Protobuf](https://developers.google.com/protocol-buffers/)
-* [Avro](https://avro.apache.org/)
-
-For usage instructions, see the documentation for your preferred client library:
-
-* [Java](client-libraries-java.md#schemas)
-
-> Support for other schema formats will be added in future releases of Pulsar.
-
-## Managing Schemas
-
-You can use Pulsar admin tools to manage schemas for topics.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-tiered-storage.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-tiered-storage.md
deleted file mode 100644
index 3a67f0949050e..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-tiered-storage.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-id: concepts-tiered-storage
-title: Tiered Storage
-sidebar_label: "Tiered Storage"
-original_id: concepts-tiered-storage
----
-
-Pulsar's segment oriented architecture allows for topic backlogs to grow very large, effectively without limit. However, this can become expensive over time.
-
-One way to alleviate this cost is to use Tiered Storage. With tiered storage, older messages in the backlog can be moved from bookkeeper to a cheaper storage mechanism, while still allowing clients to access the backlog as if nothing had changed. 
-
-![Tiered Storage](/assets/pulsar-tiered-storage.png)
-
-> Data written to bookkeeper is replicated to 3 physical machines by default. However, once a segment is sealed in bookkeeper is becomes immutable and can be copied to long term storage. Long term storage can achieve cost savings by using mechanisms such as [Reed-Solomon error correction](https://en.wikipedia.org/wiki/Reed%E2%80%93Solomon_error_correction) to require fewer physical copies of data.
-
-Pulsar currently supports S3 as a long term store. Offloading to S3 triggered via a Rest API or command line interface. The user passes in the amount of topic data they wish to retain on bookkeeper, and the broker will copy the backlog data to S3. The original data will then be deleted from bookkeeper after a configured delay (4 hours by default).
-
-> For a guide for setting up tiered storage, see the [Tiered storage cookbook](cookbooks-tiered-storage.md).
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-topic-compaction.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-topic-compaction.md
deleted file mode 100644
index 34b7ed7fbbd31..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-topic-compaction.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-id: concepts-topic-compaction
-title: Topic Compaction
-sidebar_label: "Topic Compaction"
-original_id: concepts-topic-compaction
----
-
-Pulsar was built with highly scalable [persistent storage](concepts-architecture-overview.md#persistent-storage) of message data as a primary objective. Pulsar topics enable you to persistently store as many unacknowledged messages as you need while preserving message ordering. By default, Pulsar stores *all* unacknowledged/unprocessed messages produced on a topic. Accumulating many unacknowledged messages on a topic is necessary for many Pulsar use cases but it can also be very time intensive for Pulsar consumers to "rewind" through the entire log of messages.
-
-> For a more practical guide to topic compaction, see the [Topic compaction cookbook](cookbooks-compaction.md).
-
-For some use cases consumers don't need a complete "image" of the topic log. They may only need a few values to construct a more "shallow" image of the log, perhaps even just the most recent value. For these kinds of use cases Pulsar offers **topic compaction**. When you run compaction on a topic, Pulsar goes through a topic's backlog and removes messages that are *obscured* by later messages, i.e. it goes through the topic on a per-key basis and leaves only the most recent message associated with that key.
-
-Pulsar's topic compaction feature:
-
-* Allows for faster "rewind" through topic logs
-* Applies only to [persistent topics](concepts-architecture-overview.md#persistent-storage)
-* Triggered automatically when the backlog reaches a certain size or can be triggered manually via the command line. See the [Topic compaction cookbook](cookbooks-compaction.md)
-* Is conceptually and operationally distinct from [retention and expiry](concepts-messaging.md#message-retention-and-expiry). Topic compaction *does*, however, respect retention. If retention has removed a message from the message backlog of a topic, the message will also not be readable from the compacted topic ledger.
-
-> #### Topic compaction example: the stock ticker
-> An example use case for a compacted Pulsar topic would be a stock ticker topic. On a stock ticker topic, each message bears a timestamped dollar value for stocks for purchase (with the message key holding the stock symbol, e.g. `AAPL` or `GOOG`). With a stock ticker you may care only about the most recent value(s) of the stock and have no interest in historical data (i.e. you don't need to construct a complete image of the topic's sequence of messages per key). Compaction would be highly beneficial in this case because it would keep consumers from needing to rewind through obscured messages.
-
-
-## How topic compaction works
-
-When topic compaction is triggered [via the CLI](cookbooks-compaction.md), Pulsar will iterate over the entire topic from beginning to end. For each key that it encounters the compaction routine will keep a record of the latest occurrence of that key.
-
-After that, the broker will create a new [BookKeeper ledger](concepts-architecture-overview.md#ledgers) and make a second iteration through each message on the topic. For each message, if the key matches the latest occurrence of that key, then the key's data payload, message ID, and metadata will be written to the newly created ledger. If the key doesn't match the latest then the message will be skipped and left alone. If any given message has an empty payload, it will be skipped and considered deleted (akin to the concept of [tombstones](https://en.wikipedia.org/wiki/Tombstone_(data_store)) in key-value databases). At the end of this second iteration through the topic, the newly created BookKeeper ledger is closed and two things are written to the topic's metadata: the ID of the BookKeeper ledger and the message ID of the last compacted message (this is known as the **compaction horizon** of the topic). Once this metadata is written compaction is complete.
-
-After the initial compaction operation, the Pulsar [broker](reference-terminology.md#broker) that owns the topic is notified whenever any future changes are made to the compaction horizon and compacted backlog. When such changes occur:
-
-* Clients (consumers and readers) that have read compacted enabled will attempt to read messages from a topic and either:
-  * Read from the topic like normal (if the message ID is greater than or equal to the compaction horizon) or
-  * Read beginning at the compaction horizon (if the message ID is lower than the compaction horizon)
-
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-compaction.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-compaction.md
deleted file mode 100644
index 58ee52a622eb7..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-compaction.md
+++ /dev/null
@@ -1,147 +0,0 @@
----
-id: cookbooks-compaction
-title: Topic compaction
-sidebar_label: "Topic compaction"
-original_id: cookbooks-compaction
----
-
-Pulsar's [topic compaction](concepts-topic-compaction.md#compaction) feature enables you to create **compacted** topics in which older, "obscured" entries are pruned from the topic, allowing for faster reads through the topic's history (which messages are deemed obscured/outdated/irrelevant will depend on your use case).
-
-To use compaction:
-
-* You need to give messages keys, as topic compaction in Pulsar takes place on a *per-key basis* (i.e. messages are compacted based on their key). For a stock ticker use case, the stock symbol---e.g. `AAPL` or `GOOG`---could serve as the key (more on this [below](#when)). Messages without keys will be left alone by the compaction process.
-* Compaction can be configured to run [automatically](#automatic), or you can manually [trigger](#trigger) compaction using the Pulsar administrative API.
-* Your consumers must be [configured](#config) to read from compacted topics ([Java consumers](#java), for example, have a `readCompacted` setting that must be set to `true`). If this configuration is not set, consumers will still be able to read from the non-compacted topic.
-
-
-> Compaction only works on messages that have keys (as in the stock ticker example the stock symbol serves as the key for each message). Keys can thus be thought of as the axis along which compaction is applied. Messages that don't have keys are simply ignored by compaction.
-
-## When should I use compacted topics? {#when}
-
-The classic example of a topic that could benefit from compaction would be a stock ticker topic through which consumers can access up-to-date values for specific stocks. Imagine a scenario in which messages carrying stock value data use the stock symbol as the key (`GOOG`, `AAPL`, `TWTR`, etc.). Compacting this topic would give consumers on the topic two options:
-
-* They can read from the "original," non-compacted topic in case they need access to "historical" values, i.e. the entirety of the topic's messages.
-* They can read from the compacted topic if they only want to see the most up-to-date messages.
-
-Thus, if you're using a Pulsar topic called `stock-values`, some consumers could have access to all messages in the topic (perhaps because they're performing some kind of number crunching of all values in the last hour) while the consumers used to power the real-time stock ticker only see the compacted topic (and thus aren't forced to process outdated messages). Which variant of the topic any given consumer pulls messages from is determined by the consumer's [configuration](#config).
-
-> One of the benefits of compaction in Pulsar is that you aren't forced to choose between compacted and non-compacted topics, as the compaction process leaves the original topic as-is and essentially adds an alternate topic. In other words, you can run compaction on a topic and consumers that need access to the non-compacted version of the topic will not be adversely affected.
-
-
-## Configuring compaction to run automatically {#automatic}
-
-Tenant administrators can configure a policy for compaction at the namespace level. The policy specifies how large the topic backlog can grow before compaction is triggered.
-
-For example, to trigger compaction when the backlog reaches 100MB:
-
-```bash
-
-$ bin/pulsar-admin namespaces set-compaction-threshold \
-  --threshold 100M my-tenant/my-namespace
-
-```
-
-Configuring the compaction threshold on a namespace will apply to all topics within that namespace.
-
-## Triggering compaction manually {#trigger}
-
-In order to run compaction on a topic, you need to use the [`topics compact`](reference-pulsar-admin.md#topics-compact) command for the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin topics compact \
-  persistent://my-tenant/my-namespace/my-topic
-
-```
-
-The `pulsar-admin` tool runs compaction via the Pulsar {@inject: rest:REST:/} API. To run compaction in its own dedicated process, i.e. *not* through the REST API, you can use the [`pulsar compact-topic`](reference-cli-tools.md#pulsar-compact-topic) command. Here's an example:
-
-```bash
-
-$ bin/pulsar compact-topic \
-  --topic persistent://my-tenant-namespace/my-topic
-
-```
-
-> Running compaction in its own process is recommended when you want to avoid interfering with the broker's performance. Broker performance should only be affected, however, when running compaction on topics with a large keyspace (i.e when there are many keys on the topic). The first phase of the compaction process keeps a copy of each key in the topic, which can create memory pressure as the number of keys grows. Using the `pulsar-admin topics compact` command to run compaction through the REST API should present no issues in the overwhelming majority of cases; using `pulsar compact-topic` should correspondingly be considered an edge case.
-
-The `pulsar compact-topic` command communicates with [ZooKeeper](https://zookeeper.apache.org) directly. In order to establish communication with ZooKeeper, though, the `pulsar` CLI tool will need to have a valid [broker configuration](reference-configuration.md#broker). You can either supply a proper configuration in `conf/broker.conf` or specify a non-default location for the configuration:
-
-```bash
-
-$ bin/pulsar compact-topic \
-  --broker-conf /path/to/broker.conf \
-  --topic persistent://my-tenant/my-namespace/my-topic
-
-# If the configuration is in conf/broker.conf
-$ bin/pulsar compact-topic \
-  --topic persistent://my-tenant/my-namespace/my-topic
-
-```
-
-#### When should I trigger compaction?
-
-How often you [trigger compaction](#trigger) will vary widely based on the use case. If you want a compacted topic to be extremely speedy on read, then you should run compaction fairly frequently.
-
-## Consumer configuration {#config}
-
-Pulsar consumers and readers need to be configured to read from compacted topics. The sections below show you how to enable compacted topic reads for Pulsar's language clients.
-
-
-> #### Java only
-> Currently, only [Java](#java) clients can consume messages from compacted topics.
-
-
-### Java
-
-In order to read from a compacted topic using a Java consumer, the `readCompacted` parameter must be set to `true`. Here's an example consumer for a compacted topic:
-
-```java
-
-Consumer compactedTopicConsumer = client.newConsumer()
-        .topic("some-compacted-topic")
-        .readCompacted(true)
-        .subscribe();
-
-```
-
-As mentioned above, topic compaction in Pulsar works on a *per-key basis*. That means that messages that you produce on compacted topics need to have keys (the content of the key will depend on your use case). Messages that don't have keys will be ignored by the compaction process. Here's an example Pulsar message with a key:
-
-```java
-
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageBuilder;
-
-Message msg = MessageBuilder.create()
-        .setContent(someByteArray)
-        .setKey("some-key")
-        .build();
-
-```
-
-The example below shows a message with a key being produced on a compacted Pulsar topic:
-
-```java
-
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageBuilder;
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-
-Producer compactedTopicProducer = client.newProducer()
-        .topic("some-compacted-topic")
-        .create();
-
-Message msg = MessageBuilder.create()
-        .setContent(someByteArray)
-        .setKey("some-key")
-        .build();
-
-compactedTopicProducer.send(msg);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-deduplication.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-deduplication.md
deleted file mode 100644
index eb2327dc9b2ac..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-deduplication.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-id: cookbooks-deduplication
-title: Message deduplication
-sidebar_label: "Message deduplication"
-original_id: cookbooks-deduplication
----
-
-**Message deduplication** is a feature of Pulsar that, when enabled, ensures that each message produced on Pulsar topics is persisted to disk *only once*, even if the message is produced more than once. Message deduplication essentially unburdens Pulsar applications of the responsibility of ensuring deduplication and instead handles it automatically on the server side.
-
-Using message deduplication in Pulsar involves making some [configuration changes](#configuration) to your Pulsar brokers as well as some minor changes to the behavior of Pulsar [clients](#clients).
-
-> For a more thorough theoretical explanation of message deduplication, see the [Concepts and Architecture](concepts-messaging.md#message-deduplication) document.
-
-
-## How it works
-
-Message deduplication can be enabled and disabled on a per-namespace basis. By default, it is *disabled* on all namespaces and can enabled in the following ways:
-
-* Using the [`pulsar-admin namespaces`](#enabling) interface
-* As a broker-level [default](#default) for all namespaces
-
-## Configuration for message deduplication
-
-You can configure message deduplication in Pulsar using the [`broker.conf`](reference-configuration.md#broker) configuration file. The following deduplication-related parameters are available:
-
-Parameter | Description | Default
-:---------|:------------|:-------
-`brokerDeduplicationEnabled` | Sets the default behavior for message deduplication in the Pulsar [broker](reference-terminology.md#broker). If set to `true`, message deduplication will be enabled by default on all namespaces; if set to `false` (the default), deduplication will have to be [enabled](#enabling) and [disabled](#disabling) on a per-namespace basis. | `false`
-`brokerDeduplicationMaxNumberOfProducers` | The maximum number of producers for which information will be stored for deduplication purposes. | `10000`
-`brokerDeduplicationEntriesInterval` | The number of entries after which a deduplication informational snapshot is taken. A larger interval will lead to fewer snapshots being taken, though this would also lengthen the topic recovery time (the time required for entries published after the snapshot to be replayed). | `1000`
-`brokerDeduplicationProducerInactivityTimeoutMinutes` | The time of inactivity (in minutes) after which the broker will discard deduplication information related to a disconnected producer. | `360` (6 hours)
-
-### Setting the broker-level default {#default}
-
-By default, message deduplication is *disabled* on all Pulsar namespaces. To enable it by default on all namespaces, set the `brokerDeduplicationEnabled` parameter to `true` and re-start the broker.
-
-Regardless of the value of `brokerDeduplicationEnabled`, [enabling](#enabling) and [disabling](#disabling) via the CLI will override the broker-level default.
-
-### Enabling message deduplication {#enabling}
-
-You can enable message deduplication on specific namespaces, regardless of the the [default](#default) for the broker, using the [`pulsar-admin namespace set-deduplication`](reference-pulsar-admin.md#namespace-set-deduplication) command. You can use the `--enable`/`-e` flag and specify the namespace. Here's an example with `/`:
-
-```bash
-
-$ bin/pulsar-admin namespaces set-deduplication \
-  public/default \
-  --enable # or just -e
-
-```
-
-### Disabling message deduplication {#disabling}
-
-You can disable message deduplication on a specific namespace using the same method shown [above](#enabling), except using the `--disable`/`-d` flag instead. Here's an example with `/`:
-
-```bash
-
-$ bin/pulsar-admin namespaces set-deduplication \
-  public/default \
-  --disable # or just -d
-
-```
-
-## Message deduplication and Pulsar clients {#clients}
-
-If you enable message deduplication in your Pulsar brokers, you won't need to make any major changes to your Pulsar clients. There are, however, two settings that you need to provide for your client producers:
-
-1. The producer must be given a name
-1. The message send timeout needs to be set to infinity (i.e. no timeout)
-
-Instructions for [Java](#java), [Python](#python), and [C++](#cpp) clients can be found below.
-
-### Java clients {#java}
-
-To enable message deduplication on a [Java producer](client-libraries-java.md#producers), set the producer name using the `producerName` setter and set the timeout to 0 using the `sendTimeout` setter. Here's an example:
-
-```java
-
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.PulsarClient;
-import java.util.concurrent.TimeUnit;
-
-PulsarClient pulsarClient = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-Producer producer = pulsarClient.newProducer()
-        .producerName("producer-1")
-        .topic("persistent://public/default/topic-1")
-        .sendTimeout(0, TimeUnit.SECONDS)
-        .create();
-
-```
-
-### Python clients {#python}
-
-To enable message deduplication on a [Python producer](client-libraries-python.md#producers), set the producer name using `producer_name` and the timeout to 0 using `send_timeout_millis`. Here's an example:
-
-```python
-
-import pulsar
-
-client = pulsar.Client("pulsar://localhost:6650")
-producer = client.create_producer(
-    "persistent://public/default/topic-1",
-    producer_name="producer-1",
-    send_timeout_millis=0)
-
-```
-
-### C++ clients {#cpp}
-
-To enable message deduplication on a [C++ producer](client-libraries-cpp.md#producer), set the producer name using `producer_name` and the timeout to 0 using `send_timeout_millis`. Here's an example:
-
-```cpp
-
-#include 
-
-std::string serviceUrl = "pulsar://localhost:6650";
-std::string topic = "persistent://some-tenant/ns1/topic-1";
-std::string producerName = "producer-1";
-
-Client client(serviceUrl);
-
-ProducerConfiguration producerConfig;
-producerConfig.setSendTimeout(0);
-producerConfig.setProducerName(producerName);
-
-Producer producer;
-
-Result result = client.createProducer(topic, producerConfig, producer);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-encryption.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-encryption.md
deleted file mode 100644
index f0d8fb8735eb6..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-encryption.md
+++ /dev/null
@@ -1,184 +0,0 @@
----
-id: cookbooks-encryption
-title: Pulsar Encryption
-sidebar_label: "Encryption"
-original_id: cookbooks-encryption
----
-
-Pulsar encryption allows applications to encrypt messages at the producer and decrypt at the consumer. Encryption is performed using the public/private key pair configured by the application. Encrypted messages can only be decrypted by consumers with a valid key.
-
-## Asymmetric and symmetric encryption
-
-Pulsar uses dynamically generated symmetric AES key to encrypt messages(data). The AES key(data key) is encrypted using application provided ECDSA/RSA key pair, as a result there is no need to share the secret with everyone.
-
-Key is a public/private key pair used for encryption/decryption. The producer key is the public key, and the consumer key is the private key of the key pair.
-
-The application configures the producer with the public  key. This key is used to encrypt the AES data key. The encrypted data key is sent as part of message header. Only entities with the private key(in this case the consumer) will be able to decrypt the data key which is used to decrypt the message.
-
-A message can be encrypted with more than one key.  Any one of the keys used for encrypting the message is sufficient to decrypt the message
-
-Pulsar does not store the encryption key anywhere in the pulsar service. If you lose/delete the private key, your message is irretrievably lost, and is unrecoverable
-
-## Producer
-![alt text](/assets/pulsar-encryption-producer.jpg "Pulsar Encryption Producer")
-
-## Consumer
-![alt text](/assets/pulsar-encryption-consumer.jpg "Pulsar Encryption Consumer")
-
-## Here are the steps to get started:
-
-1. Create your ECDSA or RSA public/private key pair.
-
-```shell
-
-openssl ecparam -name secp521r1 -genkey -param_enc explicit -out test_ecdsa_privkey.pem
-openssl ec -in test_ecdsa_privkey.pem -pubout -outform pkcs8 -out test_ecdsa_pubkey.pem
-
-```
-
-2. Add the public and private key to the key management and configure your producers to retrieve public keys and consumers clients to retrieve private keys.
-3. Implement CryptoKeyReader::getPublicKey() interface from producer and CryptoKeyReader::getPrivateKey() interface from consumer, which will be invoked by Pulsar client to load the key.
-4. Add encryption key to producer configuration: conf.addEncryptionKey("myapp.key")
-5. Add CryptoKeyReader implementation to producer/consumer config: conf.setCryptoKeyReader(keyReader)
-6. Sample producer application:
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-PulsarClient pulsarClient = PulsarClient.create("http://localhost:8080");
-
-ProducerConfiguration prodConf = new ProducerConfiguration();
-prodConf.setCryptoKeyReader(new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem"));
-prodConf.addEncryptionKey("myappkey");
-
-Producer producer = pulsarClient.createProducer("persistent://my-tenant/my-ns/my-topic", prodConf);
-
-for (int i = 0; i < 10; i++) {
-    producer.send("my-message".getBytes());
-}
-
-pulsarClient.close();
-
-```
-
-7. Sample Consumer Application:
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-
-ConsumerConfiguration consConf = new ConsumerConfiguration();
-consConf.setCryptoKeyReader(new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem"));
-PulsarClient pulsarClient = PulsarClient.create("http://localhost:8080");
-Consumer consumer = pulsarClient.subscribe("persistent://my-tenant//my-ns/my-topic", "my-subscriber-name", consConf);
-Message msg = null;
-
-for (int i = 0; i < 10; i++) {
-    msg = consumer.receive();
-    // do something
-    System.out.println("Received: " + new String(msg.getData()));
-}
-
-// Acknowledge the consumption of all messages at once
-consumer.acknowledgeCumulative(msg);
-pulsarClient.close();
-
-```
-
-## Key rotation
-Pulsar generates new AES data key every 4 hours or after a certain number of messages are published. The asymmetric public key is automatically fetched by producer every 4 hours by calling CryptoKeyReader::getPublicKey() to retrieve the latest version.
-
-## Enabling encryption at the producer application:
-If you produce messages that are consumed across application boundaries, you need to ensure that consumers in other applications have access to one of the private keys that can decrypt the messages.  This can be done in two ways:
-1. The consumer application provides you access to their public key, which you add to your producer keys
-1. You grant access to one of the private keys from the pairs used by producer 
-
-In some cases, the producer may want to encrypt the messages with multiple keys. For this, add all such keys to the config. Consumer will be able to decrypt the message, as long as it has access to at least one of the keys.
-
-E.g: If messages needs to be encrypted using 2 keys myapp.messagekey1 and myapp.messagekey2,
-
-```java
-
-conf.addEncryptionKey("myapp.messagekey1");
-conf.addEncryptionKey("myapp.messagekey2");
-
-```
-
-## Decrypting encrypted messages at the consumer application:
-Consumers require access one of the private keys to decrypt messages produced by the producer. If you would like to receive encrypted messages, create a public/private key and give your public key to the producer application to encrypt messages using your public key.
-
-## Handling Failures:
-* Producer/ Consumer loses access to the key
-  * Producer action will fail indicating the cause of the failure. Application has the option to proceed with sending unencrypted message in such cases. Call conf.setCryptoFailureAction(ProducerCryptoFailureAction) to control the producer behavior. The default behavior is to fail the request.
-  * If consumption failed due to decryption failure or missing keys in consumer, application has the option to consume the encrypted message or discard it. Call conf.setCryptoFailureAction(ConsumerCryptoFailureAction) to control the consumer behavior. The default behavior is to fail the request.
-Application will never be able to decrypt the messages if the private key is permanently lost.
-* Batch messaging
-  * If decryption fails and the message contain batch messages, client will not be able to retrieve individual messages in the batch, hence message consumption fails even if conf.setCryptoFailureAction() is set to CONSUME.
-* If decryption fails, the message consumption stops and application will notice backlog growth in addition to decryption failure messages in the client log. If application does not have access to the private key to decrypt the message, the only option is to skip/discard backlogged messages. 
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-message-queue.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-message-queue.md
deleted file mode 100644
index 6897dd9b00bcf..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-message-queue.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-id: cookbooks-message-queue
-title: Using Pulsar as a message queue
-sidebar_label: "Message queue"
-original_id: cookbooks-message-queue
----
-
-Message queues are essential components of many large-scale data architectures. If every single work object that passes through your system absolutely *must* be processed in spite of the slowness or downright failure of this or that system component, there's a good chance that you'll need a message queue to step in and ensure that unprocessed data is retained---with correct ordering---until the required actions are taken.
-
-Pulsar is a great choice for a message queue because:
-
-* it was built with [persistent message storage](concepts-architecture-overview.md#persistent-storage) in mind
-* it offers automatic load balancing across [consumers](reference-terminology.md#consumer) for messages on a topic (or custom load balancing if you wish)
-
-> You can use the same Pulsar installation to act as a real-time message bus and as a message queue if you wish (or just one or the other). You can set aside some topics for real-time purposes and other topics for message queue purposes (or use specific namespaces for either purpose if you wish).
-
-
-# Client configuration changes
-
-To use a Pulsar [topic](reference-terminology.md#topic) as a message queue, you should distribute the receiver load on that topic across several consumers (the optimal number of consumers will depend on the load). Each consumer must:
-
-* Establish a [shared subscription](concepts-messaging.md#shared) and use the same subscription name as the other consumers (otherwise the subscription is not shared and the consumers can't act as a processing ensemble)
-* If you'd like to have tight control over message dispatching across consumers, set the consumers' **receiver queue** size very low (potentially even to 0 if necessary). Each Pulsar [consumer](reference-terminology.md#consumer) has a receiver queue that determines how many messages the consumer will attempt to fetch at a time. A receiver queue of 1000 (the default), for example, means that the consumer will attempt to process 1000 messages from the topic's backlog upon connection. Setting the receiver queue to zero essentially means ensuring that each consumer is only doing one thing at a time.
-
-   The downside to restricting the receiver queue size of consumers is that that limits the potential throughput of those consumers and cannot be used with [partitioned topics](reference-terminology.md#partitioned-topic). Whether the performance/control trade-off is worthwhile will depend on your use case.
-
-## Java clients
-
-Here's an example Java consumer configuration that uses a shared subscription:
-
-```java
-
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.SubscriptionType;
-
-String SERVICE_URL = "pulsar://localhost:6650";
-String TOPIC = "persistent://public/default/mq-topic-1";
-String subscription = "sub-1";
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl(SERVICE_URL)
-        .build();
-
-Consumer consumer = client.newConsumer()
-        .topic(TOPIC)
-        .subscriptionName(subscription)
-        .subscriptionType(SubscriptionType.Shared)
-        // If you'd like to restrict the receiver queue size
-        .receiverQueueSize(10)
-        .subscribe();
-
-```
-
-## Python clients
-
-Here's an example Python consumer configuration that uses a shared subscription:
-
-```python
-
-from pulsar import Client, ConsumerType
-
-SERVICE_URL = "pulsar://localhost:6650"
-TOPIC = "persistent://public/default/mq-topic-1"
-SUBSCRIPTION = "sub-1"
-
-client = Client(SERVICE_URL)
-consumer = client.subscribe(
-    TOPIC,
-    SUBSCRIPTION,
-    # If you'd like to restrict the receiver queue size
-    receiver_queue_size=10,
-    consumer_type=ConsumerType.Shared)
-
-```
-
-## C++ clients
-
-Here's an example C++ consumer configuration that uses a shared subscription:
-
-```cpp
-
-#include 
-
-std::string serviceUrl = "pulsar://localhost:6650";
-std::string topic = "persistent://public/defaultmq-topic-1";
-std::string subscription = "sub-1";
-
-Client client(serviceUrl);
-
-ConsumerConfiguration consumerConfig;
-consumerConfig.setConsumerType(ConsumerType.ConsumerShared);
-// If you'd like to restrict the receiver queue size
-consumerConfig.setReceiverQueueSize(10);
-
-Consumer consumer;
-
-Result result = client.subscribe(topic, subscription, consumerConfig, consumer);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-non-persistent.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-non-persistent.md
deleted file mode 100644
index f831119681634..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-non-persistent.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-id: cookbooks-non-persistent
-title: Non-persistent messaging
-sidebar_label: "Non-persistent messaging"
-original_id: cookbooks-non-persistent
----
-
-**Non-persistent topics** are Pulsar topics in which message data is *never* [persistently stored](concepts-architecture-overview.md#persistent-storage) and kept only in memory. This cookbook provides:
-
-* A basic [conceptual overview](#overview) of non-persistent topics
-* Information about [configurable parameters](#configuration) related to non-persistent topics
-* A guide to the [CLI interface](#cli) for managing non-persistent topics
-
-## Overview
-
-By default, Pulsar persistently stores *all* unacknowledged messages on multiple [BookKeeper](#persistent-storage) bookies (storage nodes). Data for messages on persistent topics can thus survive broker restarts and subscriber failover.
-
-Pulsar also, however, supports **non-persistent topics**, which are topics on which messages are *never* persisted to disk and live only in memory. When using non-persistent delivery, killing a Pulsar [broker](reference-terminology.md#broker) or disconnecting a subscriber to a topic means that all in-transit messages are lost on that (non-persistent) topic, meaning that clients may see message loss.
-
-Non-persistent topics have names of this form (note the `non-persistent` in the name):
-
-```http
-
-non-persistent://tenant/namespace/topic
-
-```
-
-> For more high-level information about non-persistent topics, see the [Concepts and Architecture](concepts-messaging.md#non-persistent-topics) documentation.
-
-## Using
-
-> In order to use non-persistent topics, they must be [enabled](#enabling) in your Pulsar broker configuration.
-
-In order to use non-persistent topics, you only need to differentiate them by name when interacting with them. This [`pulsar-client produce`](reference-cli-tools.md#pulsar-client-produce) command, for example, would produce one message on a non-persistent topic in a standalone cluster:
-
-```bash
-
-$ bin/pulsar-client produce non-persistent://public/default/example-np-topic \
-  --num-produce 1 \
-  --messages "This message will be stored only in memory"
-
-```
-
-> For a more thorough guide to non-persistent topics from an administrative perspective, see the [Non-persistent topics](admin-api-non-persistent-topics.md) guide.
-
-## Enabling
-
-In order to enable non-persistent topics in a Pulsar broker, the [`enableNonPersistentTopics`](reference-configuration.md#broker-enableNonPersistentTopics) must be set to `true`. This is the default, and so you won't need to take any action to enable non-persistent messaging.
-
-
-> #### Configuration for standalone mode
-> If you're running Pulsar in standalone mode, the same configurable parameters are available but in the [`standalone.conf`](reference-configuration.md#standalone) configuration file. 
-
-If you'd like to enable *only* non-persistent topics in a broker, you can set the [`enablePersistentTopics`](reference-configuration.md#broker-enablePersistentTopics) parameter to `false` and the `enableNonPersistentTopics` parameter to `true`.
-
-## Managing with cli
-
-Non-persistent topics can be managed using the [`pulsar-admin non-persistent`](reference-pulsar-admin.md#non-persistent) command-line interface. With that interface you can perform actions like [create a partitioned non-persistent topic](reference-pulsar-admin.md#non-persistent-create-partitioned-topic), get [stats](reference-pulsar-admin.md#non-persistent-stats) for a non-persistent topic, [list](reference-pulsar-admin.md) non-persistent topics under a namespace, and more.
-
-## Using with Pulsar clients
-
-You shouldn't need to make any changes to your Pulsar clients to use non-persistent messaging beyond making sure that you use proper [topic names](#using) with `non-persistent` as the topic type.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-partitioned.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-partitioned.md
deleted file mode 100644
index b033d54790442..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-partitioned.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-id: cookbooks-partitioned
-title: Non-persistent messaging
-sidebar_label: "Partitioned Topics"
-original_id: cookbooks-partitioned
----
-
-By default, Pulsar topics are served by a single broker. Using only a single broker, however, limits a topic's maximum throughput. *Partitioned topics* are a special type of topic that can span multiple brokers and thus allow for much higher throughput. For an explanation of how partitioned topics work, see the [Partitioned Topics](concepts-messaging.md#partitioned-topics) concepts.
-
-You can [publish](#publishing-to-partitioned-topics) to partitioned topics using Pulsar's client libraries and you can [create and manage](#managing-partitioned-topics) partitioned topics using Pulsar's [admin API](admin-api-overview.md).
-
-## Publishing to partitioned topics
-
-When publishing to partitioned topics, the only difference from non-partitioned topics is that you need to specify a [routing mode](concepts-messaging.md#routing-modes) when you create a new [producer](reference-terminology.md#producer). Examples for [Java](#java) are below.
-
-### Java
-
-Publishing messages to partitioned topics in the Java client works much like [publishing to normal topics](client-libraries-java.md#using-producers). The difference is that you need to specify either one of the currently available message routers or a custom router.
-
-#### Routing mode
-
-You can specify the routing mode in the ProducerConfiguration object that you use to configure your producer. You have three options:
-
-* `SinglePartition`
-* `RoundRobinPartition`
-* `CustomPartition`
-
-Here's an example:
-
-```java
-
-String pulsarBrokerRootUrl = "pulsar://localhost:6650";
-String topic = "persistent://my-tenant/my-namespace/my-topic";
-
-PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(pulsarBrokerRootUrl).build();
-Producer producer = pulsarClient.newProducer()
-        .topic(topic)
-        .messageRoutingMode(MessageRoutingMode.SinglePartition)
-        .create();
-producer.send("Partitioned topic message".getBytes());
-
-```
-
-#### Custom message router
-
-To use a custom message router, you need to provide an implementation of the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface, which has just one `choosePartition` method:
-
-```java
-
-public interface MessageRouter extends Serializable {
-    int choosePartition(Message msg);
-}
-
-```
-
-Here's a (not very useful!) router that routes every message to partition 10:
-
-```java
-
-public class AlwaysTenRouter implements MessageRouter {
-    public int choosePartition(Message msg) {
-        return 10;
-    }
-}
-
-```
-
-With that implementation in hand, you can send
-
-```java
-
-String pulsarBrokerRootUrl = "pulsar://localhost:6650";
-String topic = "persistent://my-tenant/my-cluster-my-namespace/my-topic";
-
-PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(pulsarBrokerRootUrl).build();
-Producer producer = pulsarClient.newProducer()
-        .topic(topic)
-        .messageRouter(new AlwaysTenRouter())
-        .create();
-producer.send("Partitioned topic message".getBytes());
-
-```
-
-## Managing partitioned topics
-
-You can use Pulsar's [admin API](admin-api-overview.md) to create and manage [partitioned topics](admin-api-partitioned-topics.md).
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-retention-expiry.md b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-retention-expiry.md
deleted file mode 100644
index ea2fd385e2e64..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-retention-expiry.md
+++ /dev/null
@@ -1,317 +0,0 @@
----
-id: cookbooks-retention-expiry
-title: Message retention and expiry
-sidebar_label: "Message retention and expiry"
-original_id: cookbooks-retention-expiry
----
-
-Pulsar brokers are responsible for handling messages that pass through Pulsar, including [persistent storage](concepts-architecture-overview.md#persistent-storage) of messages. By default, brokers:
-
-* immediately delete all messages that have been acknowledged on every subscription, and
-* persistently store all unacknowledged messages in a [backlog](#backlog-quotas).
-
-In Pulsar, you can override both of these default behaviors, at the namespace level, in two ways:
-
-* You can persistently store messages that have already been consumed and acknowledged for a minimum time by setting [retention policies](#retention-policies).
-* Messages that are not acknowledged within a specified timeframe, can be automatically marked as consumed, by specifying the [time to live](#time-to-live-ttl) (TTL).
-
-Pulsar's [admin interface](admin-api-overview.md) enables you to manage both retention policies and TTL at the namespace level (and thus within a specific tenant and either on a specific cluster or in the [`global`](concepts-architecture-overview.md#global-cluster) cluster).
-
-
-> #### Retention and TTL are solving two different problems
-> * Message retention: Keep the data for at least X hours (even if acknowledged)
-> * Time-to-live: Discard data after some time (by automatically acknowledging)
->
-> In most cases, applications will want to use either one or the other (or none). 
-
-
-## Retention policies
-
-By default, when a Pulsar message arrives at a broker it will be stored until it has been acknowledged by a consumer, at which point it will be deleted. You can override this behavior and retain even messages that have already been acknowledged by setting a *retention policy* on all the topics in a given namespace. When you set a retention policy you can set either a *size limit* or a *time limit*.
-
-When you set a size limit of, say, 10 gigabytes, then messages in all topics in the namespace, *even acknowledged messages*, will be retained until the size limit for the topic is reached; if you set a time limit of, say, 1 day, then messages for all topics in the namespace will be retained for 24 hours.
-
-It is also possible to set *infinite* retention time or size, by setting `-1` for either time or
-size retention.
-
-### Defaults
-
-There are two configuration parameters that you can use to set [instance](reference-terminology.md#instance)-wide defaults for message retention: [`defaultRetentionTimeInMinutes=0`](reference-configuration.md#broker-defaultRetentionTimeInMinutes) and [`defaultRetentionSizeInMB=0`](reference-configuration.md#broker-defaultRetentionSizeInMB).
-
-Both of these parameters are in the [`broker.conf`](reference-configuration.md#broker) configuration file.
-
-### Set retention policy
-
-You can set a retention policy for a namespace by specifying the namespace as well as both a size limit *and* a time limit.
-
-#### pulsar-admin
-
-Use the [`set-retention`](reference-pulsar-admin.md#namespaces-set-retention) subcommand and specify a namespace, a size limit using the `-s`/`--size` flag, and a time limit using the `-t`/`--time` flag.
-
-##### Examples
-
-To set a size limit of 10 gigabytes and a time limit of 3 hours for the `my-tenant/my-ns` namespace:
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size 10G \
-  --time 3h
-
-```
-
-To set retention with infinite time and a size limit:
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size 1T \
-  --time -1
-
-```
-
-Similarly, even the size can be to unlimited:
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size -1 \
-  --time -1
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention}
-
-#### Java
-
-```java
-
-int retentionTime = 10; // 10 minutes
-int retentionSize = 500; // 500 megabytes
-RetentionPolicies policies = new RetentionPolicies(retentionTime, retentionSize);
-admin.namespaces().setRetention(namespace, policies);
-
-```
-
-### Get retention policy
-
-You can fetch the retention policy for a namespace by specifying the namespace. The output will be a JSON object with two keys: `retentionTimeInMinutes` and `retentionSizeInMB`.
-
-#### pulsar-admin
-
-Use the [`get-retention`](reference-pulsar-admin.md#namespaces) subcommand and specify the namespace.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces get-retention my-tenant/my-ns
-{
-  "retentionTimeInMinutes": 10,
-  "retentionSizeInMB": 0
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention}
-
-#### Java
-
-```java
-
-admin.namespaces().getRetention(namespace);
-
-```
-
-## Backlog quotas
-
-*Backlogs* are sets of unacknowledged messages for a topic that have been stored by bookies. Pulsar stores all unacknowledged messages in backlogs until they are processed and acknowledged.
-
-You can control the allowable size of backlogs, at the namespace level, using *backlog quotas*. Setting a backlog quota involves setting:
-
-* an allowable *size threshold* for each topic in the namespace
-* a *retention policy* that determines which action the [broker](reference-terminology.md#broker) takes if the threshold is exceeded.
-
-The following retention policies are available:
-
-Policy | Action
-:------|:------
-`producer_request_hold` | The broker will hold and not persist produce request payload
-`producer_exception` | The broker will disconnect from the client by throwing an exception
-`consumer_backlog_eviction` | The broker will begin discarding backlog messages
-
-
-> #### Beware the distinction between retention policy types
-> As you may have noticed, there are two definitions of the term "retention policy" in Pulsar, one that applies to persistent storage of already-acknowledged messages and one that applies to backlogs.
-
-
-Backlog quotas are handled at the namespace level. They can be managed via:
-
-### Set size thresholds and backlog retention policies
-
-You can set a size threshold and backlog retention policy for all of the topics in a [namespace](reference-terminology.md#namespace) by specifying the namespace, a size limit, and a policy by name.
-
-#### pulsar-admin
-
-Use the [`set-backlog-quota`](reference-pulsar-admin.md#namespaces) subcommand and specify a namespace, a size limit using the `-l`/`--limit` flag, and a retention policy using the `-p`/`--policy` flag.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns \
-  --limit 2G \
-  --policy producer_request_hold
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/getBacklogQuotaMap}
-
-#### Java
-
-```java
-
-long sizeLimit = 2147483648L;
-BacklogQuota.RetentionPolicy policy = BacklogQuota.RetentionPolicy.producer_request_hold;
-BacklogQuota quota = new BacklogQuota(sizeLimit, policy);
-admin.namespaces().setBacklogQuota(namespace, quota);
-
-```
-
-### Get backlog threshold and backlog retention policy
-
-You can see which size threshold and backlog retention policy has been applied to a namespace.
-
-#### pulsar-admin
-
-Use the [`get-backlog-quotas`](reference-pulsar-admin.md#pulsar-admin-namespaces-get-backlog-quotas) subcommand and specify a namespace. Here's an example:
-
-```shell
-
-$ pulsar-admin namespaces get-backlog-quotas my-tenant/my-ns
-{
-  "destination_storage": {
-    "limit" : 2147483648,
-    "policy" : "producer_request_hold"
-  }
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap}
-
-#### Java
-
-```java
-
-Map quotas =
-  admin.namespaces().getBacklogQuotas(namespace);
-
-```
-
-### Remove backlog quotas
-
-#### pulsar-admin
-
-Use the [`remove-backlog-quota`](reference-pulsar-admin.md#pulsar-admin-namespaces-remove-backlog-quota) subcommand and specify a namespace. Here's an example:
-
-```shell
-
-$ pulsar-admin namespaces remove-backlog-quota my-tenant/my-ns
-
-```
-
-#### REST API
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota}
-
-#### Java
-
-```java
-
-admin.namespaces().removeBacklogQuota(namespace);
-
-```
-
-### Clear backlog
-
-#### pulsar-admin
-
-Use the [`clear-backlog`](reference-pulsar-admin.md#pulsar-admin-namespaces-clear-backlog) subcommand.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces clear-backlog my-tenant/my-ns
-
-```
-
-By default, you will be prompted to ensure that you really want to clear the backlog for the namespace. You can override the prompt using the `-f`/`--force` flag.
-
-## Time to live (TTL)
-
-By default, Pulsar stores all unacknowledged messages forever. This can lead to heavy disk space usage in cases where a lot of messages are going unacknowledged. If disk space is a concern, you can set a time to live (TTL) that determines how long unacknowledged messages will be retained.
-
-### Set the TTL for a namespace
-
-#### pulsar-admin
-
-Use the [`set-message-ttl`](reference-pulsar-admin.md#pulsar-admin-namespaces-set-message-ttl) subcommand and specify a namespace and a TTL (in seconds) using the `-ttl`/`--messageTTL` flag.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces set-message-ttl my-tenant/my-ns \
-  --messageTTL 120 # TTL of 2 minutes
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL}
-
-#### Java
-
-```java
-
-admin.namespaces().setNamespaceMessageTTL(namespace, ttlInSeconds);
-
-```
-
-### Get the TTL configuration for a namespace
-
-#### pulsar-admin
-
-Use the [`get-message-ttl`](reference-pulsar-admin.md#pulsar-admin-namespaces-get-message-ttl) subcommand and specify a namespace.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces get-message-ttl my-tenant/my-ns
-60
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL}
-
-#### Java
-
-```java
-
-admin.namespaces().get
-
-```
-
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
deleted file mode 100644
index 328b7c6d64ee3..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-tiered-storage.md
+++ /dev/null
@@ -1,154 +0,0 @@
----
-id: cookbooks-tiered-storage
-title: Tiered Storage
-sidebar_label: "Tiered Storage"
-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.
-
-## When should I use Tiered Storage?
-
-Tiered storage should be used when you have a topic for which you want to keep a very long backlog for a long time. For example, if you have a topic containing user actions which you use to train your recommendation systems, you may want to keep that data for a long time, so that if you change your recommendation algorithm you can rerun it against your full user history.
-
-## The offloading mechanism
-
-A topic in Pulsar is backed by a log, known as a managed ledger. This log is composed of an ordered list of segments. Pulsar only every writes to the final segment of the log. All previous segments are sealed. The data within the segment is immutable. This is known as a segment oriented architecture.
-
-![Tiered storage](/assets/pulsar-tiered-storage.png "Tiered Storage")
-
-The Tiered Storage offloading mechanism takes advantage of this segment oriented architecture. When offloading is requested, the segments of the log are copied, one-by-one, to tiered storage. All segments of the log, apart from the segment currently being written to can be offloaded.
-
-## Amazon S3
-
-Tiered storage currently supports S3 for long term storage. On the broker, the administrator must configure a S3 bucket and the AWS region where the bucket exists. Offloaded data will be placed into this bucket.
-
-The configured S3 bucket must exist before attempting to offload. If it does not exist, the offload operation will fail.
-
-Pulsar users multipart objects to update the segment data. It is possible that a broker could crash while uploading the data. We recommend you add a lifecycle rule your S3 bucket to expire incomplete multipart upload after a day or two to avoid getting charged for incomplete uploads.
-
-### Configuring the broker
-
-Offloading is configured in ```broker.conf```. 
-
-At a minimum, the user must configure the driver, the region and the bucket.
-
-```conf
-
-managedLedgerOffloadDriver=S3
-s3ManagedLedgerOffloadRegion=eu-west-3
-s3ManagedLedgerOffloadBucket=pulsar-topic-offload
-
-```
-
-It is also possible to specify the s3 endpoint directly, using `s3ManagedLedgerOffloadServiceEndpoint`. This is useful if you are using a non-AWS storage service which provides an S3 compatible API. 
-
-> If the endpoint is specified directly, then the region must _not_ be set.
-
-> The broker.conf of all brokers must have the same configuration for driver, region and bucket for offload to avoid data becoming unavailable as topics move from one broker to another.
-
-Pulsar also provides some knobs to configure the size of requests sent to S3.
-
-- `s3ManagedLedgerOffloadMaxBlockSizeInBytes` configures the maximum size of a "part" sent during a multipart upload. This cannot be smaller than 5MB. Default is 64MB.
-- `s3ManagedLedgerOffloadReadBufferSizeInBytes` configures the block size for each individual read when reading back data from S3. Default is 1MB.
-
-In both cases, these should not be touched unless you know what you are doing.
-
-> The broker must be rebooted for any changes in the configuration to take effect.
-
-### Authenticating with S3
-
-To be able to access S3, you need to authenticate with S3. Pulsar does not provide any direct means of configuring authentication for S3, but relies on the mechanisms supported by the [DefaultAWSCredentialsProviderChain](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html).
-
-Once you have created a set of credentials in the AWS IAM console, they can be configured in a number of ways.
-
-1. Set the environment variables **AWS_ACCESS_KEY_ID** and **AWS_SECRET_ACCESS_KEY** in ```conf/pulsar_env.sh```.
-
-```bash
-
-export AWS_ACCESS_KEY_ID=ABC123456789
-export AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-
-```
-
-> \"export\" is important so that the variables are made available in the environment of spawned processes.
-
-
-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.maxCapacityPerThread=4096"
-
-```
-
-3. Set the access credentials in ```~/.aws/credentials```.
-
-```conf
-
-[default]
-aws_access_key_id=ABC123456789
-aws_secret_access_key=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-
-```
-
-If you are running in EC2 you can also use instance profile credentials, provided through the EC2 metadata service, but that is out of scope for this cookbook.
-
-> The broker must be rebooted for credentials specified in pulsar_env to take effect.
-
-## Configuring offload to run automatically
-
-Namespace policies can be configured to offload data automatically once a threshold is reached. The threshold is based on the size of data that the topic has stored on the pulsar cluster. Once the topic reaches the threshold, an offload operation will be triggered. Setting a negative value to the threshold will disable automatic offloading. Setting the threshold to 0 will cause the broker to offload data as soon as it possiby can.
-
-```bash
-
-$ bin/pulsar-admin namespaces set-offload-threshold --size 10M my-tenant/my-namespace
-
-```
-
-> Automatic offload runs when a new segment is added to a topic log. If you set the threshold on a namespace, but few messages are being produced to the topic, offload will not until the current segment is full.
-
-
-## Triggering offload manually
-
-Offloading can manually triggered through a REST endpoint on the Pulsar broker. We provide a CLI which will call this rest endpoint for you.
-
-When triggering offload, you must specify the maximum size, in bytes, of backlog which will be retained locally on the bookkeeper. The offload mechanism will offload segments from the start of the topic backlog until this condition is met.
-
-```bash
-
-$ bin/pulsar-admin topics offload --size-threshold 10M my-tenant/my-namespace/topic1
-Offload triggered for persistent://my-tenant/my-namespace/topic1 for messages before 2:0:-1
-
-```
-
-The command to triggers an offload will not wait until the offload operation has completed. To check the status of the offload, use offload-status.
-
-```bash
-
-$ bin/pulsar-admin topics offload-status my-tenant/my-namespace/topic1
-Offload is currently running
-
-```
-
-To wait for offload to complete, add the -w flag.
-
-```bash
-
-$ bin/pulsar-admin topics offload-status -w my-tenant/my-namespace/topic1
-Offload was a success
-
-```
-
-If there is an error offloading, the error will be propagated to the offload-status command.
-
-```bash
-
-$ bin/pulsar-admin topics offload-status persistent://public/default/topic1                                                                                                       
-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/oBEepeNlhrtsDlzoOhocuYMpKihQGXe6EG8puRGOkK6UwqzVrMXTWBxxHcS+g=
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-aws.md b/site2/website/versioned_docs/version-2.1.0-incubating/deploy-aws.md
deleted file mode 100644
index 488a8de28048b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-aws.md
+++ /dev/null
@@ -1,271 +0,0 @@
----
-id: deploy-aws
-title: Deploying a Pulsar cluster on AWS using Terraform and Ansible
-sidebar_label: "Amazon Web Services"
-original_id: deploy-aws
----
-
-> For instructions on deploying a single Pulsar cluster manually rather than using Terraform and Ansible, see [Deploying a Pulsar cluster on bare metal](deploy-bare-metal.md). For instructions on manually deploying a multi-cluster Pulsar instance, see [Deploying a Pulsar instance on bare metal](deploy-bare-metal-multi-cluster.md).
-
-One of the easiest ways to get a Pulsar [cluster](reference-terminology.md#cluster) running on [Amazon Web Services](https://aws.amazon.com/) (AWS) is to use the the [Terraform](https://terraform.io) infrastructure provisioning tool and the [Ansible](https://www.ansible.com) server automation tool. Terraform can create the resources necessary to run the Pulsar cluster---[EC2](https://aws.amazon.com/ec2/) instances, networking and security infrastructure, etc.---while Ansible can install and run Pulsar on the provisioned resources.
-
-## Requirements and setup
-
-In order install a Pulsar cluster on AWS using Terraform and Ansible, you'll need:
-
-* An [AWS account](https://aws.amazon.com/account/) and the [`aws`](https://aws.amazon.com/cli/) command-line tool
-* Python and [pip](https://pip.pypa.io/en/stable/)
-* The [`terraform-inventory`](https://github.com/adammck/terraform-inventory) tool, which enables Ansible to use Terraform artifacts
-
-You'll also need to make sure that you're currently logged into your AWS account via the `aws` tool:
-
-```bash
-
-$ aws configure
-
-```
-
-## Installation
-
-You can install Ansible on Linux or macOS using pip.
-
-```bash
-
-$ pip install ansible
-
-```
-
-You can install Terraform using the instructions [here](https://learn.hashicorp.com/tutorials/terraform/install-cli).
-
-You'll also need to have the Terraform and Ansible configurations for Pulsar locally on your machine. They're contained in Pulsar's [GitHub repository](https://github.com/apache/incubator-pulsar), which you can fetch using Git:
-
-```bash
-
-$ git clone https://github.com/apache/incubator-pulsar
-$ cd incubator-pulsar/deployment/terraform-ansible/aws
-
-```
-
-## SSH setup
-
-> If you already have an SSH key and would like to use it, you skip generating the SSH keys and update `private_key_file` setting
-> in `ansible.cfg` file and `public_key_path` setting in `terraform.tfvars` file.
->
-> For example, if you already had a private SSH key in `~/.ssh/pulsar_aws` and a public key in `~/.ssh/pulsar_aws.pub`,
-> you can do followings:
->
-> 1. update `ansible.cfg` with following values:
->
-
-> ```shell
-> 
-> private_key_file=~/.ssh/pulsar_aws
->
-> 
-> ```
-
->
-> 2. update `terraform.tfvars` with following values:
->
-
-> ```shell
-> 
-> public_key_path=~/.ssh/pulsar_aws.pub
->
-> 
-> ```
-
-
-In order to create the necessary AWS resources using Terraform, you'll need to create an SSH key. To create a private SSH key in `~/.ssh/id_rsa` and a public key in `~/.ssh/id_rsa.pub`:
-
-```bash
-
-$ ssh-keygen -t rsa
-
-```
-
-Do *not* enter a passphrase (hit **Enter** when prompted instead). To verify that a key has been created:
-
-```bash
-
-$ ls ~/.ssh
-id_rsa               id_rsa.pub
-
-```
-
-## Creating AWS resources using Terraform
-
-To get started building AWS resources with Terraform, you'll need to install all Terraform dependencies:
-
-```bash
-
-$ terraform init
-# This will create a .terraform folder
-
-```
-
-Once you've done that, you can apply the default Terraform configuration:
-
-```bash
-
-$ terraform apply
-
-```
-
-You should then see this prompt:
-
-```bash
-
-Do you want to perform these actions?
-  Terraform will perform the actions described above.
-  Only 'yes' will be accepted to approve.
-
-  Enter a value:
-
-```
-
-Type `yes` and hit **Enter**. Applying the configuration could take several minutes. When it's finished, you should see `Apply complete!` along with some other information, including the number of resources created.
-
-### Applying a non-default configuration
-
-You can apply a non-default Terraform configuration by changing the values in the `terraform.tfvars` file. The following variables are available:
-
-Variable name | Description | Default
-:-------------|:------------|:-------
-`public_key_path` | The path of the public key that you've generated. | `~/.ssh/id_rsa.pub`
-`region` | The AWS region in which the Pulsar cluster will run | `us-west-2`
-`availability_zone` | The AWS availability zone in which the Pulsar cluster will run | `us-west-2a`
-`aws_ami` | The [Amazon Machine Image](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html) (AMI) that will be used by the cluster | `ami-9fa343e7`
-`num_zookeeper_nodes` | The number of [ZooKeeper](https://zookeeper.apache.org) nodes in the ZooKeeper cluster | 3
-`num_bookie_nodes` | The number of bookies that will run in the cluster | 3
-`num_broker_nodes` | The number of Pulsar brokers that will run in the cluster | 2
-`num_proxy_nodes` | The number of Pulsar proxies that will run in the cluster | 1
-`base_cidr_block` | The root [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) that will be used by network assets for the cluster | `10.0.0.0/16`
-`instance_types` | The EC2 instance types to be used. This variable is a map with two keys: `zookeeper` for the ZooKeeper instances, `bookie` for the BookKeeper bookies and `broker` and `proxy` for Pulsar brokers and bookies | `t2.small` (ZooKeeper), `i3.xlarge` (BookKeeper) and `c5.2xlarge` (Brokers/Proxies)
-
-### What is installed
-
-When you run the Ansible playbook, the following AWS resources will be used:
-
-* 9 total [Elastic Compute Cloud](https://aws.amazon.com/ec2) (EC2) instances running the [ami-9fa343e7](https://access.redhat.com/articles/3135091) Amazon Machine Image (AMI), which runs [Red Hat Enterprise Linux (RHEL) 7.4](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/7.4_release_notes/index). By default, that includes:
-  * 3 small VMs for ZooKeeper ([t2.small](https://www.ec2instances.info/?selected=t2.small) instances)
-  * 3 larger VMs for BookKeeper [bookies](reference-terminology.md#bookie) ([i3.xlarge](https://www.ec2instances.info/?selected=i3.xlarge) instances)
-  * 2 larger VMs for Pulsar [brokers](reference-terminology.md#broker) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
-  * 1 larger VMs for Pulsar [proxy](reference-terminology.md#proxy) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
-* An EC2 [security group](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html)
-* A [virtual private cloud](https://aws.amazon.com/vpc/) (VPC) for security
-* An [API Gateway](https://aws.amazon.com/api-gateway/) for connections from the outside world
-* A [route table](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Route_Tables.html) for the Pulsar cluster's VPC
-* A [subnet](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Subnets.html) for the VPC
-
-All EC2 instances for the cluster will run in the [us-west-2](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html) region.
-
-### Fetching your Pulsar connection URL
-
-When you apply the Terraform configuration by running `terraform apply`, Terraform will output a value for the `pulsar_service_url`. It should look something like this:
-
-```
-
-pulsar://pulsar-elb-1800761694.us-west-2.elb.amazonaws.com:6650
-
-```
-
-You can fetch that value at any time by running `terraform output pulsar_service_url` or parsing the `terraform.tstate` file (which is JSON, even though the filename doesn't reflect that):
-
-```bash
-
-$ cat terraform.tfstate | jq .modules[0].outputs.pulsar_service_url.value
-
-```
-
-### Destroying your cluster
-
-At any point, you can destroy all AWS resources associated with your cluster using Terraform's `destroy` command:
-
-```bash
-
-$ terraform destroy
-
-```
-
-## Setup Disks
-
-Before you run the Pulsar playbook, you want to mount the disks to the correct directories on those bookie nodes.
-Since different type of machines would have different disk layout, if you change the `instance_types` in your terraform
-config, you need to update the task defined in `setup-disk.yaml` file.
-
-To setup disks on bookie nodes, use this command:
-
-```bash
-
-$ ansible-playbook \
-  --user='ec2-user' \
-  --inventory=`which terraform-inventory` \
-  setup-disk.yaml
-
-```
-
-After running this command, the disks will be mounted under `/mnt/journal` as journal disk, and `/mnt/storage` as ledger disk.
-It is important to run this command only once! If you attempt to run this command again after you have run Pulsar playbook,
-it might be potentially erase your disks again and cause the bookies to fail to start up.
-
-## Running the Pulsar playbook
-
-Once you've created the necessary AWS resources using Terraform, you can install and run Pulsar on the Terraform-created EC2 instances using Ansible. To do so, use this command:
-
-```bash
-
-$ ansible-playbook \
-  --user='ec2-user' \
-  --inventory=`which terraform-inventory` \
-  ../deploy-pulsar.yaml
-
-```
-
-If you've created a private SSH key at a location different from `~/.ssh/id_rsa`, you can specify the different location using the `--private-key` flag:
-
-```bash
-
-$ ansible-playbook \
-  --user='ec2-user' \
-  --inventory=`which terraform-inventory` \
-  --private-key="~/.ssh/some-non-default-key" \
-  ../deploy-pulsar.yaml
-
-```
-
-## Accessing the cluster
-
-You can now access your running Pulsar using the unique Pulsar connection URL for your cluster, which you can obtain using the instructions [above](#fetching-your-pulsar-connection-url).
-
-For a quick demonstration of accessing the cluster, we can use the Python client for Pulsar and the Python shell. First, install the Pulsar Python module using pip:
-
-```bash
-
-$ pip install pulsar-client
-
-```
-
-Now, open up the Python shell using the `python` command:
-
-```bash
-
-$ python
-
-```
-
-Once in the shell, run the following:
-
-```python
-
->>> import pulsar
->>> client = pulsar.Client('pulsar://pulsar-elb-1800761694.us-west-2.elb.amazonaws.com:6650')
-# Make sure to use your connection URL
->>> producer = client.create_producer('persistent://public/default/test-topic')
->>> producer.send('Hello world')
->>> client.close()
-
-```
-
-If all of these commands are successful, your cluster can now be used by Pulsar clients!
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-bare-metal-multi-cluster.md b/site2/website/versioned_docs/version-2.1.0-incubating/deploy-bare-metal-multi-cluster.md
deleted file mode 100644
index 407f04deba583..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-bare-metal-multi-cluster.md
+++ /dev/null
@@ -1,459 +0,0 @@
----
-id: deploy-bare-metal-multi-cluster
-title: Deploying a multi-cluster on bare metal
-sidebar_label: "Bare metal multi-cluster"
-original_id: deploy-bare-metal-multi-cluster
----
-
-:::tip
-
-1. Single-cluster Pulsar installations should be sufficient for all but the most ambitious use cases. If you're interested in experimenting with
-Pulsar or using it in a startup or on a single team, we recommend opting for a single cluster. For instructions on deploying a single cluster,
-see the guide [here](deploy-bare-metal.md).
-2. If you want to use all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
-package and make sure it is installed under `connectors` directory in the pulsar directory on every broker node or on every function-worker node if you
-have run a separate cluster of function workers for [Pulsar Functions](functions-overview.md).
-
-:::
-
-A Pulsar *instance* consists of multiple Pulsar clusters working in unison. Clusters can be distributed across data centers or geographical regions and can replicate amongst themselves using [geo-replication](administration-geo.md). Deploying a multi-cluster Pulsar instance involves the following basic steps:
-
-* Deploying two separate [ZooKeeper](#deploying-zookeeper) quorums: a [local](#deploying-local-zookeeper) quorum for each cluster in the instance and a [configuration store](#configuration-store) quorum for instance-wide tasks
-* Initializing [cluster metadata](#cluster-metadata-initialization) for each cluster
-* Deploying a [BookKeeper cluster](#deploying-bookkeeper) of bookies in each Pulsar cluster
-* Deploying [brokers](#deploying-brokers) in each Pulsar cluster
-
-If you're deploying a single Pulsar cluster, see the [Clusters and Brokers](getting-started-standalone.md#starting-the-cluster) guide.
-
-> #### Running Pulsar locally or on Kubernetes?
-> This guide shows you how to deploy Pulsar in production in a non-Kubernetes. If you'd like to run a standalone Pulsar cluster on a single machine for development purposes, see the [Setting up a local cluster](getting-started-standalone.md) guide. If you're looking to run Pulsar on [Kubernetes](https://kubernetes.io), see the [Pulsar on Kubernetes](deploy-kubernetes.md) guide, which includes sections on running Pulsar on Kubernetes on [Google Kubernetes Engine](deploy-kubernetes#pulsar-on-google-kubernetes-engine) and on [Amazon Web Services](deploy-kubernetes#pulsar-on-amazon-web-services).
-
-## System requirement
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-## Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-@pulsar:version@/apache-pulsar-@pulsar:version@-bin.tar.gz' -O apache-pulsar-@pulsar:version@-bin.tar.gz
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-## What your package contains
-
-The Pulsar binary package initially contains the following directories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's [command-line tools](reference-cli-tools.md), such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar
-`licenses` | License files, in `.txt` form, for various components of the Pulsar codebase
-
-These directories will be created once you begin running Pulsar:
-
-Directory | Contains
-:---------|:--------
-`data` | The data storage directory used by ZooKeeper and BookKeeper
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
-`logs` | Logs created by the installation
-
-
-## Deploying ZooKeeper
-
-Each Pulsar instance relies on two separate ZooKeeper quorums.
-
-* [Local ZooKeeper](#deploying-local-zookeeper) operates at the cluster level and provides cluster-specific configuration management and coordination. Each Pulsar cluster needs to have a dedicated ZooKeeper cluster.
-* [Configuration Store](#deploying-configuration-store) operates at the instance level and provides configuration management for the entire system (and thus across clusters). The configuration store quorum can be provided by an independent cluster of machines or by the same machines used by local ZooKeeper.
-
-### Deploying local ZooKeeper
-
-ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.
-
-Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster *per Pulsar cluster*. 
-
-To begin, add all ZooKeeper servers to the quorum configuration specified in the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. Add a `server.N` line for each node in the cluster to the configuration, where `N` is the number of the ZooKeeper node. Here's an example for a three-node cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-On each host, you need to specify the ID of the node in each node's `myid` file, which is in each server's `data/zookeeper` folder by default (this can be changed via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
-
-> See the [Multi-server setup guide](https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup) in the ZooKeeper documentation for detailed info on `myid` and more.
-
-On a ZooKeeper server at `zk1.us-west.example.com`, for example, you could set the `myid` value like this:
-
-```shell
-
-$ mkdir -p data/zookeeper
-$ echo 1 > data/zookeeper/myid
-
-```
-
-On `zk2.us-west.example.com` the command would be `echo 2 > data/zookeeper/myid` and so on.
-
-Once each server has been added to the `zookeeper.conf` configuration and has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```shell
-
-$ bin/pulsar-daemon start zookeeper
-
-```
-
-### Deploying the configuration store 
-
-The ZooKeeper cluster configured and started up in the section above is a *local* ZooKeeper cluster used to manage a single Pulsar cluster. In addition to a local cluster, however, a full Pulsar instance also requires a configuration store for handling some instance-level configuration and coordination tasks.
-
-If you're deploying a [single-cluster](#single-cluster-pulsar-instance) instance, then you will not need a separate cluster for the configuration store. If, however, you're deploying a [multi-cluster](#multi-cluster-pulsar-instance) instance, then you should stand up a separate ZooKeeper cluster for configuration tasks.
-
-#### Single-cluster Pulsar instance
-
-If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.
-
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorum to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). Here's an example that uses port 2184 for a three-node ZooKeeper cluster:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-
-```
-
-As before, create the `myid` files for each server on `data/global-zookeeper/myid`.
-
-#### Multi-cluster Pulsar instance
-
-When deploying a global Pulsar instance, with clusters distributed across different geographical regions, the configuration store serves as a highly available and strongly consistent metadata store that can tolerate failures and partitions spanning whole regions.
-
-The key here is to make sure the ZK quorum members are spread across at least 3
-regions and that other regions are running as observers.
-
-Again, given the very low expected load on the configuration store servers, we can
-share the same hosts used for the local ZooKeeper quorum.
-
-For example, let's assume a Pulsar instance with the following clusters `us-west`,
-`us-east`, `us-central`, `eu-central`, `ap-south`. Also let's assume, each cluster
-will have its own local ZK servers named such as
-
-```
-
-zk[1-3].${CLUSTER}.example.com
-
-```
-
-In this scenario we want to pick the quorum participants from few clusters and
-let all the others be ZK observers. For example, to form a 7 servers quorum, we
-can pick 3 servers from `us-west`, 2 from `us-central` and 2 from `us-east`.
-
-This will guarantee that writes to configuration store will be possible even if one
-of these regions is unreachable.
-
-The ZK configuration in all the servers will look like:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-server.4=zk1.us-central.example.com:2185:2186
-server.5=zk2.us-central.example.com:2185:2186
-server.6=zk3.us-central.example.com:2185:2186:observer
-server.7=zk1.us-east.example.com:2185:2186
-server.8=zk2.us-east.example.com:2185:2186
-server.9=zk3.us-east.example.com:2185:2186:observer
-server.10=zk1.eu-central.example.com:2185:2186:observer
-server.11=zk2.eu-central.example.com:2185:2186:observer
-server.12=zk3.eu-central.example.com:2185:2186:observer
-server.13=zk1.ap-south.example.com:2185:2186:observer
-server.14=zk2.ap-south.example.com:2185:2186:observer
-server.15=zk3.ap-south.example.com:2185:2186:observer
-
-```
-
-Additionally, ZK observers will need to have:
-
-```properties
-
-peerType=observer
-
-```
-
-##### Starting the service
-
-Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
-
-```shell
-
-$ bin/pulsar-daemon start configuration-store
-
-```
-
-## Cluster metadata initialization
-
-Once you've set up the cluster-specific ZooKeeper and configuration store quorums for your instance, there is some metadata that needs to be written to ZooKeeper for each cluster in your instance. **It only needs to be written once**.
-
-You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. Here's an example:
-
-```shell
-
-$ bin/pulsar initialize-cluster-metadata \
-  --cluster us-west \
-  --zookeeper zk1.us-west.example.com:2181 \
-  --configuration-store zk1.us-west.example.com:2184 \
-  --web-service-url http://pulsar.us-west.example.com:8080/ \
-  --web-service-url-tls https://pulsar.us-west.example.com:8443/ \
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650/ \
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651/
-
-```
-
-As you can see from the example above, the following needs to be specified:
-
-* The name of the cluster
-* The local ZooKeeper 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
-
-If you're using [TLS](security-tls-transport.md), you'll also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster.
-
-Make sure to run `initialize-cluster-metadata` for each cluster in your instance.
-
-## Deploying BookKeeper
-
-BookKeeper provides [persistent message storage](concepts-architecture-overview.md#persistent-storage) for Pulsar.
-
-Each Pulsar broker needs to have its own cluster of bookies. The BookKeeper cluster shares a local ZooKeeper quorum with the Pulsar cluster.
-
-### Configuring bookies
-
-BookKeeper bookies can be configured using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. The most important aspect of configuring each bookie is ensuring that the [`zkServers`](reference-configuration.md#bookkeeper-zkServers) parameter is set to the connection string for the Pulsar cluster's local ZooKeeper.
-
-### Starting up bookies
-
-You can start up a bookie in two ways: in the foreground or as a background daemon.
-
-To start up a bookie in the foreground, use the [`bookkeeper`](reference-cli-tools.md#bookkeeper)
-
-```shell
-
-$ bin/pulsar-daemon start bookie
-
-```
-
-You can verify that the bookie is working properly using the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
-
-```shell
-
-$ bin/bookkeeper shell bookiesanity
-
-```
-
-This will create a new ledger on the local bookie, write a few entries, read them back and finally delete the ledger.
-
-### Hardware considerations
-
-Bookie hosts are responsible for storing message data on disk. In order for bookies to provide optimal performance, it's essential that they have a suitable hardware configuration. There are two key dimensions to bookie hardware capacity:
-
-* Disk I/O capacity read/write
-* Storage capacity
-
-Message entries written to bookies are always synced to disk before returning an acknowledgement to the Pulsar broker. To ensure low write latency, BookKeeper is
-designed to use multiple devices:
-
-* A **journal** to ensure durability. For sequential writes, it's critical to have fast [fsync](https://linux.die.net/man/2/fsync) operations on bookie hosts. Typically, small and fast [solid-state drives](https://en.wikipedia.org/wiki/Solid-state_drive) (SSDs) should suffice, or [hard disk drives](https://en.wikipedia.org/wiki/Hard_disk_drive) (HDDs) with a [RAID](https://en.wikipedia.org/wiki/RAID)s controller and a battery-backed write cache. Both solutions can reach fsync latency of ~0.4 ms.
-* A **ledger storage device** is where data is stored until all consumers have acknowledged the message. Writes will happen in the background, so write I/O is not a big concern. Reads will happen sequentially most of the time and the backlog is drained only in case of consumer drain. To store large amounts of data, a typical configuration will involve multiple HDDs with a RAID controller.
-
-
-
-## Deploying brokers
-
-Once you've set up ZooKeeper, initialized cluster metadata, and spun up BookKeeper bookies, you can deploy brokers.
-
-### Broker configuration
-
-Brokers can be configured using the [`conf/broker.conf`](reference-configuration.md#broker) configuration file.
-
-The most important element of broker configuration is ensuring that each broker is aware of its local ZooKeeper quorum as well as the configuration store quorum. Make sure that you set the [`zookeeperServers`](reference-configuration.md#broker-zookeeperServers) parameter to reflect the local quorum and the [`configurationStoreServers`](reference-configuration.md#broker-configurationStoreServers) parameter to reflect the configuration store quorum (although you'll need to specify only those ZooKeeper servers located in the same cluster).
-
-You also need to specify the name of the [cluster](reference-terminology.md#cluster) to which the broker belongs using the [`clusterName`](reference-configuration.md#broker-clusterName) parameter.
-
-Here's an example configuration:
-
-```properties
-
-# Local ZooKeeper servers
-zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-# Configuration store quorum connection string.
-configurationStoreServers=zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184
-
-clusterName=us-west
-
-```
-
-### Broker hardware
-
-Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps [NIC](https://en.wikipedia.org/wiki/Network_interface_controller) are recommended since the software can take full advantage of that.
-
-### Starting the broker service
-
-You can start a broker in the background using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```shell
-
-$ bin/pulsar-daemon start broker
-
-```
-
-You can also start brokers in the foreground using [`pulsar broker`](reference-cli-tools.md#pulsar-broker):
-
-```shell
-
-$ bin/pulsar broker
-
-```
-
-## Service discovery
-
-[Clients](getting-started-clients.md) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL. Pulsar provides a built-in service discovery mechanism that you can set up using the instructions [immediately below](#service-discovery-setup).
-
-You can also use your own service discovery system if you'd like. If you use your own system, there is just one requirement: when a client performs an HTTP request to an [endpoint](reference-configuration.md) for a Pulsar cluster, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to *some* active broker in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
-
-> #### Service discovery already provided by many scheduling systems
-> Many large-scale deployment systems, such as [Kubernetes](deploy-kubernetes.md), have service discovery systems built in. If you're running Pulsar on such a system, you may not need to provide your own service discovery mechanism.
-
-
-### Service discovery setup
-
-The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's [binary protocol](developing-binary-protocol.md).
-
-To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the [`conf/discovery.conf`](reference-configuration.md#service-discovery) configuration file. Set the [`zookeeperServers`](reference-configuration.md#service-discovery-zookeeperServers) parameter to the cluster's ZooKeeper quorum connection string and the [`configurationStoreServers`](reference-configuration.md#service-discovery-configurationStoreServers) setting to the [configuration
-store](reference-terminology.md#configuration-store) quorum connection string.
-
-```properties
-
-# Zookeeper quorum connection string
-zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-# Global configuration store connection string
-configurationStoreServers=zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184
-
-```
-
-To start the discovery service:
-
-```shell
-
-$ bin/pulsar-daemon start discovery
-
-```
-
-## Admin client and verification
-
-At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as [administrative clients](admin-api-overview.md) for each cluster. You can use the [`conf/client.conf`](reference-configuration.md#client) configuration file to configure admin clients.
-
-The most important thing is that you point the [`serviceUrl`](reference-configuration.md#client-serviceUrl) parameter to the correct service URL for the cluster:
-
-```properties
-
-serviceUrl=http://pulsar.us-west.example.com:8080/
-
-```
-
-## Provisioning new tenants
-
-Pulsar was built as a fundamentally multi-tenant system.
-
-To allow a new tenant to use the system, we need to create a new one. You can create a new tenant using the [`pulsar-admin`](reference-pulsar-admin.md#tenants-create) CLI tool:
-
-```shell
-
-$ bin/pulsar-admin tenants create test-tenant \
-  --allowed-clusters us-west \
-  --admin-roles test-admin-role
-
-```
-
-This will allow users who identify with role `test-admin-role` to administer the configuration for the tenant `test` which will only be allowed to use the cluster `us-west`. From now on, this tenant will be able to self-manage its resources.
-
-Once a tenant has been created, you will need to create [namespaces](reference-terminology.md#namespace) for topics within that tenant.
-
-The first step is to create a namespace. A namespace is an administrative unit that can contain many topics. A common practice is to create a namespace for each different use case from a single tenant.
-
-```shell
-
-$ bin/pulsar-admin namespaces create test-tenant/ns1
-
-```
-
-##### Testing producer and consumer
-
-Everything is now ready to send and receive messages. The quickest way to test
-the system is through the `pulsar-perf` client tool.
-
-Let's use a topic in the namespace we just created. Topics are automatically
-created the first time a producer or a consumer tries to use them.
-
-The topic name in this case could be:
-
-```http
-
-persistent://test-tenant/ns1/my-topic
-
-```
-
-Start a consumer that will create a subscription on the topic and will wait
-for messages:
-
-```shell
-
-$ bin/pulsar-perf consume persistent://test-tenant/us-west/ns1/my-topic
-
-```
-
-Start a producer that publishes messages at a fixed rate and report stats every
-10 seconds:
-
-```shell
-
-$ bin/pulsar-perf produce persistent://test-tenant/us-west/ns1/my-topic
-
-```
-
-To report the topic stats:
-
-```shell
-
-$ bin/pulsar-admin persistent stats persistent://test-tenant/us-west/ns1/my-topic
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-bare-metal.md b/site2/website/versioned_docs/version-2.1.0-incubating/deploy-bare-metal.md
deleted file mode 100644
index 7bc83e0176958..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-bare-metal.md
+++ /dev/null
@@ -1,399 +0,0 @@
----
-id: deploy-bare-metal
-title: Deploying a cluster on bare metal
-sidebar_label: "Bare metal"
-original_id: deploy-bare-metal
----
-
-:::tip
-
-1. Single-cluster Pulsar installations should be sufficient for all but the most ambitious use cases. If you're interested in experimenting with
-Pulsar or using it in a startup or on a single team, we recommend opting for a single cluster. If you do need to run a multi-cluster Pulsar instance,
-however, see the guide [here](deploy-bare-metal-multi-cluster.md).
-2. If you want to use all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
-package and make sure it is installed under `connectors` directory in the pulsar directory on every broker node or on every function-worker node if you
-have run a separate cluster of function workers for [Pulsar Functions](functions-overview.md).
-
-:::
-
-Deploying a Pulsar cluster involves doing the following (in order):
-
-* Deploying a [ZooKeeper](#deploying-a-zookeeper-cluster) cluster (optional)
-* Initializing [cluster metadata](#initializing-cluster-metadata)
-* Deploying a [BookKeeper](#deploying-a-bookkeeper-cluster) cluster
-* Deploying one or more Pulsar [brokers](#deploying-pulsar-brokers)
-
-## Preparation
-
-### Requirements
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-> If you already have an existing ZooKeeper cluster and would like to reuse it, you don't need to prepare the machines
-> for running ZooKeeper.
-
-To run Pulsar on bare metal, you will need:
-
-* At least 6 Linux machines or VMs
-  * 3 running [ZooKeeper](https://zookeeper.apache.org)
-  * 3 running a Pulsar broker, and a [BookKeeper](https://bookkeeper.apache.org) bookie
-* A single [DNS](https://en.wikipedia.org/wiki/Domain_Name_System) name covering all of the Pulsar broker hosts
-
-Each machine in your cluster will need to have [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or higher installed.
-
-Here's a diagram showing the basic setup:
-
-![alt-text](/assets/pulsar-basic-setup.png)
-
-In this diagram, connecting clients need to be able to communicate with the Pulsar cluster using a single URL, in this case `pulsar-cluster.acme.com`, that abstracts over all of the message-handling brokers. Pulsar message brokers run on machines alongside BookKeeper bookies; brokers and bookies, in turn, rely on ZooKeeper.
-
-### Hardware considerations
-
-When deploying a Pulsar cluster, we have some basic recommendations that you should keep in mind when capacity planning.
-
-#### ZooKeeper
-
-For machines running ZooKeeper, we recommend using lighter-weight machines or VMs. Pulsar uses ZooKeeper only for periodic coordination- and configuration-related tasks, *not* for basic operations. If you're running Pulsar on [Amazon Web Services](https://aws.amazon.com/) (AWS), for example, a [t2.small](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/t2-instances.html) instance would likely suffice.
-
-#### Bookies & Brokers
-
-For machines running a bookie and a Pulsar broker, we recommend using more powerful machines. For an AWS deployment, for example, [i3.4xlarge](https://aws.amazon.com/blogs/aws/now-available-i3-instances-for-demanding-io-intensive-applications/) instances may be appropriate. On those machines we also recommend:
-
-* Fast CPUs and 10Gbps [NIC](https://en.wikipedia.org/wiki/Network_interface_controller) (for Pulsar brokers)
-* Small and fast [solid-state drives](https://en.wikipedia.org/wiki/Solid-state_drive) (SSDs) or [hard disk drives](https://en.wikipedia.org/wiki/Hard_disk_drive) (HDDs) with a [RAID](https://en.wikipedia.org/wiki/RAID) controller and a battery-backed write cache (for BookKeeper bookies)
-
-## Installing the Pulsar binary package
-
-> You'll need to install the Pulsar binary package on *each machine in the cluster*, including machines running [ZooKeeper](#deploying-a-zookeeper-cluster) and [BookKeeper](#deploying-a-bookkeeper-cluster).
-
-To get started deploying a Pulsar cluster on bare metal, you'll need to download a binary tarball release in one of the following ways:
-
-* By clicking on the link directly below, which will automatically trigger a download:
-  * Pulsar @pulsar:version@ binary release
-* From the Pulsar [downloads page](pulsar:download_page_url)
-* From the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest) on [GitHub](https://github.com)
-* Using [wget](https://www.gnu.org/software/wget):
-
-```bash
-
-$ wget pulsar:binary_release_url
-
-```
-
-Once you've downloaded the tarball, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvzf apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-The untarred directory contains the following subdirectories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's [command-line tools](reference-cli-tools.md), such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`data` | The data storage directory used by ZooKeeper and BookKeeper.
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar.
-`logs` | Logs created by the installation.
-
-## Installing Builtin Connectors (optional)
-
-> Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-> If you would like to enable those `builtin` connectors, you can follow the instructions as below; otherwise you can
-> skip this section for now.
-
-To get started using builtin connectors, you'll need to download the connectors tarball release on every broker node in
-one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ mv apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-## Deploying a ZooKeeper cluster
-
-> If you already have an existing zookeeper cluster and would like to use it, you can skip this section.
-
-[ZooKeeper](https://zookeeper.apache.org) manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.
-
-To begin, add all ZooKeeper servers to the configuration specified in [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) (in the Pulsar directory you created [above](#installing-the-pulsar-binary-package)). Here's an example:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-On each host, you need to specify the ID of the node in each node's `myid` file, which is in each server's `data/zookeeper` folder by default (this can be changed via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
-
-> See the [Multi-server setup guide](https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup) in the ZooKeeper documentation for detailed info on `myid` and more.
-
-On a ZooKeeper server at `zk1.us-west.example.com`, for example, you could set the `myid` value like this:
-
-```bash
-
-$ mkdir -p data/zookeeper
-$ echo 1 > data/zookeeper/myid
-
-```
-
-On `zk2.us-west.example.com` the command would be `echo 2 > data/zookeeper/myid` and so on.
-
-Once each server has been added to the `zookeeper.conf` configuration and has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start zookeeper
-
-```
-
-## Initializing cluster metadata
-
-Once you've deployed ZooKeeper for your cluster, there is some metadata that needs to be written to ZooKeeper for each cluster in your instance. It only needs to be written **once**.
-
-You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. This command can be run on any machine in your ZooKeeper cluster. Here's an example:
-
-```shell
-
-$ bin/pulsar initialize-cluster-metadata \
-  --cluster pulsar-cluster-1 \
-  --zookeeper zk1.us-west.example.com:2181 \
-  --configuration-store zk1.us-west.example.com:2181 \
-  --web-service-url http://pulsar.us-west.example.com:8080 \
-  --web-service-url-tls https://pulsar.us-west.example.com:8443 \
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650 \
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-As you can see from the example above, the following needs to be specified:
-
-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.
-`--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 (we don't recommend using a different port).
-`--web-service-url-tls` | If you're using [TLS](security-tls-transport.md), you'll also need to specify a TLS web service URL for the cluster. The default port is 8443 (we don't recommend using a different port).
-`--broker-service-url` | A broker service URL enabling interaction with the brokers in the cluster. This URL should use the same DNS name as the web service URL but should use the `pulsar` scheme instead. The default port is 6650 (we don't recommend using a different port).
-`--broker-service-url-tls` | If you're using [TLS](security-tls-transport.md), you'll also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster. The default port is 6651 (we don't recommend using a different port).
-
-## Deploying a BookKeeper cluster
-
-[BookKeeper](https://bookkeeper.apache.org) handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a **3-bookie BookKeeper cluster**.
-
-BookKeeper bookies can be configured using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. The most important step in configuring bookies for our purposes here is ensuring that the [`zkServers`](reference-configuration.md#bookkeeper-zkServers) is set to the connection string for the ZooKeeper cluster. Here's an example:
-
-```properties
-
-zkServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-```
-
-Once you've appropriately modified the `zkServers` parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters [here](reference-configuration.md#bookkeeper), although we would recommend consulting the [BookKeeper documentation](http://bookkeeper.apache.org/docs/latest/reference/config/) for a more in-depth guide.
-
-Once you've applied the desired configuration in `conf/bookkeeper.conf`, you can start up a bookie on each of your BookKeeper hosts. You can start up each bookie either in the background, using [nohup](https://en.wikipedia.org/wiki/Nohup), or in the foreground.
-
-To start the bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start bookie
-
-```
-
-To start the bookie in the foreground:
-
-```bash
-
-$ bin/bookkeeper bookie
-
-```
-
-You can verify that a bookie is working properly by running the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#shell) on it:
-
-```bash
-
-$ bin/bookkeeper shell bookiesanity
-
-```
-
-This will create an ephemeral BookKeeper ledger on the local bookie, write a few entries, read them back, and finally delete the ledger.
-
-After you have started all the bookies, you can use `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to
-verify all the bookies in the cluster are up running.
-
-```bash
-
-$ bin/bookkeeper shell simpletest --ensemble  --writeQuorum  --ackQuorum  --numEntries 
-
-```
-
-This command will create a `num-bookies` sized ledger on the cluster, write a few entries, and finally delete the ledger.
-
-
-## Deploying Pulsar brokers
-
-Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running **3 brokers**, one for each machine that's already running a BookKeeper bookie.
-
-### Configuring Brokers
-
-The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the [`zookeeperServers`](reference-configuration.md#broker-zookeeperServers) and [`configurationStoreServers`](reference-configuration.md#broker-configurationStoreServers) parameters. In this case, since we only have 1 cluster and no configuration store setup, the `configurationStoreServers` will point to the same `zookeeperServers`.
-
-```properties
-
-zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-configurationStoreServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-```
-
-You also need to specify the cluster name (matching the name that you provided when [initializing the cluster's metadata](#initializing-cluster-metadata):
-
-```properties
-
-clusterName=pulsar-cluster-1
-
-```
-
-### Enabling Pulsar Functions (optional)
-
-If you want to enable [Pulsar Functions](functions-overview.md), you can follow the instructions as below:
-
-1. Edit `conf/broker.conf` to enable function worker, by setting `functionsWorkerEnabled` to `true`.
-
-   ```conf
-   
-   functionsWorkerEnabled=true
-   
-   ```
-
-2. Edit `conf/functions_worker.yml` and set `pulsarFunctionsCluster` to the cluster name that you provided when [initializing the cluster's metadata](#initializing-cluster-metadata). 
-
-   ```conf
-   
-   pulsarFunctionsCluster: pulsar-cluster-1
-   
-   ```
-
-### Starting Brokers
-
-You can then provide any other configuration changes that you'd like in the [`conf/broker.conf`](reference-configuration.md#broker) file. Once you've decided on a configuration, you can start up the brokers for your Pulsar cluster. Like ZooKeeper and BookKeeper, brokers can be started either in the foreground or in the background, using nohup.
-
-You can start a broker in the foreground using the [`pulsar broker`](reference-cli-tools.md#pulsar-broker) command:
-
-```bash
-
-$ bin/pulsar broker
-
-```
-
-You can start a broker in the background using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start broker
-
-```
-
-Once you've successfully started up all the brokers you intend to use, your Pulsar cluster should be ready to go!
-
-## Connecting to the running cluster
-
-Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool, which is included with the Pulsar binary package. The `pulsar-client` tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is running properly.
-
-To use the `pulsar-client` tool, first modify the client configuration file in [`conf/client.conf`](reference-configuration.md#client) in your binary package. You'll need to change the values for `webServiceUrl` and `brokerServiceUrl`, substituting `localhost` (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:
-
-```properties
-
-webServiceUrl=http://us-west.example.com:8080/
-brokerServiceurl=pulsar://us-west.example.com:6650/
-
-```
-
-Once you've done that, you can publish a message to Pulsar topic:
-
-```bash
-
-$ bin/pulsar-client produce \
-  persistent://public/default/test \
-  -n 1 \
-  -m "Hello, Pulsar"
-
-```
-
-> You may need to use a different cluster name in the topic if you specified a cluster name different from `pulsar-cluster-1`.
-
-This will publish a single message to the Pulsar topic.
-
-## Running Functions
-
-> If you have [enabled](#enabling-pulsar-functions-optional) Pulsar Functions, you can also tryout pulsar functions now.
-
-Create a ExclamationFunction `exclamation`.
-
-```bash
-
-bin/pulsar-admin functions create \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-Check if the function is running as expected by [triggering](functions-deploying.md#triggering-pulsar-functions) the function.
-
-```bash
-
-bin/pulsar-admin functions trigger --name exclamation --triggerValue "hello world"
-
-```
-
-You will see output as below:
-
-```shell
-
-hello world!
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-dcos.md b/site2/website/versioned_docs/version-2.1.0-incubating/deploy-dcos.md
deleted file mode 100644
index 79919a525c3a7..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-dcos.md
+++ /dev/null
@@ -1,200 +0,0 @@
----
-id: deploy-dcos
-title: Deploying Pulsar on DC/OS
-sidebar_label: "DC/OS"
-original_id: deploy-dcos
----
-
-:::tip
-
-If you want to enable all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you can choose to use `apachepulsar/pulsar-all` image instead of
-`apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
-
-:::
-
-[DC/OS](https://dcos.io/) (the DataCenter Operating System) is a distributed operating system used for deploying and managing applications and systems on [Apache Mesos](http://mesos.apache.org/). DC/OS is an open-source tool created and maintained by [Mesosphere](https://mesosphere.com/).
-
-Apache Pulsar is available as a [Marathon Application Group](https://mesosphere.github.io/marathon/docs/application-groups.html), which runs multiple applications as manageable sets.
-
-## Prerequisites
-
-In order to run Pulsar on DC/OS, you will need the following:
-
-* DC/OS version [1.9](https://docs.mesosphere.com/1.9/) or higher
-* A [DC/OS cluster](https://docs.mesosphere.com/1.9/installing/) with at least three agent nodes
-* The [DC/OS CLI tool](https://docs.mesosphere.com/1.9/cli/install/) installed
-* The [`PulsarGroups.json`](https://github.com/apache/incubator-pulsar/blob/master/deployment/dcos/PulsarGroups.json) configuration file from the Pulsar GitHub repo.
-
-  ```bash
-  
-  $ curl -O https://raw.githubusercontent.com/apache/incubator-pulsar/master/deployment/dcos/PulsarGroups.json
-  
-  ```
-
-Each node in the DC/OS-managed Mesos cluster must have at least:
-
-* 4 CPU
-* 4 GB of memory
-* 60 GB of total persistent disk
-
-Alternatively, you can change the configuration in `PulsarGroups.json` according to match your DC/OS cluster's resources.
-
-## Deploy Pulsar using the DC/OS command interface
-
-You can deploy Pulsar on DC/OS using this command:
-
-```bash
-
-$ dcos marathon group add PulsarGroups.json
-
-```
-
-This command will deploy Docker container instances in three groups, which together comprise a Pulsar cluster:
-
-* 3 bookies (1 [bookie](reference-terminology.md#bookie) on each agent node and 1 [bookie recovery](http://bookkeeper.apache.org/docs/latest/admin/autorecovery/) instance)
-* 3 Pulsar [brokers](reference-terminology.md#broker) (1 broker on each node and 1 admin instance)
-* 1 [Prometheus](http://prometheus.io/) instance and 1 [Grafana](https://grafana.com/) instance
-
-
-> When running DC/OS, a ZooKeeper cluster is already running at `master.mesos:2181`, thus there's no need to install or start up ZooKeeper separately.
-
-After executing the `dcos` command above, click on the **Services** tab in the DC/OS [GUI interface](https://docs.mesosphere.com/latest/gui/), which you can access at [http://m1.dcos](http://m1.dcos) in this example. You should see several applications in the process of deploying.
-
-![DC/OS command executed](/assets/dcos_command_execute.png)
-
-![DC/OS command executed2](/assets/dcos_command_execute2.png)
-
-## The BookKeeper group
-
-To monitor the status of the BookKeeper cluster deployment, click on the **bookkeeper** group in the parent **pulsar** group.
-
-![DC/OS bookkeeper status](/assets/dcos_bookkeeper_status.png)
-
-At this point, 3 [bookies](reference-terminology.md#bookie) should be shown as green, which means that they have been deployed successfully and are now running.
- 
-![DC/OS bookkeeper running](/assets/dcos_bookkeeper_run.png)
- 
-You can also click into each bookie instance to get more detailed info, such as the bookie running log.
-
-![DC/OS bookie log](/assets/dcos_bookie_log.png)
-
-To display information about the BookKeeper in ZooKeeper, you can visit [http://m1.dcos/exhibitor](http://m1.dcos/exhibitor). In this example, there are 3 bookies under the `available` directory.
-
-![DC/OS bookkeeper in zk](/assets/dcos_bookkeeper_in_zookeeper.png)
-
-## The Pulsar broker Group
-
-Similar to the BookKeeper group above, click into the **brokers** to check the status of the Pulsar brokers.
-
-![DC/OS broker status](/assets/dcos_broker_status.png)
-
-![DC/OS broker running](/assets/dcos_broker_run.png)
-
-You can also click into each broker instance to get more detailed info, such as the broker running log.
-
-![DC/OS broker log](/assets/dcos_broker_log.png)
-
-Broker cluster information in Zookeeper is also available through the web UI. In this example, you can see that that the `loadbalance` and `managed-ledgers` directories have been created.
-
-![DC/OS broker in zk](/assets/dcos_broker_in_zookeeper.png)
-
-## Monitor Group
-
-The **monitory** group consists of Prometheus and Grafana.
-
-![DC/OS monitor status](/assets/dcos_monitor_status.png)
-
-### Prometheus
-
-Click into the instance of `prom` to get the endpoint of Prometheus, which is `192.168.65.121:9090` in this example.
-
-![DC/OS prom endpoint](/assets/dcos_prom_endpoint.png)
-
-If you click that endpoint, you'll see the Prometheus dashboard. The [http://192.168.65.121:9090/targets](http://192.168.65.121:9090/targets) URL will display all the bookies and brokers.
-
-![DC/OS prom targets](/assets/dcos_prom_targets.png)
-
-### Grafana
-
-Click into `grafana` to get the endpoint for Grafana, which is `192.168.65.121:3000` in this example.
- 
-![DC/OS grafana endpoint](/assets/dcos_grafana_endpoint.png)
-
-If you click that endpoint, you can access the Grafana dashboard.
-
-![DC/OS grafana targets](/assets/dcos_grafana_dashboard.png)
-
-## Run a simple Pulsar consumer and producer on DC/OS
-
-Now that we have a fully deployed Pulsar cluster, we can run a simple consumer and producer to show Pulsar on DC/OS in action.
-
-### Download and prepare the Pulsar Java tutorial
-
-There's a [Pulsar Java tutorial](https://github.com/streamlio/pulsar-java-tutorial) repo that you can clone. This repo contains a simple Pulsar consumer and producer (more info can be found in the repo's `README` file).
-
-```bash
-
-$ git clone https://github.com/streamlio/pulsar-java-tutorial
-
-```
-
-Change the `SERVICE_URL` from `pulsar://localhost:6650` to `pulsar://a1.dcos:6650` in both [`ConsumerTutorial.java`](https://github.com/streamlio/pulsar-java-tutorial/blob/master/src/main/java/tutorial/ConsumerTutorial.java) and [`ProducerTutorial.java`](https://github.com/streamlio/pulsar-java-tutorial/blob/master/src/main/java/tutorial/ProducerTutorial.java).
-The `pulsar://a1.dcos:6650` endpoint is for the broker service. Endpoint details for each broker instance can be fetched from the DC/OS GUI. `a1.dcos` is a DC/OS client agent, which runs a broker. This can also be replaced by the client agent IP address.
-
-Now, change the message number from 10 to 10000000 in main method of [`ProducerTutorial.java`](https://github.com/streamlio/pulsar-java-tutorial/blob/master/src/main/java/tutorial/ProducerTutorial.java) so that it will produce more messages.
-
-Now compile the project code using command:
-
-```bash
-
-$ mvn clean package
-
-```
-
-### Run the consumer and producer
-
-Execute this command to run the consumer:
-
-```bash
-
-$ mvn exec:java -Dexec.mainClass="tutorial.ConsumerTutorial"
-
-```
-
-Execute this command to run the producer:
-
-```bash
-
-$ mvn exec:java -Dexec.mainClass="tutorial.ProducerTutorial"
-
-```
-
-You can see the producer producing messages and the consumer consuming messages through the DC/OS GUI.
-
-![DC/OS pulsar producer](/assets/dcos_producer.png)
-
-![DC/OS pulsar consumer](/assets/dcos_consumer.png)
-
-### View Grafana metric output
-
-While the producer and consumer are running, you can access running metrics information from Grafana.
-
-![DC/OS pulsar dashboard](/assets/dcos_metrics.png)
-
-
-## Uninstall Pulsar
-
-You can shut down and uninstall the `pulsar` application from DC/OS at any time in two ways:
-
-1. Using the DC/OS GUI, you can choose **Delete** at the right end of Pulsar group.
-
-   ![DC/OS pulsar uninstall](/assets/dcos_uninstall.png)
-
-2. You can use the following command:
-
-   ```bash
-   
-   $ dcos marathon group remove /pulsar
-   
-   ```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-kubernetes.md b/site2/website/versioned_docs/version-2.1.0-incubating/deploy-kubernetes.md
deleted file mode 100644
index 0684dee963397..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-kubernetes.md
+++ /dev/null
@@ -1,463 +0,0 @@
----
-id: deploy-kubernetes
-title: Deploying Pulsar on Kubernetes
-sidebar_label: "Kubernetes"
-original_id: deploy-kubernetes
----
-
-:::tip
-
-If you want to enable all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you can choose to use `apachepulsar/pulsar-all` image instead of
-`apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
-
-:::
-
-Pulsar can be easily deployed in [Kubernetes](https://kubernetes.io/) clusters, either in managed clusters on [Google Kubernetes Engine](#pulsar-on-google-kubernetes-engine) or [Amazon Web Services](https://aws.amazon.com/) or in [custom clusters](#pulsar-on-a-custom-kubernetes-cluster).
-
-The deployment method shown in this guide relies on [YAML](http://yaml.org/) definitions for Kubernetes [resources](https://kubernetes.io/docs/reference/). The {@inject: github:kubernetes:/kubernetes} subdirectory of the [Pulsar package](pulsar:download_page_url) holds resource definitions for:
-
-* A two-bookie BookKeeper cluster
-* A three-node ZooKeeper cluster
-* A three-broker Pulsar cluster
-* A [monitoring stack](#) consisting of [Prometheus](https://prometheus.io/), [Grafana](https://grafana.com), and the [Pulsar dashboard](administration-dashboard.md)
-* A [pod](https://kubernetes.io/docs/concepts/workloads/pods/pod/) from which you can run administrative commands using the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool
-
-## Setup
-
-To get started, install a source package from the [downloads page](pulsar:download_page_url).
-
-> Please note that the Pulsar binary package will *not* contain the necessary YAML resources to deploy Pulsar on Kubernetes.
-
-If you'd like to change the number of bookies, brokers, or ZooKeeper nodes in your Pulsar cluster, modify the `replicas` parameter in the `spec` section of the appropriate [`Deployment`](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [`StatefulSet`](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/) resource.
-
-## Pulsar on Google Kubernetes Engine
-
-[Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine) (GKE) automates the creation and management of Kubernetes clusters in [Google Compute Engine](https://cloud.google.com/compute/) (GCE).
-
-### Prerequisites
-
-To get started, you'll need:
-
-* A Google Cloud Platform account, which you can sign up for at [cloud.google.com](https://cloud.google.com)
-* An existing Cloud Platform project
-* The [Google Cloud SDK](https://cloud.google.com/sdk/downloads) (in particular the [`gcloud`](https://cloud.google.com/sdk/gcloud/) and [`kubectl`](https://kubernetes.io/docs/reference/kubectl/) tools).
-
-### Create a new Kubernetes cluster
-
-You can create a new GKE cluster using the [`container clusters create`](https://cloud.google.com/sdk/gcloud/reference/container/clusters/create) command for `gcloud`. This command enables you to specify the number of nodes in the cluster, the machine types of those nodes, and more.
-
-As an example, we'll create a new GKE cluster for Kubernetes version [1.6.4](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#v164) in the [us-central1-a](https://cloud.google.com/compute/docs/regions-zones/regions-zones#available) zone. The cluster will be named `pulsar-gke-cluster` and will consist of three VMs, each using two locally attached SSDs and running on [n1-standard-8](https://cloud.google.com/compute/docs/machine-types) machines. These SSDs will be used by [bookie](reference-terminology.md#bookie) instances, one for the BookKeeper [journal](concepts-architecture-overview.md#journal-storage) and the other for storing the actual message data.
-
-```bash
-
-$ gcloud container clusters create pulsar-gke-cluster \
-  --zone=us-central1-a \
-  --machine-type=n1-standard-8 \
-  --num-nodes=3 \
-  --local-ssd-count=2 \
-
-```
-
-By default, bookies will run on all the machines that have locally attached SSD disks. In this example, all of those machines will have two SSDs, but you can add different types of machines to the cluster later. You can control which machines host bookie servers using [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels).
-
-### Dashboard
-
-You can observe your cluster in the [Kubernetes Dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/) by downloading the credentials for your Kubernetes cluster and opening up a proxy to the cluster:
-
-```bash
-
-$ gcloud container clusters get-credentials pulsar-gke-cluster \
-  --zone=us-central1-a \
-  --project=your-project-name
-$ kubectl proxy
-
-```
-
-By default, the proxy will be opened on port 8001. Now you can navigate to [localhost:8001/ui](http://localhost:8001/ui) in your browser to access the dashboard. At first your GKE cluster will be empty, but that will change as you begin deploying Pulsar components using `kubectl` [component by component](#deploying-pulsar-components),
-or using [`helm`](#deploying-pulsar-components-helm).
-
-## Pulsar on Amazon Web Services
-
-You can run Kubernetes on [Amazon Web Services](https://aws.amazon.com/) (AWS) in a variety of ways. A very simple way that was [recently introduced](https://aws.amazon.com/blogs/compute/kubernetes-clusters-aws-kops/) involves using the [Kubernetes Operations](https://github.com/kubernetes/kops) (kops) tool.
-
-You can find detailed instructions for setting up a Kubernetes cluster on AWS [here](https://github.com/kubernetes/kops/blob/master/docs/getting_started/aws).
-
-When you create a cluster using those instructions, your `kubectl` config in `~/.kube/config` (on MacOS and Linux) will be updated for you, so you probably won't need to change your configuration. Nonetheless, you can ensure that `kubectl` can interact with your cluster by listing the nodes in the cluster:
-
-```bash
-
-$ kubectl get nodes
-
-```
-
-If `kubectl` is working with your cluster, you can proceed to deploy Pulsar components using `kubectl` [component by component](#deploying-pulsar-components),
-or using [`helm`](#deploying-pulsar-components-helm).
-
-## Pulsar on a custom Kubernetes cluster
-
-Pulsar can be deployed on a custom, non-GKE Kubernetes cluster as well. You can find detailed documentation on how to choose a Kubernetes installation method that suits your needs in the [Picking the Right Solution](https://kubernetes.io/docs/setup/pick-right-solution) guide in the Kubernetes docs.
-
-The easiest way to run a Kubernetes cluster is to do so locally. To install a mini local cluster for testing purposes, running in local VMs, you can either:
-
-1. Use [minikube](https://minikube.sigs.k8s.io/docs/start/) to run a single-node Kubernetes cluster
-1. Create a local cluster running on multiple VMs on the same machine
-
-### Minikube
-
-1. [Install and configure minikube](https://github.com/kubernetes/minikube#installation) with
-   a [VM driver](https://github.com/kubernetes/minikube#requirements), e.g. `kvm2` on Linux or `hyperkit` or `VirtualBox` on macOS.
-1. Create a kubernetes cluster on Minikube.
-
-   ```shell
-   
-   minikube start --memory=8192 --cpus=4 \
-       --kubernetes-version=v1.10.5
-   
-   ```
-
-1. Set `kubectl` to use Minikube.
-
-   ```shell
-   
-   kubectl config use-context minikube
-   
-   ```
-
-In order to use the [Kubernetes Dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/)
-with local Kubernetes cluster on Minikube, run:
-
-```bash
-
-$ minikube dashboard
-
-```
-
-The command will automatically trigger open a webpage in your browser. At first your local cluster will be empty,
-but that will change as you begin deploying Pulsar components using `kubectl` [component by component](#deploying-pulsar-components),
-or using [`helm`](#deploying-pulsar-components-helm).
-
-### Multiple VMs
-
-For the second option, follow the [instructions](https://github.com/pires/kubernetes-vagrant-coreos-cluster) for running Kubernetes using [CoreOS](https://coreos.com/) on [Vagrant](https://www.vagrantup.com/). We'll provide an abridged version of those instructions here.
-
-
-First, make sure you have [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads) installed. Then clone the repo and start up the cluster:
-
-```bash
-
-$ git clone https://github.com/pires/kubernetes-vagrant-coreos-cluster
-$ cd kubernetes-vagrant-coreos-cluster
-
-# Start a three-VM cluster
-$ NODES=3 USE_KUBE_UI=true vagrant up
-
-```
-
-Create SSD disk mount points on the VMs using this script:
-
-```bash
-
-$ for vm in node-01 node-02 node-03; do
-    NODES=3 vagrant ssh $vm -c "sudo mkdir -p /mnt/disks/ssd0"
-    NODES=3 vagrant ssh $vm -c "sudo mkdir -p /mnt/disks/ssd1"
-  done
-
-```
-
-Bookies expect two logical devices to mount for [journal](concepts-architecture-overview.md#journal-storage) and persistent message storage to be available. In this VM exercise, we created two directories on each VM.
-
-Once the cluster is up, you can verify that `kubectl` can access it:
-
-```bash
-
-$ kubectl get nodes
-NAME           STATUS                     AGE       VERSION
-172.17.8.101   Ready,SchedulingDisabled   10m       v1.6.4
-172.17.8.102   Ready                      8m        v1.6.4
-172.17.8.103   Ready                      6m        v1.6.4
-172.17.8.104   Ready                      4m        v1.6.4
-
-```
-
-In order to use the [Kubernetes Dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/) with your local Kubernetes cluster, first use `kubectl` to create a proxy to the cluster:
-
-```bash
-
-$ kubectl proxy
-
-```
-
-Now you can access the web interface at [localhost:8001/ui](http://localhost:8001/ui). At first your local cluster will be empty,
-but that will change as you begin deploying Pulsar components using `kubectl` [component by component](#deploying-pulsar-components),
-or using [`helm`](#deploying-pulsar-components-helm).
-
-## Deploying Pulsar components
-
-Now that you've set up a Kubernetes cluster, either on [Google Kubernetes Engine](#pulsar-on-google-kubernetes-engine) or on a [custom cluster](#pulsar-on-a-custom-kubernetes-cluster), you can begin deploying the components that make up Pulsar. The YAML resource definitions for Pulsar components can be found in the `kubernetes` folder of the [Pulsar source package](pulsar:download_page_url).
-
-In that package, there are different sets of resource definitions for different environments.
-
-- `deployment/kubernetes/google-kubernetes-engine`: for Google Kubernetes Engine (GKE)
-- `deployment/kubernetes/aws`: for AWS
-- `deployment/kubernetes/generic`: for a custom Kubernetes cluster
-
-To begin, `cd` into the appropriate folder.
-
-### Deploy ZooKeeper
-
-You *must* deploy ZooKeeper as the first Pulsar component, as it is a dependency for the others.
-
-```bash
-
-$ kubectl apply -f zookeeper.yaml
-
-```
-
-Wait until all three ZooKeeper server pods are up and have the status `Running`. You can check on the status of the ZooKeeper pods at any time:
-
-```bash
-
-$ kubectl get pods -l component=zookeeper
-NAME      READY     STATUS             RESTARTS   AGE
-zk-0      1/1       Running            0          18m
-zk-1      1/1       Running            0          17m
-zk-2      0/1       Running            6          15m
-
-```
-
-This step may take several minutes, as Kubernetes needs to download the Docker image on the VMs.
-
-### Initialize cluster metadata
-
-Once ZooKeeper is running, you need to [initialize the metadata](#cluster-metadata-initialization) for the Pulsar cluster in ZooKeeper. This includes system metadata for [BookKeeper](reference-terminology.md#bookkeeper) and Pulsar more broadly. There is a Kubernetes [job](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/) in the `cluster-metadata.yaml` file that you only need to run once:
-
-```bash
-
-$ kubectl apply -f cluster-metadata.yaml
-
-```
-
-For the sake of reference, that job runs the following command on an ephemeral pod:
-
-```bash
-
-$ bin/pulsar initialize-cluster-metadata \
-  --cluster local \
-  --zookeeper zookeeper \
-  --configuration-store zookeeper \
-  --web-service-url http://broker.default.svc.cluster.local:8080/ \
-  --broker-service-url pulsar://broker.default.svc.cluster.local:6650/
-
-```
-
-### Deploy the rest of the components
-
-Once cluster metadata has been successfully initialized, you can then deploy the bookies, brokers, monitoring stack ([Prometheus](https://prometheus.io), [Grafana](https://grafana.com), and the [Pulsar dashboard](administration-dashboard.md)), and Pulsar cluster proxy:
-
-```bash
-
-$ kubectl apply -f bookie.yaml
-$ kubectl apply -f broker.yaml
-$ kubectl apply -f proxy.yaml
-$ kubectl apply -f monitoring.yaml
-$ kubectl apply -f admin.yaml
-
-```
-
-You can check on the status of the pods for these components either in the Kubernetes Dashboard or using `kubectl`:
-
-```bash
-
-$ kubectl get pods -w -l app=pulsar
-
-```
-
-### Set up properties and namespaces
-
-Once all of the components are up and running, you'll need to create at least one Pulsar tenant and at least one namespace.
-
-> This step is not strictly required if Pulsar [authentication and authorization](security-overview.md) is turned on, though it allows you to change [policies](admin-api-namespaces.md) for each of the namespaces later.
-
-You can create properties and namespaces (and perform any other administrative tasks) using the `pulsar-admin` pod that is already configured to act as an admin client for your newly created Pulsar cluster. One easy way to perform administrative tasks is to create an alias for the [`pulsar-admin`](reference-pulsar-admin.md) tool installed on the admin pod.
-
-```bash
-
-$ alias pulsar-admin='kubectl exec pulsar-admin -it -- bin/pulsar-admin'
-
-```
-
-Now, any time you run `pulsar-admin`, you will be running commands from that pod. This command will create a tenant called `ten`:
-
-```bash
-
-$ pulsar-admin tenants create ten \
-  --admin-roles admin \
-  --allowed-clusters local
-
-```
-
-This command will create a `ns` namespace under the `ten` tenant:
-
-```bash
-
-$ pulsar-admin namespaces create ten/ns
-
-```
-
-To verify that everything has gone as planned:
-
-```bash
-
-$ pulsar-admin tenants list
-public
-ten
-
-$ pulsar-admin namespaces list ten
-ten/ns
-
-```
-
-Now that you have a namespace and tenant set up, you can move on to [experimenting with your Pulsar cluster](#experimenting-with-your-cluster) from within the cluster or [connecting to the cluster](#client-connections) using a Pulsar client.
-
-### Experimenting with your cluster
-
-Now that a tenant and namespace have been created, you can begin experimenting with your running Pulsar cluster. Using the same `pulsar-admin` pod via an alias, as in the section above, you can use [`pulsar-perf`](reference-cli-tools.md#pulsar-perf) to create a test [producer](reference-terminology.md#producer) to publish 10,000 messages a second on a topic in the [tenant](reference-terminology.md#tenant) and [namespace](reference-terminology.md#namespace) you created.
-
-First, create an alias to use the `pulsar-perf` tool via the admin pod:
-
-```bash
-
-$ alias pulsar-perf='kubectl exec pulsar-admin -it -- bin/pulsar-perf'
-
-```
-
-Now, produce messages:
-
-```bash
-
-$ pulsar-perf produce persistent://public/default/my-topic \
-  --rate 10000
-
-```
-
-Similarly, you can start a [consumer](reference-terminology.md#consumer) to subscribe to and receive all the messages on that topic:
-
-```bash
-
-$ pulsar-perf consume persistent://public/default/my-topic \
-  --subscriber-name my-subscription-name
-
-```
-
-You can also view [stats](administration-stats.md) for the topic using the [`pulsar-admin`](reference-pulsar-admin.md#persistent-stats) tool:
-
-```bash
-
-$ pulsar-admin persistent stats persistent://public/default/my-topic
-
-```
-
-### Monitoring
-
-The default monitoring stack for Pulsar on Kubernetes has consists of [Prometheus](#prometheus), [Grafana](#grafana), and the [Pulsar dashboard](administration-dashboard.md).
-
-> If you deployed the cluster to Minikube, the following monitoring ports are mapped at the minikube VM:
->
-> - Prometheus port: 30003
-> - Grafana port: 30004
-> - Dashboard port: 30005
->
-> You can use `minikube ip` to find the ip address of the minikube VM, and then use their mapped ports
-> to access corresponding services. For example, you can access Pulsar dashboard at `http://$(minikube ip):30005`.
-
-#### Prometheus
-
-All Pulsar metrics in Kubernetes are collected by a [Prometheus](https://prometheus.io) instance running inside the cluster. Typically, there is no need to access Prometheus directly. Instead, you can use the [Grafana interface](#grafana) that displays the data stored in Prometheus.
-
-#### Grafana
-
-In your Kubernetes cluster, you can use [Grafana](https://grafana.com) to view dashboards for Pulsar [namespaces](reference-terminology.md#namespace) (message rates, latency, and storage), JVM stats, [ZooKeeper](https://zookeeper.apache.org), and [BookKeeper](reference-terminology.md#bookkeeper). You can get access to the pod serving Grafana using `kubectl`'s [`port-forward`](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster) command:
-
-```bash
-
-$ kubectl port-forward \
-  $(kubectl get pods -l component=grafana -o jsonpath='{.items[*].metadata.name}') 3000
-
-```
-
-You can then access the dashboard in your web browser at [localhost:3000](http://localhost:3000).
-
-#### Pulsar dashboard
-
-While Grafana and Prometheus are used to provide graphs with historical data, [Pulsar dashboard](administration-dashboard.md) reports more detailed current data for individual [topics](reference-terminology.md#topic).
-
-For example, you can have sortable tables showing all namespaces, topics, and broker stats, with details on the IP address for consumers, how long they've been connected, and much more.
-
-You can access to the pod serving the Pulsar dashboard using `kubectl`'s [`port-forward`](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster) command:
-
-```bash
-
-$ kubectl port-forward \
-  $(kubectl get pods -l component=dashboard -o jsonpath='{.items[*].metadata.name}') 8080:80
-
-```
-
-You can then access the dashboard in your web browser at [localhost:8080](http://localhost:8080).
-
-### Client connections
-
-> If you deployed the cluster to Minikube, the proxy ports are mapped at the minikube VM:
->
-> - Http port: 30001
-> - Pulsar binary protocol port: 30002
->
-> You can use `minikube ip` to find the ip address of the minikube VM, and then use their mapped ports
-> to access corresponding services. For example, pulsar webservice url will be at `http://$(minikube ip):30001`.
-
-Once your Pulsar cluster is running on Kubernetes, you can connect to it using a Pulsar client. You can fetch the IP address for the Pulsar proxy running in your Kubernetes cluster using kubectl:
-
-```bash
-
-$ kubectl get service broker-proxy \
-  --output=jsonpath='{.status.loadBalancer.ingress[*].ip}'
-
-```
-
-If the IP address for the proxy were, for example, 35.12.13.198, you could connect to Pulsar using `pulsar://35.12.13.198:6650`.
-
-You can find client documentation for:
-
-* [Java](client-libraries-java.md)
-* [Python](client-libraries-python.md)
-* [C++](client-libraries-cpp.md)
-
-
-## Deploying Pulsar components (helm)
-
-Pulsar also provides a [Helm](https://docs.helm.sh/) chart for deploying a Pulsar cluster to Kubernetes. Before you start,
-make sure you follow [Helm documentation](https://docs.helm.sh/using_helm) to install helm.
-
-> Assume you have cloned pulsar repo under a `PULSAR_HOME` directory.
-
-### Minikube
-
-1. Go to Pulsar helm chart directory
-
-   ```shell
-   
-   cd ${PULSAR_HOME}/deployment/kubernetes/helm
-   
-   ```
-
-1. Install helm chart to a K8S cluster on Minikube.
-
-   ```shell
-   
-   helm install --values pulsar/values-mini.yaml ./pulsar
-   
-   ```
-
-Once the helm chart is completed on installation, you can access the cluster via:
-
-- Web service url: `http://$(minikube ip):30001/`
-- Pulsar service url: `pulsar://$(minikube ip):30002/`
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-monitoring.md b/site2/website/versioned_docs/version-2.1.0-incubating/deploy-monitoring.md
deleted file mode 100644
index 7a58fa2e3b89a..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/deploy-monitoring.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-id: deploy-monitoring
-title: Monitoring
-sidebar_label: "Monitoring"
-original_id: deploy-monitoring
----
-
-There are different ways to monitor a Pulsar cluster, exposing both metrics relative to the usage of topics and the overall health of the individual components of the cluster.
-
-## Collecting metrics
-
-### Broker stats
-
-Pulsar broker metrics can be collected from brokers and exported in JSON format. There are two main types of metrics:
-
-* *Destination dumps*, which containing stats for each individual topic. They can be fetched using
-
-  ```shell
-  
-  bin/pulsar-admin broker-stats destinations
-  
-  ```
-
-* Broker metrics, containing broker info and topics stats aggregated at namespace
-  level:
-
-  ```shell
-  
-  bin/pulsar-admin broker-stats monitoring-metrics
-  
-  ```
-
-All the message rates are updated every 1min.
-
-The aggregated broker metrics are also exposed in the [Prometheus](https://prometheus.io) format at:
-
-```shell
-
-http://$BROKER_ADDRESS:8080/metrics/
-
-```
-
-### ZooKeeper stats
-
-The local ZooKeeper/configuration store server and clients that are shipped with Pulsar have been instrumented to expose
-detailed stats through Prometheus as well.
-
-```shell
-
-http://$LOCAL_ZK_SERVER:8000/metrics
-http://$GLOBAL_ZK_SERVER:8001/metrics
-
-```
-
-The default port of local ZooKeeper is `8000` and that of configuration store is `8001`.
-These can be changed by specifying system property `stats_server_port`.
-
-### BookKeeper stats
-
-For BookKeeper you can configure the stats frameworks by changing the `statsProviderClass` in
-`conf/bookkeeper.conf`.
-
-By default, the default BookKeeper configuration included with Pulsar distribution will enable
-the Prometheus exporter.
-
-```shell
-
-http://$BOOKIE_ADDRESS:8000/metrics
-
-```
-
-For bookies, the default port is `8000` (instead of `8080`) and that can be configured by changing
-the `prometheusStatsHttpPort` in `conf/bookkeeper.conf`.
-
-## Configuring Prometheus
-
-You can configure Prometheus to collect and store the metrics data by following the Prometheus [Getting started](https://prometheus.io/docs/introduction/getting_started/) guide.
-
-When running on bare metal, you can provide the list of nodes that needs to be probed. When deploying
-in a Kubernetes cluster, the monitoring is automatically setup with the [provided](deploy-kubernetes.md)
-instructions.
-
-## Dashboards
-
-When collecting time series statistics, the major problem is to make sure the number of dimensions
-attached to the data does not explode.
-
-For that reason we only collect time series of metrics aggregated at the namespace level.
-
-### Pulsar per-topic dashboard
-
-The per-topic dashboard instructions are available at [Dashboard](administration-dashboard.md).
-
-### Grafana
-
-You can use grafana to easily create dashboard driven by the data stored in Prometheus.
-
-There is a `pulsar-grafana` Docker image that is ready to use with the principal dashboards already
-in place. This is enabled by default when deploying Pulsar on Kubernetes.
-
-To use the dashboard manually:
-
-```shell
-
-docker run -p3000:3000 \
-        -e PROMETHEUS_URL=http://$PROMETHEUS_HOST:9090/ \
-        apachepulsar/pulsar-grafana:latest
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/develop-cpp.md b/site2/website/versioned_docs/version-2.1.0-incubating/develop-cpp.md
deleted file mode 100644
index 933bc286364bc..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/develop-cpp.md
+++ /dev/null
@@ -1,115 +0,0 @@
----
-id: develop-cpp
-title: Building Pulsar C++ client
-sidebar_label: "Building Pulsar C++ client"
-original_id: develop-cpp
----
-
-## Supported platforms
-
-The Pulsar C++ client has been successfully tested on **MacOS** and **Linux**.
-
-## System requirements
-
-You need to have the following installed to use the C++ client:
-
-* [CMake](https://cmake.org/)
-* [Boost](http://www.boost.org/)
-* [Protocol Buffers](https://developers.google.com/protocol-buffers/) 2.6
-* [Log4CXX](https://logging.apache.org/log4cxx)
-* [libcurl](https://curl.haxx.se/libcurl/)
-* [Google Test](https://github.com/google/googletest)
-* [JsonCpp](https://github.com/open-source-parsers/jsoncpp)
-
-## Compilation
-
-There are separate compilation instructions for [MacOS](#macos) and [Linux](#linux). For both systems, start by cloning the Pulsar repository:
-
-```shell
-
-$ git clone https://github.com/apache/incubator-pulsar
-
-```
-
-### Linux
-
-First, install all of the necessary dependencies:
-
-```shell
-
-$ apt-get install cmake libssl-dev libcurl4-openssl-dev liblog4cxx-dev \
-  libprotobuf-dev libboost-all-dev google-mock libgtest-dev libjsoncpp-dev
-
-```
-
-Then compile and install [Google Test](https://github.com/google/googletest):
-
-```shell
-
-# libgtest-dev version is 1.18.0 or above
-$ cd /usr/src/googletest
-$ sudo cmake .
-$ sudo make
-$ sudo cp ./googlemock/libgmock.a ./googlemock/gtest/libgtest.a /usr/lib/
-
-# less than 1.18.0
-$ cd /usr/src/gtest
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgtest.a /usr/lib
-
-$ cd /usr/src/gmock
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgmock.a /usr/lib
-
-```
-
-Finally, compile the Pulsar client library for C++ inside the Pulsar repo:
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
-The resulting files, `libpulsar.so` and `libpulsar.a`, will be placed in the `lib` folder of the repo while two tools, `perfProducer` and `perfConsumer`, will be placed in the `perf` directory.
-
-### MacOS
-
-First, install all of the necessary dependencies:
-
-```shell
-
-# OpenSSL installation
-$ brew install openssl
-$ export OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/
-$ export OPENSSL_ROOT_DIR=/usr/local/opt/openssl/
-
-# Protocol Buffers installation
-$ brew tap homebrew/versions
-$ brew install protobuf260
-$ brew install boost
-$ brew install log4cxx
-
-# Google Test installation
-$ git clone https://github.com/google/googletest.git
-$ cd googletest
-$ git checkout release-1.12.1
-$ cmake .
-$ make install
-
-```
-
-Then compile the Pulsar client library in the repo that you cloned:
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/develop-load-manager.md b/site2/website/versioned_docs/version-2.1.0-incubating/develop-load-manager.md
deleted file mode 100644
index 079cfbded0ea5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/develop-load-manager.md
+++ /dev/null
@@ -1,227 +0,0 @@
----
-id: develop-load-manager
-title: Modular load manager
-sidebar_label: "Modular load manager"
-original_id: develop-load-manager
----
-
-The *modular load manager*, implemented in  [`ModularLoadManagerImpl`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java), is a flexible alternative to the previously implemented load manager, [`SimpleLoadManagerImpl`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java), which attempts to simplify how load is managed while also providing abstractions so that complex load management strategies may be implemented.
-
-## Usage
-
-There are two ways that you can enable the modular load manager:
-
-1. Change the value of the `loadManagerClassName` parameter in `conf/broker.conf` from `org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl` to `org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`.
-2. Using the `pulsar-admin` tool. Here's an example:
-
-   ```shell
-   
-   $ pulsar-admin update-dynamic-config \
-    --config loadManagerClassName \
-    --value org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl
-   
-   ```
-
-   You can use the same method to change back to the original value. In either case, any mistake in specifying the load manager will cause Pulsar to default to `SimpleLoadManagerImpl`.
-
-## Verification
-
-There are a few different ways to determine which load manager is being used:
-
-1. Use `pulsar-admin` to examine the `loadManagerClassName` element:
-
-   ```shell
-   
-   $ bin/pulsar-admin brokers get-all-dynamic-config
-   {
-    "loadManagerClassName" : "org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl"
-   }
-   
-   ```
-
-   If there is no `loadManagerClassName` element, then the default load manager is used.
-
-2. Consult a ZooKeeper load report. With the module load manager, the load report in `/loadbalance/brokers/...` will have many differences. for example the `systemResourceUsage` sub-elements (`bandwidthIn`, `bandwidthOut`, etc.) are now all at the top level. Here is an example load report from the module load manager:
-
-   ```json
-   
-   {
-     "bandwidthIn": {
-       "limit": 10240000.0,
-       "usage": 4.256510416666667
-     },
-     "bandwidthOut": {
-       "limit": 10240000.0,
-       "usage": 5.287239583333333
-     },
-     "bundles": [],
-     "cpu": {
-       "limit": 2400.0,
-       "usage": 5.7353247655435915
-     },
-     "directMemory": {
-       "limit": 16384.0,
-       "usage": 1.0
-     }
-   }
-   
-   ```
-
-   With the simple load manager, the load report in `/loadbalance/brokers/...` will look like this:
-
-   ```json
-   
-   {
-     "systemResourceUsage": {
-       "bandwidthIn": {
-         "limit": 10240000.0,
-         "usage": 0.0
-       },
-       "bandwidthOut": {
-         "limit": 10240000.0,
-         "usage": 0.0
-       },
-       "cpu": {
-         "limit": 2400.0,
-         "usage": 0.0
-       },
-       "directMemory": {
-         "limit": 16384.0,
-         "usage": 1.0
-       },
-       "memory": {
-         "limit": 8192.0,
-         "usage": 3903.0
-       }
-     }
-   }
-   
-   ```
-
-3. The command-line [broker monitor](reference-cli-tools.md#monitor-brokers) will have a different output format depending on which load manager implementation is being used.
-
-   Here is an example from the modular load manager:
-
-   ```
-   
-   ===================================================================================================================
-   ||SYSTEM         |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
-   ||               |0.00           |48.33          |0.01           |0.00           |0.00           |48.33          ||
-   ||COUNT          |TOPIC          |BUNDLE         |PRODUCER       |CONSUMER       |BUNDLE +       |BUNDLE -       ||
-   ||               |4              |4              |0              |2              |4              |0              ||
-   ||LATEST         |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
-   ||SHORT          |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
-   ||LONG           |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
-   ===================================================================================================================
-   
-   ```
-
-   Here is an example from the simple load manager:
-
-   ```
-   
-   ===================================================================================================================
-   ||COUNT          |TOPIC          |BUNDLE         |PRODUCER       |CONSUMER       |BUNDLE +       |BUNDLE -       ||
-   ||               |4              |4              |0              |2              |0              |0              ||
-   ||RAW SYSTEM     |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
-   ||               |0.25           |47.94          |0.01           |0.00           |0.00           |47.94          ||
-   ||ALLOC SYSTEM   |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
-   ||               |0.20           |1.89           |               |1.27           |3.21           |3.21           ||
-   ||RAW MSG        |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.01           |0.01           |0.01           ||
-   ||ALLOC MSG      |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |54.84          |134.48         |189.31         |126.54         |320.96         |447.50         ||
-   ===================================================================================================================
-   
-   ```
-
-It is important to note that the module load manager is _centralized_, meaning that all requests to assign a bundle---whether it's been seen before or whether this is the first time---only get handled by the _lead_ broker (which can change over time). To determine the current lead broker, examine the `/loadbalance/leader` node in ZooKeeper.
-
-## Implementation
-
-### Data
-
-The data monitored by the modular load manager is contained in the [`LoadData`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadData.java) class.
-Here, the available data is subdivided into the bundle data and the broker data.
-
-#### Broker
-
-The broker data is contained in the [`BrokerData`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/BrokerData.java) class. It is further subdivided into two parts,
-one being the local data which every broker individually writes to ZooKeeper, and the other being the historical broker
-data which is written to ZooKeeper by the leader broker.
-
-##### Local Broker Data
-The local broker data is contained in the class [`LocalBrokerData`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java) and provides information about the following resources:
-
-* CPU usage
-* JVM heap memory usage
-* Direct memory usage
-* Bandwidth in/out usage
-* Most recent total message rate in/out across all bundles
-* Total number of topics, bundles, producers, and consumers
-* Names of all bundles assigned to this broker
-* Most recent changes in bundle assignments for this broker
-
-The local broker data is updated periodically according to the service configuration
-"loadBalancerReportUpdateMaxIntervalMinutes". After any broker updates their local broker data, the leader broker will
-receive the update immediately via a ZooKeeper watch, where the local data is read from the ZooKeeper node
-`/loadbalance/brokers/`
-
-##### Historical Broker Data
-
-The historical broker data is contained in the [`TimeAverageBrokerData`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/TimeAverageBrokerData.java) class.
-
-In order to reconcile the need to make good decisions in a steady-state scenario and make reactive decisions in a critical scenario, the historical data is split into two parts: the short-term data for reactive decisions, and the long-term data for steady-state decisions. Both time frames maintain the following information:
-
-* Message rate in/out for the entire broker
-* Message throughput in/out for the entire broker
-
-Unlike the bundle data, the broker data does not maintain samples for the global broker message rates and throughputs, which is not expected to remain steady as new bundles are removed or added. Instead, this data is aggregated over the short-term and long-term data for the bundles. See the section on bundle data to understand how that data is collected and maintained.
-
-The historical broker data is updated for each broker in memory by the leader broker whenever any broker writes their local data to ZooKeeper. Then, the historical data is written to ZooKeeper by the leader broker periodically according to the configuration `loadBalancerResourceQuotaUpdateIntervalMinutes`.
-
-##### Bundle Data
-
-The bundle data is contained in the [`BundleData`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/BundleData.java). Like the historical broker data, the bundle data is split into a short-term and a long-term time frame. The information maintained in each time frame:
-
-* Message rate in/out for this bundle
-* Message Throughput In/Out for this bundle
-* Current number of samples for this bundle
-
-The time frames are implemented by maintaining the average of these values over a set, limited number of samples, where
-the samples are obtained through the message rate and throughput values in the local data. Thus, if the update interval
-for the local data is 2 minutes, the number of short samples is 10 and the number of long samples is 1000, the
-short-term data is maintained over a period of `10 samples * 2 minutes / sample = 20 minutes`, while the long-term
-data is similarly over a period of 2000 minutes. Whenever there are not enough samples to satisfy a given time frame,
-the average is taken only over the existing samples. When no samples are available, default values are assumed until
-they are overwritten by the first sample. Currently, the default values are
-
-* Message rate in/out: 50 messages per second both ways
-* Message throughput in/out: 50KB per second both ways
-
-The bundle data is updated in memory on the leader broker whenever any broker writes their local data to ZooKeeper.
-Then, the bundle data is written to ZooKeeper by the leader broker periodically at the same time as the historical
-broker data, according to the configuration `loadBalancerResourceQuotaUpdateIntervalMinutes`.
-
-### Traffic Distribution
-
-The modular load manager uses the abstraction provided by [`ModularLoadManagerStrategy`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java) to make decisions about bundle assignment. The strategy makes a decision by considering the service configuration, the entire load data, and the bundle data for the bundle to be assigned. Currently, the only supported strategy is [`LeastLongTermMessageRate`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java), though soon users will have the ability to inject their own strategies if desired.
-
-#### Least Long Term Message Rate Strategy
-
-As its name suggests, the least long term message rate strategy attempts to distribute bundles across brokers so that
-the message rate in the long-term time window for each broker is roughly the same. However, simply balancing load based
-on message rate does not handle the issue of asymmetric resource burden per message on each broker. Thus, the system
-resource usages, which are CPU, memory, direct memory, bandwidth in, and bandwidth out, are also considered in the
-assignment process. This is done by weighting the final message rate according to
-`1 / (overload_threshold - max_usage)`, where `overload_threshold` corresponds to the configuration
-`loadBalancerBrokerOverloadedThresholdPercentage` and `max_usage` is the maximum proportion among the system resources
-that is being utilized by the candidate broker. This multiplier ensures that machines with are being more heavily taxed
-by the same message rates will receive less load. In particular, it tries to ensure that if one machine is overloaded,
-then all machines are approximately overloaded. In the case in which a broker's max usage exceeds the overload
-threshold, that broker is not considered for bundle assignment. If all brokers are overloaded, the bundle is randomly
-assigned.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/develop-schema.md b/site2/website/versioned_docs/version-2.1.0-incubating/develop-schema.md
deleted file mode 100644
index 6940438390ef9..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/develop-schema.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-id: develop-schema
-title: Custom schema storage
-sidebar_label: "Custom schema storage"
-original_id: develop-schema
----
-
-By default, Pulsar stores data type [schemas](concepts-schema-registry.md) in [Apache BookKeeper](https://bookkeeper.apache.org) (which is deployed alongside Pulsar). You can, however, use another storage system if you wish. This doc walks you through creating your own schema storage implementation.
-
-In order to use a non-default (i.e. non-BookKeeper) storage system for Pulsar schemas, you need to implement two Java interfaces: [`SchemaStorage`](#schemastorage-interface) and [`SchemaStorageFactory`](#schemastoragefactory-interface).
-
-## SchemaStorage interface
-
-The `SchemaStorage` interface has the following methods:
-
-```java
-
-public interface SchemaStorage {
-    // How schemas are updated
-    CompletableFuture put(String key, byte[] value, byte[] hash);
-
-    // How schemas are fetched from storage
-    CompletableFuture get(String key, SchemaVersion version);
-
-    // How schemas are deleted
-    CompletableFuture delete(String key);
-
-    // Utility method for converting a schema version byte array to a SchemaVersion object
-    SchemaVersion versionFromBytes(byte[] version);
-
-    // Startup behavior for the schema storage client
-    void start() throws Exception;
-
-    // Shutdown behavior for the schema storage client
-    void close() throws Exception;
-}
-
-```
-
-> For a full-fledged example schema storage implementation, see the [`BookKeeperSchemaStorage`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java) class.
-
-## SchemaStorageFactory interface 
-
-```java
-
-public interface SchemaStorageFactory {
-    @NotNull
-    SchemaStorage create(PulsarService pulsar) throws Exception;
-}
-
-```
-
-> For a full-fledged example schema storage factory implementation, see the [`BookKeeperSchemaStorageFactory`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java) class.
-
-## Deployment
-
-In order to use your custom schema storage implementation, you'll need to:
-
-1. Package the implementation in a [JAR](https://docs.oracle.com/javase/tutorial/deployment/jar/basicsindex.html) file.
-1. Add that jar to the `lib` folder in your Pulsar [binary or source distribution](getting-started-standalone.md#installing-pulsar).
-1. Change the `schemaRegistryStorageClassName` configuration in [`broker.conf`](reference-configuration.md#broker) to your custom factory class (i.e. the `SchemaStorageFactory` implementation, not the `SchemaStorage` implementation).
-1. Start up Pulsar.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/develop-tools.md b/site2/website/versioned_docs/version-2.1.0-incubating/develop-tools.md
deleted file mode 100644
index b5457790b8081..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/develop-tools.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-id: develop-tools
-title: Simulation tools
-sidebar_label: "Simulation tools"
-original_id: develop-tools
----
-
-It is sometimes necessary create an test environment and incur artificial load to observe how well load managers
-handle the load. The load simulation controller, the load simulation client, and the broker monitor were created as an
-effort to make create this load and observe the effects on the managers more easily.
-
-## Simulation Client
-The simulation client is a machine which will create and subscribe to topics with configurable message rates and sizes.
-Because it is sometimes necessary in simulating large load to use multiple client machines, the user does not interact
-with the simulation client directly, but instead delegates their requests to the simulation controller, which will then
-send signals to clients to start incurring load. The client implementation is in the class
-`org.apache.pulsar.testclient.LoadSimulationClient`.
-
-### Usage
-To Start a simulation client, use the `pulsar-perf` script with the command `simulation-client` as follows:
-
-```
-
-pulsar-perf simulation-client --port  --service-url 
-
-```
-
-The client will then be ready to receive controller commands.
-## Simulation Controller
-The simulation controller send signals to the simulation clients, requesting them to create new topics, stop old
-topics, change the load incurred by topics, as well as several other tasks. It is implemented in the class
-`org.apache.pulsar.testclient.LoadSimulationController` and presents a shell to the user as an interface to send
-command with.
-
-### Usage
-To start a simulation controller, use the `pulsar-perf` script with the command `simulation-controller` as follows:
-
-```
-
-pulsar-perf simulation-controller --cluster  --client-port 
---clients 
-
-```
-
-The clients should already be started before the controller is started. You will then be presented with a simple prompt,
-where you can issue commands to simulation clients. Arguments often refer to tenant names, namespace names, and topic
-names. In all cases, the BASE name of the tenants, namespaces, and topics are used. For example, for the topic
-`persistent://my_tenant/my_cluster/my_namespace/my_topic`, the tenant name is `my_tenant`, the namespace name is
-`my_namespace`, and the topic name is `my_topic`. The controller can perform the following actions:
-
-* Create a topic with a producer and a consumer
-  * `trade    [--rate ]
-  [--rand-rate ,]
-  [--size ]`
-* Create a group of topics with a producer and a consumer
-  * `trade_group    [--rate ]
-  [--rand-rate ,]
-  [--separation ] [--size ]
-  [--topics-per-namespace ]`
-* Change the configuration of an existing topic
-  * `change    [--rate ]
-  [--rand-rate ,]
-  [--size ]`
-* Change the configuration of a group of topics
-  * `change_group   [--rate ] [--rand-rate ,]
-  [--size ] [--topics-per-namespace ]`
-* Shutdown a previously created topic
-  * `stop   `
-* Shutdown a previously created group of topics
-  * `stop_group  `
-* Copy the historical data from one ZooKeeper to another and simulate based on the message rates and sizes in that history
-  * `copy    [--rate-multiplier value]`
-* Simulate the load of the historical data on the current ZooKeeper (should be same ZooKeeper being simulated on)
-  * `simulate   [--rate-multiplier value]`
-* Stream the latest data from the given active ZooKeeper to simulate the real-time load of that ZooKeeper.
-  * `stream   [--rate-multiplier value]`
-
-The "group" arguments in these commands allow the user to create or affect multiple topics at once. Groups are created
-when calling the `trade_group` command, and all topics from these groups may be subsequently modified or stopped
-with the `change_group` and `stop_group` commands respectively. All ZooKeeper arguments are of the form
-`zookeeper_host:port`.
-
-### Difference Between Copy, Simulate, and Stream
-The commands `copy`, `simulate`, and `stream` are very similar but have significant differences. `copy` is used when
-you want to simulate the load of a static, external ZooKeeper on the ZooKeeper you are simulating on. Thus,
-`source zookeeper` should be the ZooKeeper you want to copy and `target zookeeper` should be the ZooKeeper you are
-simulating on, and then it will get the full benefit of the historical data of the source in both load manager
-implementations. `simulate` on the other hand takes in only one ZooKeeper, the one you are simulating on. It assumes
-that you are simulating on a ZooKeeper that has historical data for `SimpleLoadManagerImpl` and creates equivalent
-historical data for `ModularLoadManagerImpl`. Then, the load according to the historical data is simulated by the
-clients. Finally, `stream` takes in an active ZooKeeper different than the ZooKeeper being simulated on and streams
-load data from it and simulates the real-time load. In all cases, the optional `rate-multiplier` argument allows the
-user to simulate some proportion of the load. For instance, using `--rate-multiplier 0.05` will cause messages to
-be sent at only `5%` of the rate of the load that is being simulated.
-
-## Broker Monitor
-To observe the behavior of the load manager in these simulations, one may utilize the broker monitor, which is
-implemented in `org.apache.pulsar.testclient.BrokerMonitor`. The broker monitor will print tabular load data to the
-console as it is updated using watchers.
-
-### Usage
-To start a broker monitor, use the `monitor-brokers` command in the `pulsar-perf` script:
-
-```
-
-pulsar-perf monitor-brokers --connect-string 
-
-```
-
-The console will then continuously print load data until it is interrupted.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/developing-binary-protocol.md b/site2/website/versioned_docs/version-2.1.0-incubating/developing-binary-protocol.md
deleted file mode 100644
index 56c829a3518d5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/developing-binary-protocol.md
+++ /dev/null
@@ -1,578 +0,0 @@
----
-id: developing-binary-protocol
-title: Pulsar binary protocol specification
-sidebar_label: "Binary protocol"
-original_id: developing-binary-protocol
----
-
-Pulsar uses a custom binary protocol for communications between producers/consumers and brokers. This protocol is designed to support required features, such as acknowledgements and flow control, while ensuring maximum transport and implementation efficiency.
-
-Clients and brokers exchange *commands* with each other. Commands are formatted as binary [protocol buffer](https://developers.google.com/protocol-buffers/) (aka *protobuf*) messages. The format of protobuf commands is specified in the [`PulsarApi.proto`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-common/src/main/proto/PulsarApi.proto) file and also documented in the [Protobuf interface](#protobuf-interface) section below.
-
-> ### Connection sharing
-> Commands for different producers and consumers can be interleaved and sent through the same connection without restriction.
-
-All commands associated with Pulsar's protocol are contained in a [`BaseCommand`](#pulsar.proto.BaseCommand) protobuf message that includes a [`Type`](#pulsar.proto.Type) [enum](https://developers.google.com/protocol-buffers/docs/proto#enum) with all possible subcommands as optional fields. `BaseCommand` messages can specify only one subcommand.
-
-## Framing
-
-Since protobuf doesn't provide any sort of message frame, all messages in the Pulsar protocol are prepended with a 4-byte field that specifies the size of the frame. The maximum allowable size of a single frame is 5 MB.
-
-The Pulsar protocol allows for two types of commands:
-
-1. **Simple commands** that do not carry a message payload.
-2. **Payload commands** that bear a payload that is used when publishing or delivering messages. In payload commands, the protobuf command data is followed by protobuf [metadata](#message-metadata) and then the payload, which is passed in raw format outside of protobuf. All sizes are passed as 4-byte unsigned big endian integers.
-
-> Message payloads are passed in raw format rather than protobuf format for efficiency reasons.
-
-### Simple commands
-
-Simple (payload-free) commands have this basic structure:
-
-| Component   | Description                                                                             | Size (in bytes) |
-|:------------|:----------------------------------------------------------------------------------------|:----------------|
-| totalSize   | The size of the frame, counting everything that comes after it (in bytes)               | 4               |
-| commandSize | The size of the protobuf-serialized command                                             | 4               |
-| message     | The protobuf message serialized in a raw binary format (rather than in protobuf format) |                 |
-
-### Payload commands
-
-Payload commands have this basic structure:
-
-| Component    | Description                                                                                 | Size (in bytes) |
-|:-------------|:--------------------------------------------------------------------------------------------|:----------------|
-| totalSize    | The size of the frame, counting everything that comes after it (in bytes)                   | 4               |
-| commandSize  | The size of the protobuf-serialized command                                                 | 4               |
-| message      | The protobuf message serialized in a raw binary format (rather than in protobuf format)     |                 |
-| magicNumber  | A 2-byte byte array (`0x0e01`) identifying the current format                               | 2               |
-| checksum     | A [CRC32-C checksum](http://www.evanjones.ca/crc32c.html) of everything that comes after it | 4               |
-| metadataSize | The size of the message [metadata](#message-metadata)                                       | 4               |
-| metadata     | The message [metadata](#message-metadata) stored as a binary protobuf message               |                 |
-| payload      | Anything left in the frame is considered the payload and can include any sequence of bytes  |                 |
-
-## Message metadata
-
-Message metadata is stored alongside the application-specified payload as a serialized protobuf message. Metadata is created by the producer and passed on unchanged to the consumer.
-
-| Field                                | Description                                                                                                                                                                                                                                               |
-|:-------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `producer_name`                      | The name of the producer that published the message                                                                                                                                                                                         |
-| `sequence_id`                        | The sequence ID of the message, assigned by producer}                                                                                                                                                                                        |
-| `publish_time`                       | The publish timestamp in Unix time (i.e. as the number of milliseconds since January 1st, 1970 in UTC)                                                                                                                                                    |
-| `properties`                         | A sequence of key/value pairs (using the [`KeyValue`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-common/src/main/proto/PulsarApi.proto#L32) message). These are application-defined keys and values with no special meaning to Pulsar. |
-| `replicated_from` *(optional)*       | Indicates that the message has been replicated and specifies the name of the [cluster](reference-terminology.md#cluster) where the message was originally published                                                                                                             |
-| `partition_key` *(optional)*         | While publishing on a partition topic, if the key is present, the hash of the key is used to determine which partition to choose                                                                                                                          |
-| `compression` *(optional)*           | Signals that payload has been compressed and with which compression library                                                                                                                                                                               |
-| `uncompressed_size` *(optional)*     | If compression is used, the producer must fill the uncompressed size field with the original payload size                                                                                                                                                 |
-| `num_messages_in_batch` *(optional)* | If this message is really a [batch](#batch-messages) of multiple entries, this field must be set to the number of messages in the batch                                                                                                                   |
-
-### Batch messages
-
-When using batch messages, the payload will be containing a list of entries,
-each of them with its individual metadata, defined by the `SingleMessageMetadata`
-object.
-
-
-For a single batch, the payload format will look like this:
-
-
-| Field         | Description                                                 |
-|:--------------|:------------------------------------------------------------|
-| metadataSizeN | The size of the single message metadata serialized Protobuf |
-| metadataN     | Single message metadata                                     |
-| payloadN      | Message payload passed by application                       |
-
-Each metadata field looks like this;
-
-| Field                      | Description                                             |
-|:---------------------------|:--------------------------------------------------------|
-| properties                 | Application-defined properties                          |
-| partition key *(optional)* | Key to indicate the hashing to a particular partition   |
-| payload_size               | Size of the payload for the single message in the batch |
-
-When compression is enabled, the whole batch will be compressed at once.
-
-## Interactions
-
-### Connection establishment
-
-After opening a TCP connection to a broker, typically on port 6650, the client
-is responsible to initiate the session.
-
-![Connect interaction](/assets/binary-protocol-connect.png)
-
-After receiving a `Connected` response from the broker, the client can
-consider the connection ready to use. Alternatively, if the broker doesn't
-validate the client authentication, it will reply with an `Error` command and
-close the TCP connection.
-
-Example:
-
-```protobuf
-
-message CommandConnect {
-  "client_version" : "Pulsar-Client-Java-v1.15.2",
-  "auth_method_name" : "my-authentication-plugin",
-  "auth_data" : "my-auth-data",
-  "protocol_version" : 6
-}
-
-```
-
-Fields:
- * `client_version` → String based identifier. Format is not enforced
- * `auth_method_name` → *(optional)* Name of the authentication plugin if auth
-   enabled
- * `auth_data` → *(optional)* Plugin specific authentication data
- * `protocol_version` → Indicates the protocol version supported by the
-   client. Broker will not send commands introduced in newer revisions of the
-   protocol. Broker might be enforcing a minimum version
-
-```protobuf
-
-message CommandConnected {
-  "server_version" : "Pulsar-Broker-v1.15.2",
-  "protocol_version" : 6
-}
-
-```
-
-Fields:
- * `server_version` → String identifier of broker version
- * `protocol_version` → Protocol version supported by the broker. Client
-   must not attempt to send commands introduced in newer revisions of the
-   protocol
-
-### Keep Alive
-
-To identify prolonged network partitions between clients and brokers or cases
-in which a machine crashes without interrupting the TCP connection on the remote
-end (eg: power outage, kernel panic, hard reboot...), we have introduced a
-mechanism to probe for the availability status of the remote peer.
-
-Both clients and brokers are sending `Ping` commands periodically and they will
-close the socket if a `Pong` response is not received within a timeout (default
-used by broker is 60s).
-
-A valid implementation of a Pulsar client is not required to send the `Ping`
-probe, though it is required to promptly reply after receiving one from the
-broker in order to prevent the remote side from forcibly closing the TCP connection.
-
-
-### Producer
-
-In order to send messages, a client needs to establish a producer. When creating
-a producer, the broker will first verify that this particular client is
-authorized to publish on the topic.
-
-Once the client gets confirmation of the producer creation, it can publish
-messages to the broker, referring to the producer id negotiated before.
-
-![Producer interaction](/assets/binary-protocol-producer.png)
-
-##### Command Producer
-
-```protobuf
-
-message CommandProducer {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "producer_id" : 1,
-  "request_id" : 1
-}
-
-```
-
-Parameters:
- * `topic` → Complete topic name to where you want to create the producer on
- * `producer_id` → Client generated producer identifier. Needs to be unique
-    within the same connection
- * `request_id` → Identifier for this request. Used to match the response with
-    the originating request. Needs to be unique within the same connection
- * `producer_name` → *(optional)* If a producer name is specified, the name will
-    be used, otherwise the broker will generate a unique name. Generated
-    producer name is guaranteed to be globally unique. Implementations are
-    expected to let the broker generate a new producer name when the producer
-    is initially created, then reuse it when recreating the producer after
-    reconnections.
-
-The broker will reply with either `ProducerSuccess` or `Error` commands.
-
-##### Command ProducerSuccess
-
-```protobuf
-
-message CommandProducerSuccess {
-  "request_id" :  1,
-  "producer_name" : "generated-unique-producer-name"
-}
-
-```
-
-Parameters:
- * `request_id` → Original id of the `CreateProducer` request
- * `producer_name` → Generated globally unique producer name or the name
-    specified by the client, if any.
-
-##### Command Send
-
-Command `Send` is used to publish a new message within the context of an
-already existing producer. This command is used in a frame that includes command
-as well as message payload, for which the complete format is specified in the [payload commands](#payload-commands) section.
-
-```protobuf
-
-message CommandSend {
-  "producer_id" : 1,
-  "sequence_id" : 0,
-  "num_messages" : 1
-}
-
-```
-
-Parameters:
- * `producer_id` → id of an existing producer
- * `sequence_id` → each message has an associated sequence id which is expected
-   to be implemented with a counter starting at 0. The `SendReceipt` that
-   acknowledges the effective publishing of a messages will refer to it by
-   its sequence id.
- * `num_messages` → *(optional)* Used when publishing a batch of messages at
-   once.
-
-##### Command SendReceipt
-
-After a message has been persisted on the configured number of replicas, the
-broker will send the acknowledgment receipt to the producer.
-
-```protobuf
-
-message CommandSendReceipt {
-  "producer_id" : 1,
-  "sequence_id" : 0,
-  "message_id" : {
-    "ledgerId" : 123,
-    "entryId" : 456
-  }
-}
-
-```
-
-Parameters:
- * `producer_id` → id of producer originating the send request
- * `sequence_id` → sequence id of the published message
- * `message_id` → message id assigned by the system to the published message
-   Unique within a single cluster. Message id is composed of 2 longs, `ledgerId`
-   and `entryId`, that reflect that this unique id is assigned when appending
-   to a BookKeeper ledger
-
-
-##### Command CloseProducer
-
-**Note**: *This command can be sent by either producer or broker*.
-
-When receiving a `CloseProducer` command, the broker will stop accepting any
-more messages for the producer, wait until all pending messages are persisted
-and then reply `Success` to the client.
-
-The broker can send a `CloseProducer` command to client when it's performing
-a graceful failover (eg: broker is being restarted, or the topic is being unloaded
-by load balancer to be transferred to a different broker).
-
-When receiving the `CloseProducer`, the client is expected to go through the
-service discovery lookup again and recreate the producer again. The TCP
-connection is not affected.
-
-### Consumer
-
-A consumer is used to attach to a subscription and consume messages from it.
-After every reconnection, a client needs to subscribe to the topic. If a
-subscription is not already there, a new one will be created.
-
-![Consumer](/assets/binary-protocol-consumer.png)
-
-#### Flow control
-
-After the consumer is ready, the client needs to *give permission* to the
-broker to push messages. This is done with the `Flow` command.
-
-A `Flow` command gives additional *permits* to send messages to the consumer.
-A typical consumer implementation will use a queue to accumulate these messages
-before the application is ready to consume them.
-
-After the application has dequeued a number of message, the consumer will
-send additional number of permits to allow the broker to push more messages.
-
-##### Command Subscribe
-
-```protobuf
-
-message CommandSubscribe {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "subscription" : "my-subscription-name",
-  "subType" : "Exclusive",
-  "consumer_id" : 1,
-  "request_id" : 1
-}
-
-```
-
-Parameters:
- * `topic` → Complete topic name to where you want to create the consumer on
- * `subscription` → Subscription name
- * `subType` → Subscription type: Exclusive, Shared, Failover
- * `consumer_id` → Client generated consumer identifier. Needs to be unique
-    within the same connection
- * `request_id` → Identifier for this request. Used to match the response with
-    the originating request. Needs to be unique within the same connection
- * `consumer_name` → *(optional)* Clients can specify a consumer name. This
-    name can be used to track a particular consumer in the stats. Also, in
-    Failover subscription type, the name is used to decide which consumer is
-    elected as *master* (the one receiving messages): consumers are sorted by
-    their consumer name and the first one is elected master.
-
-##### Command Flow
-
-```protobuf
-
-message CommandFlow {
-  "consumer_id" : 1,
-  "messagePermits" : 1000
-}
-
-```
-
-Parameters:
-* `consumer_id` → Id of an already established consumer
-* `messagePermits` → Number of additional permits to grant to the broker for
-  pushing more messages
-
-##### Command Message
-
-Command `Message` is used by the broker to push messages to an existing consumer,
-within the limits of the given permits.
-
-
-This command is used in a frame that includes the message payload as well, for
-which the complete format is specified in the [payload commands](#payload-commands)
-section.
-
-```protobuf
-
-message CommandMessage {
-  "consumer_id" : 1,
-  "message_id" : {
-    "ledgerId" : 123,
-    "entryId" : 456
-  }
-}
-
-```
-
-##### Command Ack
-
-An `Ack` is used to signal to the broker that a given message has been
-successfully processed by the application and can be discarded by the broker.
-
-In addition, the broker will also maintain the consumer position based on the
-acknowledged messages.
-
-```protobuf
-
-message CommandAck {
-  "consumer_id" : 1,
-  "ack_type" : "Individual",
-  "message_id" : {
-    "ledgerId" : 123,
-    "entryId" : 456
-  }
-}
-
-```
-
-Parameters:
- * `consumer_id` → Id of an already established consumer
- * `ack_type` → Type of acknowledgment: `Individual` or `Cumulative`
- * `message_id` → Id of the message to acknowledge
- * `validation_error` → *(optional)* Indicates that the consumer has discarded
-   the messages due to: `UncompressedSizeCorruption`,
-   `DecompressionError`, `ChecksumMismatch`, `BatchDeSerializeError`
-
-##### Command CloseConsumer
-
-***Note***: **This command can be sent by either producer or broker*.
-
-This command behaves the same as [`CloseProducer`](#command-closeproducer)
-
-##### Command RedeliverUnacknowledgedMessages
-
-A consumer can ask the broker to redeliver some or all of the pending messages
-that were pushed to that particular consumer and not yet acknowledged.
-
-The protobuf object accepts a list of message ids that the consumer wants to
-be redelivered. If the list is empty, the broker will redeliver all the
-pending messages.
-
-On redelivery, messages can be sent to the same consumer or, in the case of a
-shared subscription, spread across all available consumers.
-
-
-##### Command ReachedEndOfTopic
-
-This is sent by a broker to a particular consumer, whenever the topic
-has been "terminated" and all the messages on the subscription were
-acknowledged.
-
-The client should use this command to notify the application that no more
-messages are coming from the consumer.
-
-##### Command ConsumerStats
-
-This command is sent by the client to retrieve Subscriber and Consumer level 
-stats from the broker.
-Parameters:
- * `request_id` → Id of the request, used to correlate the request 
-      and the response.
- * `consumer_id` → Id of an already established consumer.
-
-##### Command ConsumerStatsResponse
-
-This is the broker's response to ConsumerStats request by the client. 
-It contains the Subscriber and Consumer level stats of the `consumer_id` sent in the request.
-If the `error_code` or the `error_message` field is set it indicates that the request has failed.
-
-##### Command Unsubscribe
-
-This command is sent by the client to unsubscribe the `consumer_id` from the associated topic.
-Parameters:
- * `request_id` → Id of the request.
- * `consumer_id` → Id of an already established consumer which needs to unsubscribe.
-
-
-## Service discovery
-
-### Topic lookup
-
-Topic lookup needs to be performed each time a client needs to create or
-reconnect a producer or a consumer. Lookup is used to discover which particular
-broker is serving the topic we are about to use.
-
-Lookup can be done with a REST call as described in the [admin API](admin-api-persistent-topics.md#lookup-of-topic)
-docs.
-
-Since Pulsar-1.16 it is also possible to perform the lookup within the binary
-protocol.
-
-For the sake of example, let's assume we have a service discovery component
-running at `pulsar://broker.example.com:6650`
-
-Individual brokers will be running at `pulsar://broker-1.example.com:6650`,
-`pulsar://broker-2.example.com:6650`, ...
-
-A client can use a connection to the discovery service host to issue a
-`LookupTopic` command. The response can either be a broker hostname to
-connect to, or a broker hostname to which retry the lookup.
-
-The `LookupTopic` command has to be used in a connection that has already
-gone through the `Connect` / `Connected` initial handshake.
-
-![Topic lookup](/assets/binary-protocol-topic-lookup.png)
-
-```protobuf
-
-message CommandLookupTopic {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "request_id" : 1,
-  "authoritative" : false
-}
-
-```
-
-Fields:
- * `topic` → Topic name to lookup
- * `request_id` → Id of the request that will be passed with its response
- * `authoritative` → Initial lookup request should use false. When following a
-   redirect response, client should pass the same value contained in the
-   response
-
-##### LookupTopicResponse
-
-Example of response with successful lookup:
-
-```protobuf
-
-message CommandLookupTopicResponse {
-  "request_id" : 1,
-  "response" : "Connect",
-  "brokerServiceUrl" : "pulsar://broker-1.example.com:6650",
-  "brokerServiceUrlTls" : "pulsar+ssl://broker-1.example.com:6651",
-  "authoritative" : true
-}
-
-```
-
-Example of lookup response with redirection:
-
-```protobuf
-
-message CommandLookupTopicResponse {
-  "request_id" : 1,
-  "response" : "Redirect",
-  "brokerServiceUrl" : "pulsar://broker-2.example.com:6650",
-  "brokerServiceUrlTls" : "pulsar+ssl://broker-2.example.com:6651",
-  "authoritative" : true
-}
-
-```
-
-In this second case, we need to reissue the `LookupTopic` command request
-to `broker-2.example.com` and this broker will be able to give a definitive
-answer to the lookup request.
-
-### Partitioned topics discovery
-
-Partitioned topics metadata discovery is used to find out if a topic is a
-"partitioned topic" and how many partitions were set up.
-
-If the topic is marked as "partitioned", the client is expected to create
-multiple producers or consumers, one for each partition, using the `partition-X`
-suffix.
-
-This information only needs to be retrieved the first time a producer or
-consumer is created. There is no need to do this after reconnections.
-
-The discovery of partitioned topics metadata works very similar to the topic
-lookup. The client send a request to the service discovery address and the
-response will contain actual metadata.
-
-##### Command PartitionedTopicMetadata
-
-```protobuf
-
-message CommandPartitionedTopicMetadata {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "request_id" : 1
-}
-
-```
-
-Fields:
- * `topic` → the topic for which to check the partitions metadata
- * `request_id` → Id of the request that will be passed with its response
-
-
-##### Command PartitionedTopicMetadataResponse
-
-Example of response with metadata:
-
-```protobuf
-
-message CommandPartitionedTopicMetadataResponse {
-  "request_id" : 1,
-  "response" : "Success",
-  "partitions" : 32
-}
-
-```
-
-## Protobuf interface
-
-All Pulsar's Protobuf definitions can be found {@inject: github:here:/pulsar-common/src/main/proto/PulsarApi.proto}.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-api.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-api.md
deleted file mode 100644
index 36f8586e88b0a..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-api.md
+++ /dev/null
@@ -1,775 +0,0 @@
----
-id: functions-api
-title: The Pulsar Functions API
-sidebar_label: "API"
-original_id: functions-api
----
-
-[Pulsar Functions](functions-overview.md) provides an easy-to-use API that developers can use to create and manage processing logic for the Apache Pulsar messaging system. With Pulsar Functions, you can write functions of any level of complexity in [Java](#functions-for-java) or [Python](#functions-for-python) and run them in conjunction with a Pulsar cluster without needing to run a separate stream processing engine.
-
-> For a more in-depth overview of the Pulsar Functions feature, see the [Pulsar Functions overview](functions-overview.md).
-
-## Core programming model
-
-Pulsar Functions provide a wide range of functionality but are based on a very simple programming model. You can think of Pulsar Functions as lightweight processes that
-
-* consume messages from one or more Pulsar topics and then
-* apply some user-defined processing logic to each incoming message. That processing logic could be just about anything you want, including
-  * producing the resulting, processed message on another Pulsar topic, or
-  * doing something else with the message, such as writing results to an external database.
-
-You could use Pulsar Functions, for example, to set up the following processing chain:
-
-* A [Python](#functions-for-python) function listens on the `raw-sentences` topic and "[sanitizes](#example-function)" incoming strings (removing extraneous whitespace and converting all characters to lower case) and then publishes the results to a `sanitized-sentences` topic
-* A [Java](#functions-for-java) function listens on the `sanitized-sentences` topic, counts the number of times each word appears within a specified time window, and publishes the results to a `results` topic
-* Finally, a Python function listens on the `results` topic and writes the results to a MySQL table
-
-### Example function
-
-Here's an example "input sanitizer" function written in Python and stored in a `sanitizer.py` file:
-
-```python
-
-def clean_string(s):
-    return s.strip().lower()
-
-def process(input):
-    return clean_string(input)
-
-```
-
-Some things to note about this Pulsar Function:
-
-* There is no client, producer, or consumer object involved. All message "plumbing" is already taken care of for you, enabling you to worry only about processing logic.
-* No topics, subscription types, tenants, or namespaces are specified in the function logic itself. Instead, topics are specified upon [deployment](#example-deployment). This means that you can use and re-use Pulsar Functions across topics, tenants, and namespaces without needing to hard-code those attributes.
-
-### Example deployment
-
-Deploying Pulsar Functions is handled by the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool, in particular the [`functions`](reference-pulsar-admin.md#functions) command. Here's an example command that would run our [sanitizer](#example-function) function from above in [local run](functions-deploying.md#local-run-mode) mode:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --py sanitizer.py \          # The Python file with the function's code
-  --className sanitizer \      # The class or function holding the processing logic
-  --tenant public \            # The function's tenant (derived from the topic name by default)
-  --namespace default \        # The function's namespace (derived from the topic name by default)
-  --name sanitizer-function \  # The name of the function (the class name by default)
-  --inputs dirty-strings-in \  # The input topic(s) for the function
-  --output clean-strings-out \ # The output topic for the function
-  --logTopic sanitizer-logs    # The topic to which all functions logs are published
-
-```
-
-For instructions on running functions in your Pulsar cluster, see the [Deploying Pulsar Functions](functions-deploying.md) guide.
-
-### Available APIs
-
-In both Java and Python, you have two options for writing Pulsar Functions:
-
-Interface | Description | Use cases
-:---------|:------------|:---------
-Language-native interface | No Pulsar-specific libraries or special dependencies required (only core libraries from Java/Python) | Functions that don't require access to the function's [context](#context)
-Pulsar Function SDK for Java/Python | Pulsar-specific libraries that provide a range of functionality not provided by "native" interfaces | Functions that require access to the function's [context](#context)
-
-In Python, for example, this language-native function, which adds an exclamation point to all incoming strings and publishes the resulting string to a topic, would have no external dependencies:
-
-```python
-
-def process(input):
-    return "{}!".format(input)
-
-```
-
-This function, however, would use the Pulsar Functions [SDK for Python](#python-sdk-functions):
-
-```python
-
-from pulsar import Function
-
-class DisplayFunctionName(Function):
-    def process(self, input, context):
-        function_name = context.function_name()
-        return "The function processing this message has the name {0}".format(function_name)
-
-```
-
-### Serialization and deserialization (SerDe)
-
-SerDe stands for **Ser**ialization and **De**serialization. All Pulsar Functions use SerDe for message handling. How SerDe works by default depends on the language you're using for a particular function:
-
-* In [Python](#python-serde), the default SerDe is identity, meaning that the type is serialized as whatever type the producer function returns
-* In [Java](#java-serde), a number of commonly used types (`String`s, `Integer`s, etc.) are supported by default
-
-In both languages, however, you can write your own custom SerDe logic for more complex, application-specific types. See the docs for [Java](#java-serde) and [Python](#python-serde) for language-specific instructions.
-
-### Context
-
-Both the [Java](#java-sdk-functions) and [Python](#python-sdk-functions) SDKs provide access to a **context object** that can be used by the function. This context object provides a wide variety of information and functionality to the function:
-
-* The name and ID of the Pulsar Function
-* The message ID of each message. Each Pulsar message is automatically assigned an ID.
-* The name of the topic on which the message was sent
-* The names of all input topics as well as the output topic associated with the function
-* The name of the class used for [SerDe](#serialization-and-deserialization-serde)
-* The [tenant](reference-terminology.md#tenant) and namespace associated with the function
-* The ID of the Pulsar Functions instance running the function
-* The version of the function
-* The [logger object](functions-overview.md#logging) used by the function, which can be used to create function log messages
-* Access to arbitrary [user config](#user-config) values supplied via the CLI
-* An interface for recording [metrics](functions-metrics.md)
-* An interface for storing and retrieving state in [state storage](functions-overview.md#state-storage)
-
-### User config
-
-When you run or update Pulsar Functions created using the [SDK](#available-apis), you can pass arbitrary key/values to them via the command line with the `--userConfig` flag. Key/values must be specified as JSON. Here's an example of a function creation command that passes a user config key/value to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name word-filter \
-  # Other function configs
-  --userConfig '{"forbidden-word":"rosebud"}'
-
-```
-
-If the function were a Python function, that config value could be accessed like this:
-
-```python
-
-from pulsar import Function
-
-class WordFilter(Function):
-    def process(self, context, input):
-        forbidden_word = context.user_config()["forbidden-word"]
-
-        # Don't publish the message if it contains the user-supplied
-        # forbidden word
-        if forbidden_word in input:
-            pass
-        # Otherwise publish the message
-        else:
-            return input
-
-```
-
-## Functions for Java
-
-Writing Pulsar Functions in Java involves implementing one of two interfaces:
-
-* The [`java.util.Function`](https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html) interface
-* The {@inject: javadoc:Function:/pulsar-functions/org/apache/pulsar/functions/api/Function} interface. This interface works much like the `java.util.Function` interface, but with the important difference that it provides a {@inject: javadoc:Context:/pulsar-functions/org/apache/pulsar/functions/api/Context} object that you can use in a [variety of ways](#context)
-
-### Getting started
-
-In order to write Pulsar Functions in Java, you'll need to install the proper [dependencies](#dependencies) and package your function [as a JAR](#packaging).
-
-#### Dependencies
-
-How you get started writing Pulsar Functions in Java depends on which API you're using:
-
-* If you're writing a [Java native function](#java-native-functions), you won't need any external dependencies.
-* If you're writing a [Java SDK function](#java-sdk-functions), you'll need to import the `pulsar-functions-api` library.
-
-  Here's an example for a Maven `pom.xml` configuration file:
-
-  ```xml
-  
-  
-    org.apache.pulsar
-    pulsar-functions-api
-    2.0.0-incubating-SNAPSHOT
-  
-  
-  ```
-
-  Here's an example for a Gradle `build.gradle` configuration file:
-
-  ```groovy
-  
-  dependencies {
-  compile group: 'org.apache.pulsar', name: 'pulsar-functions-api', version: '2.0.0-incubating-SNAPSHOT'
-  }
-  
-  ```
-
-#### Packaging
-
-Whether you're writing Java Pulsar Functions using the [native](#java-native-functions) Java `java.util.Function` interface or using the [Java SDK](#java-sdk-functions), you'll need to package your function(s) as a "fat" JAR.
-
-> #### Starter repo
-> If you'd like to get up and running quickly, you can use [this repo](https://github.com/streamlio/pulsar-functions-java-starter), which contains the necessary Maven configuration to build a fat JAR as well as some example functions.
-
-### Java native functions
-
-If your function doesn't require access to its [context](#context), you can create a Pulsar Function by implementing the [`java.util.Function`](https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html) interface, which has this very simple, single-method signature:
-
-```java
-
-public interface Function {
-    O apply(I input);
-}
-
-```
-
-Here's an example function that takes a string as its input, adds an exclamation point to the end of the string, and then publishes the resulting string:
-
-```java
-
-import java.util.Function;
-
-public class ExclamationFunction implements Function {
-    @Override
-    public String process(String input) {
-        return String.format("%s!", input);
-    }
-}
-
-```
-
-In general, you should use native functions when you don't need access to the function's [context](#context). If you *do* need access to the function's context, then we recommend using the [Pulsar Functions Java SDK](#java-sdk-functions).
-
-#### Java native examples
-
-There is one example Java native function in this {@inject: github:folder:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples}:
-
-* {@inject: github:JavaNativeExclamationFunction:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java}
-
-### Java SDK functions
-
-To get started developing Pulsar Functions using the Java SDK, you'll need to add a dependency on the `pulsar-functions-api` artifact to your project. Instructions can be found [above](#dependencies).
-
-> An easy way to get up and running with Pulsar Functions in Java is to clone the [`pulsar-functions-java-starter`](https://github.com/streamlio/pulsar-functions-java-starter) repo and follow the instructions there.
-
-
-#### Java SDK examples
-
-There are several example Java SDK functions in this {@inject: github:folder:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples}:
-
-Function name | Description
-:-------------|:-----------
-[`ContextFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ContextFunction.java) | Illustrates [context](#context)-specific functionality like [logging](#java-logging) and [metrics](#java-metrics)
-[`WordCountFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java) | Illustrates usage of Pulsar Function [state-storage](functions-overview.md#state-storage)
-[`ExclamationFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java) | A basic string manipulation function for the Java SDK [`LoggingFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/LoggingFunction.java) | A function that shows how [logging](#java-logging) works for Java [`PublishFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java) | Publishes results to a topic specified in the function's [user config](#java-user-config) (rather than on the function's output topic)
-[`UserConfigFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java) | A function that consumes [user-supplied configuration](#java-user-config) values [`UserMetricFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java) | A function that records metrics [`VoidFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java)  | A simple [void function](#void-functions)
-
-### Java context object
-
-The {@inject: javadoc:Context:/client/org/apache/pulsar/functions/api/Context} interface provides a number of methods that you can use to access the function's [context](#context). The various method signatures for the `Context` interface are listed below:
-
-```java
-
-public interface Context {
-    byte[] getMessageId();
-    String getTopicName();
-    Collection getSourceTopics();
-    String getSinkTopic();
-    String getOutputSerdeClassName();
-    String getTenant();
-    String getNamespace();
-    String getFunctionName();
-    String getFunctionId();
-    String getInstanceId();
-    String getFunctionVersion();
-    Logger getLogger();
-    Map getUserConfigMap();
-    Optional getUserConfigValue(String key);
-    String getUserConfigValueOrDefault(String key, String default);
-    void recordMetric(String metricName, double value);
-     CompletableFuture publish(String topicName, O object, String serDeClassName);
-     CompletableFuture publish(String topicName, O object);
-    CompletableFuture ack(byte[] messageId, String topic);
-}
-
-```
-
-Here's an example function that uses several methods available via the `Context` object:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-import java.util.stream.Collectors;
-
-public class ContextFunction implements Function {
-    public Void process(String input, Context context) {
-        Logger LOG = context.getLogger();
-        String inputTopics = context.getInputTopics().stream().collect(Collectors.joining(", "));
-        String functionName = context.getFunctionName();
-
-        String logMessage = String.format("A message with a value of \"%s\" has arrived on one of the following topics: %s\n",
-                input,
-                inputTopics);
-
-        LOG.info(logMessage);
-
-        String metricName = String.format("function-%s-messages-received", functionName);
-        context.recordMetric(metricName, 1);
-
-        return null;
-    }
-}
-
-```
-
-### Void functions
-
-Pulsar Functions can publish results to an output topic, but this isn't required. You can also have functions that simply produce a log, write results to a database, etc. Here's a function that writes a simple log every time a message is received:
-
-```java
-
-import org.slf4j.Logger;
-
-public class LogFunction implements PulsarFunction {
-    public String apply(String input, Context context) {
-        Logger LOG = context.getLogger();
-        LOG.info("The following message was received: {}", input);
-        return null;
-    }
-}
-
-```
-
-> When using Java functions in which the output type is `Void`, the function must *always* return `null`.
-
-### Java SerDe
-
-Pulsar Functions use [SerDe](#serialization-and-deserialization-serde) when publishing data to and consuming data from Pulsar topics. When you're writing Pulsar Functions in Java, the following basic Java types are built in and supported by default:
-
-* `String`
-* `Double`
-* `Integer`
-* `Float`
-* `Long`
-* `Short`
-* `Byte`
-
-Built-in vs. custom. For custom, you need to implement this interface:
-
-```java
-
-public interface SerDe {
-    T deserialize(byte[] input);
-    byte[] serialize(T input);
-}
-
-```
-
-#### Java SerDe example
-
-Imagine that you're writing Pulsar Functions in Java that are processing tweet objects. Here's a simple example `Tweet` class:
-
-```java
-
-public class Tweet {
-    private String username;
-    private String tweetContent;
-
-    public Tweet(String username, String tweetContent) {
-        this.username = username;
-        this.tweetContent = tweetContent;
-    }
-
-    // Standard setters and getters
-}
-
-```
-
-In order to be able to pass `Tweet` objects directly between Pulsar Functions, you'll need to provide a custom SerDe class. In the example below, `Tweet` objects are basically strings in which the username and tweet content are separated by a `|`.
-
-```java
-
-package com.example.serde;
-
-import org.apache.pulsar.functions.api.SerDe;
-
-import java.util.regex.Pattern;
-
-public class TweetSerde implements SerDe {
-    public Tweet deserialize(byte[] input) {
-        String s = new String(input);
-        String[] fields = s.split(Pattern.quote("|"));
-        return new Tweet(fields[0], fields[1]);
-    }
-
-    public byte[] serialize(Tweet input) {
-        return "%s|%s".format(input.getUsername(), input.getTweetContent()).getBytes();
-    }
-}
-
-```
-
-To apply this custom SerDe to a particular Pulsar Function, you would need to:
-
-* Package the `Tweet` and `TweetSerde` classes into a JAR
-* Specify a path to the JAR and SerDe class name when deploying the function
-
-Here's an example [`create`](reference-pulsar-admin.md#create-1) operation:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar /path/to/your.jar \
-  --outputSerdeClassName com.example.serde.TweetSerde \
-  # Other function attributes
-
-```
-
-> #### Custom SerDe classes must be packaged with your function JARs
-> Pulsar does not store your custom SerDe classes separately from your Pulsar Functions. That means that you'll need to always include your SerDe classes in your function JARs. If not, Pulsar will return an error.
-
-### Java logging
-
-Pulsar Functions that use the [Java SDK](#java-sdk-functions) have access to an [SLF4j](https://www.slf4j.org/) [`Logger`](https://www.slf4j.org/api/org/apache/log4j/Logger.html) object that can be used to produce logs at the chosen log level. Here's a simple example function that logs either a `WARNING`- or `INFO`-level log based on whether the incoming string contains the word `danger`:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-public class LoggingFunction implements Function {
-    @Override
-    public void apply(String input, Context context) {
-        Logger LOG = context.getLogger();
-        String messageId = new String(context.getMessageId());
-
-        if (input.contains("danger")) {
-            LOG.warn("A warning was received in message {}", messageId);
-        } else {
-            LOG.info("Message {} received\nContent: {}", messageId, input);
-        }
-
-        return null;
-    }
-}
-
-```
-
-If you want your function to produce logs, you need to specify a log topic when creating or running the function. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar my-functions.jar \
-  --className my.package.LoggingFunction \
-  --logTopic persistent://public/default/logging-function-logs \
-  # Other function configs
-
-```
-
-Now, all logs produced by the `LoggingFunction` above can be accessed via the `persistent://public/default/logging-function-logs` topic.
-
-### Java user config
-
-The Java SDK's [`Context`](#context) object enables you to access key/value pairs provided to the Pulsar Function via the command line (as JSON). Here's an example function creation command that passes a key/value pair:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  # Other function configs
-  --userConfig '{"word-of-the-day":"verdure"}'
-
-```
-
-To access that value in a Java function:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-import java.util.Optional;
-
-public class UserConfigFunction implements Function {
-    @Override
-    public void apply(String input, Context context) {
-        Logger LOG = context.getLogger();
-        Optional wotd = context.getUserConfigValue("word-of-the-day");
-        if (wotd.isPresent()) {
-            LOG.info("The word of the day is {}", wotd);
-        } else {
-            LOG.warn("No word of the day provided");
-        }
-        return null;
-    }
-}
-
-```
-
-The `UserConfigFunction` function will log the string `"The word of the day is verdure"` every time the function is invoked (i.e. every time a message arrives). The `word-of-the-day` user config will be changed only when the function is updated with a new config value via the command line.
-
-You can also access the entire user config map or set a default value in case no value is present:
-
-```java
-
-// Get the whole config map
-Map allConfigs = context.getUserConfigMap();
-
-// Get value or resort to default
-String wotd = context.getUserConfigValueOrDefault("word-of-the-day", "perspicacious");
-
-```
-
-> For all key/value pairs passed to Java Pulsar Functions, both the key *and* the value are `String`s. If you'd like the value to be of a different type, you will need to deserialize from the `String` type.
-
-### Java metrics
-
-You can record metrics using the [`Context`](#context) object on a per-key basis. You can, for example, set a metric for the key `process-count` and a different metric for the key `elevens-count` every time the function processes a message. Here's an example:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-
-public class MetricRecorderFunction implements Function {
-    @Override
-    public void apply(Integer input, Context context) {
-        // Records the metric 1 every time a message arrives
-        context.recordMetric("hit-count", 1);
-
-        // Records the metric only if the arriving number equals 11
-        if (input == 11) {
-            context.recordMetric("elevens-count", 1);
-        }
-
-        return null;
-    }
-}
-
-```
-
-> For instructions on reading and using metrics, see the [Monitoring](deploy-monitoring.md) guide.
-
-
-## Functions for Python
-
-Writing Pulsar Functions in Python entails implementing one of two things:
-
-* A `process` function that takes an input (message data from the function's input topic(s)), applies some kind of logic to it, and either returns an object (to be published to the function's output topic) or `pass`es and thus doesn't produce a message
-* A `Function` class that has a `process` method that provides a message input to process and a [context](#context) object
-
-### Getting started
-
-Regardless of which [deployment mode](functions-deploying.md) you're using, you'll need to install the following Python libraries on any machine that's running Pulsar Functions written in Python:
-
-* pulsar-client
-* protobuf
-* futures
-* grpcio
-* grpcio-tools
-
-That could be your local machine for [local run mode](functions-deploying.md#local-run-mode) or a machine running a Pulsar [broker](reference-terminology.md#broker) for [cluster mode](functions-deploying.md#cluster-mode). To install those libraries using pip:
-
-```bash
-
-$ pip install pulsar-client protobuf futures grpcio grpcio-tools
-
-```
-
-### Packaging
-
-At the moment, the code for Pulsar Functions written in Python must be contained within a single Python file. In the future, Pulsar Functions may support other packaging formats, such as [**P**ython **EX**ecutables](https://github.com/pantsbuild/pex) (PEXes).
-
-### Python native functions
-
-If your function doesn't require access to its [context](#context), you can create a Pulsar Function by implementing a `process` function, which provides a single input object that you can process however you wish. Here's an example function that takes a string as its input, adds an exclamation point at the end of the string, and then publishes the resulting string:
-
-```python
-
-def process(input):
-    return "{0}!".format(input)
-
-```
-
-In general, you should use native functions when you don't need access to the function's [context](#context). If you *do* need access to the function's context, then we recommend using the [Pulsar Functions Python SDK](#python-sdk-functions).
-
-#### Python native examples
-
-There is one example Python native function in this {@inject: github:folder:/pulsar-functions/python-examples}:
-
-* {@inject: github:`native_exclamation_function.py`:/pulsar-functions/python-examples/native_exclamation_function.py}
-
-### Python SDK functions
-
-To get started developing Pulsar Functions using the Python SDK, you'll need to install the [`pulsar-client`](/api/python) library using the instructions [above](#getting-started).
-
-#### Python SDK examples
-
-There are several example Python functions in this {@inject: github:folder:/pulsar-functions/python-examples}:
-
-Function file | Description
-:-------------|:-----------
-[`exclamation_function.py`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/python-examples/exclamation_function.py) | Adds an exclamation point at the end of each incoming string [`logging_function.py`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/python-examples/logging_function.py) | Logs each incoming message [`thumbnailer.py`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/python-examples/thumbnailer.py) | Takes image data as input and outputs a 128x128 thumbnail of each image
-
-#### Python context object
-
-The [`Context`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/context.py) class provides a number of methods that you can use to access the function's [context](#context). The various methods for the `Context` class are listed below:
-
-Method | What it provides
-:------|:----------------
-`get_message_id` | The message ID of the message being processed
-`get_topic_name` | The input topic of the message being processed
-`get_function_name` | The name of the current Pulsar Function
-`get_function_id` | The ID of the current Pulsar Function
-`get_instance_id` | The ID of the current Pulsar Functions instance
-`get_function_version` | The version of the current Pulsar Function
-`get_logger` | A logger object that can be used for [logging](#python-logging)
-`get_user_config_value` | Returns the value of a [user-defined config](#python-user-config) (or `None` if the config doesn't exist)
-`get_user_config_map` | Returns the entire user-defined config as a dict
-`record_metric` | Records a per-key [metric](#python-metrics)
-`publish` | Publishes a message to the specified Pulsar topic
-`get_output_serde_class_name` | The name of the output [SerDe](#python-serde) class
-`ack` | [Acks](reference-terminology.md#acknowledgment-ack) the message being processed to Pulsar
-
-### Python SerDe
-
-Pulsar Functions use [SerDe](#serialization-and-deserialization-serde) when publishing data to and consuming data from Pulsar topics (this is true of both [native](#python-native-functions) functions and [SDK](#python-sdk-functions) functions). You can specify the SerDe when [creating](functions-deploying.md#cluster-mode) or [running](functions-deploying.md#local-run-mode) functions. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --tenant public \
-  --namespace default \
-  --name my_function \
-  --py my_function.py \
-  --className my_function.MyFunction \
-  --customSerdeInputs '{"input-topic-1":"Serde1","input-topic-2":"Serde2"}' \
-  --outputSerdeClassName Serde3 \
-  --output output-topic-1
-
-```
-
-In this case, there are two input topics, `input-topic-1` and `input-topic-2`, each of which is mapped to a different SerDe class (the map must be specified as a JSON string). The output topic, `output-topic-1`, uses the `Serde3` class for SerDe. At the moment, all Pulsar Function logic, include processing function and SerDe classes, must be contained within a single Python file.
-
-When using Pulsar Functions for Python, you essentially have three SerDe options:
-
-1. You can use the [`IdentitySerde`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L70), which leaves the data unchanged. The `IdentitySerDe` is the **default**. Creating or running a function without explicitly specifying SerDe will mean that this option is used.
-2. You can use the [`PickeSerDe`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L62), which uses Python's [`pickle`](https://docs.python.org/3/library/pickle.html) for SerDe.
-3. You can create a custom SerDe class by implementing the baseline [`SerDe`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L50) class, which has just two methods: [`serialize`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L53) for converting the object into bytes, and [`deserialize`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L58) for converting bytes into an object of the required application-specific type.
-
-The table below shows when you should use each SerDe:
-
-SerDe option | When to use
-:------------|:-----------
-`IdentitySerde` | When you're working with simple types like strings, Booleans, integers, and the like
-`PickleSerDe` | When you're working with complex, application-specific types and are comfortable with `pickle`'s "best effort" approach
-Custom SerDe | When you require explicit control over SerDe, potentially for performance or data compatibility purposes
-
-#### Python SerDe example
-
-Imagine that you're writing Pulsar Functions in Python that are processing tweet objects. Here's a simple `Tweet` class:
-
-```python
-
-class Tweet(object):
-    def __init__(self, username, tweet_content):
-        self.username = username
-        self.tweet_content = tweet_content
-
-```
-
-In order to use this class in Pulsar Functions, you'd have two options:
-
-1. You could specify `PickleSerDe`, which would apply the [`pickle`](https://docs.python.org/3/library/pickle.html) library's SerDe
-1. You could create your own SerDe class. Here's a simple example:
-
-  ```python
-  
-  from pulsar import SerDe
-
-  class TweetSerDe(SerDe):
-     def __init__(self, tweet):
-         self.tweet = tweet
-
-     def serialize(self, input):
-         return bytes("{0}|{1}".format(self.tweet.username, self.tweet.tweet_content))
-
-     def deserialize(self, input_bytes):
-         tweet_components = str(input_bytes).split('|')
-         return Tweet(tweet_components[0], tweet_componentsp[1])
-  
-  ```
-
-### Python logging
-
-Pulsar Functions that use the [Python SDK](#python-sdk-functions) have access to a logging object that can be used to produce logs at the chosen log level. Here's a simple example function that logs either a `WARNING`- or `INFO`-level log based on whether the incoming string contains the word `danger`:
-
-```python
-
-from pulsar import Function
-
-class LoggingFunction(Function):
-    def process(self, input, context):
-        logger = context.get_logger()
-        msg_id = context.get_message_id()
-        if 'danger' in input:
-            logger.warn("A warning was received in message {0}".format(context.get_message_id()))
-        else:
-            logger.info("Message {0} received\nContent: {1}".format(msg_id, input))
-
-```
-
-If you want your function to produce logs on a Pulsar topic, you need to specify a **log topic** when creating or running the function. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py logging_function.py \
-  --className logging_function.LoggingFunction \
-  --logTopic logging-function-logs \
-  # Other function configs
-
-```
-
-Now, all logs produced by the `LoggingFunction` above can be accessed via the `logging-function-logs` topic.
-
-### Python user config
-
-The Python SDK's [`Context`](#context) object enables you to access key/value pairs provided to the Pulsar Function via the command line (as JSON). Here's an example function creation command that passes a key/value pair:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  # Other function configs \
-  --userConfig '{"word-of-the-day":"verdure"}'
-
-```
-
-To access that value in a Python function:
-
-```python
-
-from pulsar import Function
-
-class UserConfigFunction(Function):
-    def process(self, input, context):
-        logger = context.get_logger()
-        wotd = context.get_user_config_value('word-of-the-day')
-        if wotd is None:
-            logger.warn('No word of the day provided')
-        else:
-            logger.info("The word of the day is {0}".format(wotd))
-
-```
-
-### Python metrics
-
-You can record metrics using the [`Context`](#context) object on a per-key basis. You can, for example, set a metric for the key `process-count` and a different metric for the key `elevens-count` every time the function processes a message. Here's an example:
-
-```python
-
-from pulsar import Function
-
-class MetricRecorderFunction(Function):
-    def process(self, input, context):
-        context.record_metric('hit-count', 1)
-
-        if input == 11:
-            context.record_metric('elevens-count', 1)
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-deploying.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-deploying.md
deleted file mode 100644
index dfc6dd6795dd2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-deploying.md
+++ /dev/null
@@ -1,261 +0,0 @@
----
-id: functions-deploying
-title: Deploying and managing Pulsar Functions
-sidebar_label: "Deploying functions"
-original_id: functions-deploying
----
-
-At the moment, there are two deployment modes available for Pulsar Functions:
-
-Mode | Description
-:----|:-----------
-Local run mode | The function runs in your local environment, for example on your laptop
-Cluster mode | The function runs *inside of* your Pulsar cluster, on the same machines as your Pulsar brokers
-
-> #### Contributing new deployment modes
-> The Pulsar Functions feature was designed, however, with extensibility in mind. Other deployment options will be available in the future. If you'd like to add a new deployment option, we recommend getting in touch with the Pulsar developer community at [dev@pulsar.incubator.apache.org](mailto:dev@pulsar.incubator.apache.org).
-
-## Requirements
-
-In order to deploy and manage Pulsar Functions, you need to have a Pulsar cluster running. There are several options for this:
-
-* You can run a [standalone cluster](getting-started-standalone.md) locally on your own machine
-* You can deploy a Pulsar cluster on [Kubernetes](deploy-kubernetes.md), [Amazon Web Services](deploy-aws.md), [bare metal](deploy-bare-metal.md), [DC/OS](https://dcos.io/), and more
-
-If you're running a non-[standalone](reference-terminology.md#standalone) cluster, you'll need to obtain the service URL for the cluster. How you obtain the service URL will depend on how you deployed your Pulsar cluster.
-
-If you're going to deploy and trigger python user-defined functions, you should install [the pulsar python client](http://pulsar.apache.org/docs/en/client-libraries-python/) first.
-
-## Command-line interface
-
-Pulsar Functions are deployed and managed using the [`pulsar-admin functions`](reference-pulsar-admin.md#functions) interface, which contains commands such as [`create`](reference-pulsar-admin.md#functions-create) for deploying functions in [cluster mode](#cluster-mode), [`trigger`](reference-pulsar-admin.md#trigger) for [triggering](#triggering-pulsar-functions) functions, [`list`](reference-pulsar-admin.md#list-2) for listing deployed functions, and several others.
-
-### Fully Qualified Function Name (FQFN)
-
-Each Pulsar Function has a **Fully Qualified Function Name** (FQFN) that consists of three elements: the function's tenant, namespace, and function name. FQFN's look like this:
-
-```http
-
-tenant/namespace/name
-
-```
-
-FQFNs enable you to, for example, create multiple functions with the same name provided that they're in different namespaces.
-
-### Default arguments
-
-When managing Pulsar Functions, you'll need to specify a variety of information about those functions, including tenant, namespace, input and output topics, etc. There are some parameters, however, that have default values that will be supplied if omitted. The table below lists the defaults:
-
-Parameter | Default
-:---------|:-------
-Function name | Whichever value is specified for the class name (minus org, library, etc.). The flag `--className org.example.MyFunction`, for example, would give the function a name of `MyFunction`.
-Tenant | Derived from the input topics' names. If the input topics are under the `marketing` tenant---i.e. the topic names have the form `persistent://marketing/{namespace}/{topicName}`---then the tenant will be `marketing`.
-Namespace | Derived from the input topics' names. If the input topics are under the `asia` namespace under the `marketing` tenant---i.e. the topic names have the form `persistent://marketing/asia/{topicName}`, then the namespace will be `asia`.
-Output topic | `{input topic}-{function name}-output`. A function with an input topic name of `incoming` and a function name of `exclamation`, for example, would have an output topic of `incoming-exclamation-output`.
-Subscription type | For at-least-once and at-most-once [processing guarantees](functions-guarantees.md), the [`SHARED`](concepts-messaging.md#shared) is applied by default; for effectively-once guarantees, [`FAILOVER`](concepts-messaging.md#failover) is applied
-Processing guarantees | [`ATLEAST_ONCE`](functions-guarantees.md)
-Pulsar service URL | `pulsar://localhost:6650`
-
-#### Example use of defaults
-
-Take this `create` command:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar my-pulsar-functions.jar \
-  --className org.example.MyFunction \
-  --inputs my-function-input-topic1,my-function-input-topic2
-
-```
-
-The created function would have default values supplied for the function name (`MyFunction`), tenant (`public`), namespace (`default`), subscription type (`SHARED`), processing guarantees (`ATLEAST_ONCE`), and Pulsar service URL (`pulsar://localhost:6650`).
-
-## Local run mode
-
-If you run a Pulsar Function in **local run** mode, it will run on the machine from which the command is run (this could be your laptop, an [AWS EC2](https://aws.amazon.com/ec2/) instance, etc.). Here's an example [`localrun`](reference-pulsar-admin.md#localrun) command:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-By default, the function will connect to a Pulsar cluster running on the same machine, via a local [broker](reference-terminology.md#broker) service URL of `pulsar://localhost:6650`. If you'd like to use local run mode to run a function but connect it to a non-local Pulsar cluster, you can specify a different broker URL using the `--brokerServiceUrl` flag. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --brokerServiceUrl pulsar://my-cluster-host:6650 \
-  # Other function parameters
-
-```
-
-## Cluster mode
-
-When you run a Pulsar Function in **cluster mode**, the function code will be uploaded to a Pulsar broker and run *alongside the broker* rather than in your [local environment](#local-run-mode). You can run a function in cluster mode using the [`create`](reference-pulsar-admin.md#create-1) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-### Updating cluster mode functions
-
-You can use the [`update`](reference-pulsar-admin.md#update-1) command to update a Pulsar Function running in cluster mode. This command, for example, would update the function created in the section [above](#cluster-mode):
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/new-input-topic \
-  --output persistent://public/default/new-output-topic
-
-```
-
-### Parallelism
-
-Pulsar Functions run as processes called **instances**. When you run a Pulsar Function, it runs as a single instance by default (and in [local run mode](#local-run-mode) you can *only* run a single instance of a function).
-
-You can also specify the *parallelism* of a function, i.e. the number of instances to run, when you create the function. You can set the parallelism factor using the `--parallelism` flag of the [`create`](reference-pulsar-admin.md#functions-create) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --parallelism 3 \
-  # Other function info
-
-```
-
-You can adjust the parallelism of an already created function using the [`update`](reference-pulsar-admin.md#update-1) interface.
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --parallelism 5 \
-  # Other function
-
-```
-
-If you're specifying a function's configuration via YAML, use the `parallelism` parameter. Here's an example config file:
-
-```yaml
-
-# function-config.yaml
-parallelism: 3
-inputs:
-- persistent://public/default/input-1
-output: persistent://public/default/output-1
-# other parameters
-
-```
-
-And here's the corresponding update command:
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --functionConfigFile function-config.yaml
-
-```
-
-### Function instance resources
-
-When you run Pulsar Functions in [cluster run](#cluster-mode) mode, you can specify the resources that are assigned to each function [instance](#parallelism):
-
-Resource | Specified as... | Runtimes
-:--------|:----------------|:--------
-CPU | The number of cores | Docker (coming soon)
-RAM | The number of bytes | Process, Docker
-Disk space | The number of bytes | Docker
-
-Here's an example function creation command that allocates 8 cores, 8 GB of RAM, and 10 GB of disk space to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar target/my-functions.jar \
-  --className org.example.functions.MyFunction \
-  --cpu 8 \
-  --ram 8589934592 \
-  --disk 10737418240
-
-```
-
-> #### Resources are *per instance*
-> The resources that you apply to a given Pulsar Function are applied to each [instance](#parallelism) of the function. If you apply 8 GB of RAM to a function with a parallelism of 5, for example, then you are applying 40 GB of RAM total for the function. You should always make sure to factor parallelism---i.e. the number of instances---into your resource calculations
-
-## Triggering Pulsar Functions
-
-If a Pulsar Function is running in [cluster mode](#cluster-mode), you can **trigger** it at any time using the command line. Triggering a function means that you send a message with a specific value to the function and get the function's output (if any) via the command line.
-
-> Triggering a function is ultimately no different from invoking a function by producing a message on one of the function's input topics. The [`pulsar-admin functions trigger`](reference-pulsar-admin.md#trigger) command is essentially a convenient mechanism for sending messages to functions without needing to use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool or a language-specific client library.
-
-To show an example of function triggering, let's start with a simple [Python function](functions-api.md#functions-for-python) that returns a simple string based on the input:
-
-```python
-
-# myfunc.py
-def process(input):
-    return "This function has been triggered with a value of {0}".format(input)
-
-```
-
-Let's run that function in [local run mode](functions-deploying.md#local-run-mode):
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --tenant public \
-  --namespace default \
-  --name myfunc \
-  --py myfunc.py \
-  --className myfunc \
-  --inputs persistent://public/default/in \
-  --output persistent://public/default/out
-
-```
-
-Now let's make a consumer listen on the output topic for messages coming from the `myfunc` function using the [`pulsar-client consume`](reference-cli-tools.md#consume) command:
-
-```bash
-
-$ bin/pulsar-client consume persistent://public/default/out \
-  --subscription-name my-subscription
-  --num-messages 0 # Listen indefinitely
-
-```
-
-Now let's trigger that function:
-
-```bash
-
-$ bin/pulsar-admin functions trigger \
-  --tenant public \
-  --namespace default \
-  --name myfunc \
-  --triggerValue "hello world"
-
-```
-
-The consumer listening on the output topic should then produce this in its logs:
-
-```
-
------ got message -----
-This function has been triggered with a value of hello world
-
-```
-
-> #### Topic info not required
-> In the `trigger` command above, you may have noticed that you only need to specify basic information about the function (tenant, namespace, and name). To trigger the function, you didn't need to know the function's input topic(s).
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-guarantees.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-guarantees.md
deleted file mode 100644
index 14abfe72b98ae..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-guarantees.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-id: functions-guarantees
-title: Processing guarantees
-sidebar_label: "Processing guarantees"
-original_id: functions-guarantees
----
-
-Pulsar Functions provides three different messaging semantics that you can apply to any function:
-
-Delivery semantics | Description
-:------------------|:-------
-**At-most-once** delivery | Each message that is sent to the function will most likely be processed but also may not be (hence the "at most")
-**At-least-once** delivery | Each message that is sent to the function could be processed more than once (hence the "at least")
-**Effectively-once** delivery | Each message that is sent to the function will have one output associated with it
-
-## Applying processing guarantees to a function
-
-You can set the processing guarantees for a Pulsar Function when you create the Function. This [`pulsar-function create`](reference-pulsar-admin.md#create-1) command, for example, would apply effectively-once guarantees to the Function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --processingGuarantees EFFECTIVELY_ONCE \
-  # Other function configs
-
-```
-
-The available options are:
-
-* `ATMOST_ONCE`
-* `ATLEAST_ONCE`
-* `EFFECTIVELY_ONCE`
-
-> By default, Pulsar Functions provide at-most-once delivery guarantees. So if you create a function without supplying a value for the `--processingGuarantees` flag, then the function will provide at-most-once guarantees.
-
-## Updating the processing guarantees of a function
-
-You can change the processing guarantees applied to a function once it's already been created using the [`update`](reference-pulsar-admin.md#update-1) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --processingGuarantees ATMOST_ONCE \
-  # Other function configs
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-metrics.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-metrics.md
deleted file mode 100644
index 51090086b573f..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-metrics.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-id: functions-metrics
-title: Metrics for Pulsar Functions
-sidebar_label: "Metrics"
-original_id: functions-metrics
----
-
-Pulsar Functions can publish arbitrary metrics to the metrics interface which can then be queried. This doc contains instructions for publishing metrics using the [Java](#java-sdk) and [Python](#python-sdk) Pulsar Functions SDKs.
-
-> #### Metrics and stats not available through language-native interfaces
-> If a Pulsar Function uses the language-native interface for [Java](functions-api.md#java-native-functions) or [Python](#python-native-functions), that function will not be able to publish metrics and stats to Pulsar.
-
-## Accessing metrics
-
-For a guide to accessing metrics created by Pulsar Functions, see the guide to [Monitoring](deploy-monitoring.md) in Pulsar.
-
-## Java SDK
-
-If you're creating a Pulsar Function using the [Java SDK](functions-api.md#java-sdk-functions), the {@inject: javadoc:Context:/pulsar-functions/org/apache/pulsar/functions/api/Context} object has a `recordMetric` method that you can use to register both a name for the metric and a value. Here's the signature for that method:
-
-```java
-
-void recordMetric(String metricName, double value);
-
-```
-
-Here's an example function:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-
-public class MetricRecordingFunction implements Function {
-    @Override
-    public void apply(String input, Context context) {
-        context.recordMetric("number-of-characters", input.length());
-        return null;
-    }
-}
-
-```
-
-This function counts the length of each incoming message (of type `String`) and then registers that under the `number-of-characters` metric.
-
-## Python SDK
-
-Documentation for the [Python SDK](functions-api.md#python-sdk-functions) is coming soon.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-overview.md
deleted file mode 100644
index 5dbc04204c2b5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-overview.md
+++ /dev/null
@@ -1,499 +0,0 @@
----
-id: functions-overview
-title: Pulsar Functions overview
-sidebar_label: "Overview"
-original_id: functions-overview
----
-
-**Pulsar Functions** are lightweight compute processes that
-
-* consume messages from one or more Pulsar topics,
-* apply a user-supplied processing logic to each message,
-* publish the results of the computation to another topic
-
-Here's an example Pulsar Function for Java (using the [native interface](functions-api.md#java-native-functions)):
-
-```java
-
-import java.util.Function;
-
-public class ExclamationFunction implements Function {
-    @Override
-    public String apply(String input) { return String.format("%s!", input); }
-}
-
-```
-
-Here's an equivalent function in Python (also using the [native interface](functions-api.md#python-native-functions)):
-
-```python
-
-def process(input):
-    return "{0}!".format(input)
-
-```
-
-Functions are executed each time a message is published to the input topic. If a function is listening on the topic `tweet-stream`, for example, then the function would be run each time a message is published to that topic.
-
-## Goals
-
-The core goal behind Pulsar Functions is to enable you to easily create processing logic of any level of complexity without needing to deploy a separate neighboring system (such as [Apache Storm](http://storm.apache.org/), [Apache Heron](https://apache.github.io/incubator-heron), [Apache Flink](https://flink.apache.org/), etc.). Pulsar Functions is essentially ready-made compute infrastructure at your disposal as part of your Pulsar messaging system. This core goal is tied to a series of other goals:
-
-* Developer productivity ([language-native](#language-native-functions) vs. [Pulsar Functions SDK](#the-pulsar-functions-sdk) functions)
-* Easy troubleshooting
-* Operational simplicity (no need for an external processing system)
-
-## Inspirations
-
-The Pulsar Functions feature was inspired by (and takes cues from) several systems and paradigms:
-
-* Stream processing engines such as [Apache Storm](http://storm.apache.org/), [Apache Heron](https://apache.github.io/incubator-heron), and [Apache Flink](https://flink.apache.org)
-* "Serverless" and "Function as a Service" (FaaS) cloud platforms like [Amazon Web Services Lambda](https://aws.amazon.com/lambda/), [Google Cloud Functions](https://cloud.google.com/functions/), and [Azure Cloud Functions](https://azure.microsoft.com/en-us/services/functions/)
-
-Pulsar Functions could be described as
-
-* [Lambda](https://aws.amazon.com/lambda/)-style functions that are
-* specifically designed to use Pulsar as a message bus
-
-## Programming model
-
-The core programming model behind Pulsar Functions is very simple:
-
-* Functions receive messages from one or more **input [topics](reference-terminology.md#topic)**. Every time a message is received, the function can do a variety of things:
-  * Apply some processing logic to the input and write output to:
-  * An **output topic** in Pulsar
-  * [Apache BookKeeper](#state-storage)
-  * Write logs to a **log topic** (potentially for debugging purposes)
-  * Increment a [counter](#word-count-example)
-
-![Pulsar Functions core programming model](/assets/pulsar-functions-overview.png)
-
-### Word count example
-
-If you were to implement the classic word count example using Pulsar Functions, it might look something like this:
-
-![Pulsar Functions word count example](/assets/pulsar-functions-word-count.png)
-
-If you were writing the function in [Java](functions-api.md#functions-for-java) using the [Pulsar Functions SDK for Java](functions-api.md#java-sdk-functions), you could write the function like this...
-
-```java
-
-package org.example.functions;
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-
-import java.util.Arrays;
-
-public class WordCountFunction implements Function {
-    // This function is invoked every time a message is published to the input topic
-    @Override
-    public Void process(String input, Context context) {
-        Arrays.asList(input.split(" ")).forEach(word -> {
-            String counterKey = word.toLowerCase();
-            context.incrCounter(counterKey, 1)
-        });
-        return null;
-    }
-}
-
-```
-
-...and then [deploy it](#cluster-run-mode) in your Pulsar cluster using the [command line](#command-line-interface) like this:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar target/my-jar-with-dependencies.jar \
-  --className org.example.functions.WordCountFunction \
-  --tenant public \
-  --namespace default \
-  --name word-count \
-  --inputs persistent://public/default/sentences \
-  --output persistent://public/default/count
-
-```
-
-### Content-based routing example
-
-The use cases for Pulsar Functions are essentially endless, but let's dig into a more sophisticated example that involves content-based routing.
-
-Imagine a function that takes items (strings) as input and publishes them to either a fruits or vegetables topic, depending on the item. Or, if an item is neither a fruit nor a vegetable, a warning is logged to a [log topic](#logging). Here's a visual representation:
-
-![Pulsar Functions routing example](/assets/pulsar-functions-routing-example.png)
-
-If you were implementing this routing functionality in Python, it might look something like this:
-
-```python
-
-from pulsar import Function
-
-class RoutingFunction(Function):
-    def __init__(self):
-        self.fruits_topic = "persistent://public/default/fruits"
-        self.vegetables_topic = "persistent://public/default/vegetables"
-
-    @staticmethod
-    def is_fruit(item):
-        return item in ["apple", "orange", "pear", "other fruits..."]
-
-    @staticmethod
-    def is_vegetable(item):
-        return item in ["carrot", "lettuce", "radish", "other vegetables..."]
-
-    def process(self, item, context):
-        if self.is_fruit(item):
-            context.publish(self.fruits_topic, item)
-        elif self.is_vegetable(item):
-            context.publish(self.vegetables_topic, item)
-        else:
-            warning = "The item {0} is neither a fruit nor a vegetable".format(item)
-            context.get_logger().warn(warning)
-
-```
-
-## Command-line interface
-
-Pulsar Functions are managed using the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool (in particular the [`functions`](reference-pulsar-admin.md#functions) command). Here's an example command that would run a function in [local run mode](#local-run-mode):
-
-```bash
-
-$ bin/pulsar-functions localrun \
-  --inputs persistent://public/default/test_src \
-  --output persistent://public/default/test_result \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction
-
-```
-
-## Fully Qualified Function Name (FQFN)
-
-Each Pulsar Function has a **Fully Qualified Function Name** (FQFN) that consists of three elements: the function's tenant, namespace, and function name. FQFN's look like this:
-
-```http
-
-tenant/namespace/name
-
-```
-
-FQFNs enable you to, for example, create multiple functions with the same name provided that they're in different namespaces.
-
-## Configuration
-
-Pulsar Functions can be configured in two ways:
-
-* Via [command-line arguments](#command-line-interface) passed to the [`pulsar-admin functions`](reference-pulsar-admin.md#functions) interface
-* Via [YAML](http://yaml.org/) configuration files
-
-If you're supplying a YAML configuration, you must specify a path to the file on the command line. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --functionConfigFile ./my-function.yaml
-
-```
-
-And here's an example `my-function.yaml` file:
-
-```yaml
-
-name: my-function
-tenant: public
-namespace: default
-jar: ./target/my-functions.jar
-className: org.example.pulsar.functions.MyFunction
-inputs:
-- persistent://public/default/test_src
-output: persistent://public/default/test_result
-
-```
-
-You can also mix and match configuration methods by specifying some function attributes via the CLI and others via YAML configuration.
-
-## Supported languages
-
-Pulsar Functions can currently be written in [Java](functions-api.md#functions-for-java) and [Python](functions-api.md#functions-for-python). Support for additional languages is coming soon.
-
-## The Pulsar Functions API
-
-The Pulsar Functions API enables you to create processing logic that is:
-
-* Type safe. Pulsar Functions can process raw bytes or more complex, application-specific types.
-* Based on SerDe (**Ser**ialization/**De**serialization). A variety of types are supported "out of the box" but you can also create your own custom SerDe logic.
-
-### Function context
-
-Each Pulsar Function created using the [Pulsar Functions SDK](#the-pulsar-functions-sdk) has access to a context object that both provides:
-
-1. A wide variety of information about the function, including:
-  * The name of the function
-  * The tenant and namespace of the function
-  * [User-supplied configuration](#user-configuration) values
-2. Special functionality, including:
-  * The ability to produce [logs](#logging) to a specified logging topic
-  * The ability to produce [metrics](#metrics)
-
-### Language-native functions
-
-Both Java and Python support writing "native" functions, i.e. Pulsar Functions with no dependencies.
-
-The benefit of native functions is that they don't have any dependencies beyond what's already available in Java/Python "out of the box." The downside is that they don't provide access to the function's [context](#function-context), which is necessary for a variety of functionality, including [logging](#logging), [user configuration](#user-configuration), and more.
-
-## The Pulsar Functions SDK
-
-If you'd like a Pulsar Function to have access to a [context object](#function-context), you can use the **Pulsar Functions SDK**, available for both [Java](functions-api.md#functions-for-java) and [Pythnon](functions-api.md#functions-for-python).
-
-### Java
-
-Here's an example Java function that uses information about its context:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-public class ContextAwareFunction implements Function {
-    @Override
-    public Void process(String input, Context, context) {
-        Logger LOG = context.getLogger();
-        String functionTenant = context.getTenant();
-        String functionNamespace = context.getNamespace();
-        String functionName = context.getName();
-        LOG.info("Function tenant/namespace/name: {}/{}/{}", functionTenant, functionNamespace, functionName);
-        return null;
-    }
-}
-
-```
-
-### Python
-
-Here's an example Python function that uses information about its context:
-
-```python
-
-from pulsar import Function
-
-class ContextAwareFunction(Function):
-    def process(self, input, context):
-        log = context.get_logger()
-        function_tenant = context.get_function_tenant()
-        function_namespace = context.get_function_namespace()
-        function_name = context.get_function_name()
-        log.info("Function tenant/namespace/name: {0}/{1}/{2}".format(function_tenant, function_namespace, function_name))
-
-```
-
-## Deployment
-
-The Pulsar Functions feature was built to support a variety of deployment options. At the moment, there are two ways to run Pulsar Functions:
-
-Deployment mode | Description
-:---------------|:-----------
-[Local run mode](#local-run-mode) | The function runs in your local environment, for example on your laptop [Cluster mode](#cluster-run-mode) | The function runs *inside of* your Pulsar cluster, on the same machines as your Pulsar [brokers](reference-terminology.md#broker)
-
-### Local run mode
-
-If you run a Pulsar Function in **local run** mode, it will run on the machine from which the command is run (this could be your laptop, an [AWS EC2](https://aws.amazon.com/ec2/) instance, etc.). Here's an example [`localrun`](reference-pulsar-admin.md#localrun) command:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-By default, the function will connect to a Pulsar cluster running on the same machine, via a local broker service URL of `pulsar://localhost:6650`. If you'd like to use local run mode to run a function but connect it to a non-local Pulsar cluster, you can specify a different broker URL using the `--brokerServiceUrl` flag. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --brokerServiceUrl pulsar://my-cluster-host:6650 \
-  # Other function parameters
-
-```
-
-### Cluster run mode
-
-When you run a Pulsar Function in **cluster mode**, the function code will be uploaded to a Pulsar broker and run *alongside the broker* rather than in your [local environment](#local-run-mode). You can run a function in cluster mode using the [`create`](reference-pulsar-admin.md#create-1) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-This command will upload `myfunc.py` to Pulsar, which will use the code to start one [or more](#parallelism) instances of the function.
-
-### Parallelism
-
-By default, only one **instance** of a Pulsar Function runs when you create and run it in [cluster run mode](#cluster-run-mode). You can also, however, run multiple instances in parallel. You can specify the number of instances when you create the function, or update an existing single-instance function with a new parallelism factor.
-
-This command, for example, would create and run a function with a parallelism of 5 (i.e. 5 instances):
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name parallel-fun \
-  --tenant public \
-  --namespace default \
-  --py func.py \
-  --className func.ParallelFunction \
-  --parallelism 5
-
-```
-
-### Function instance resources
-
-When you run Pulsar Functions in [cluster run](#cluster-run-mode) mode, you can specify the resources that are assigned to each function [instance](#parallelism):
-
-Resource | Specified as... | Runtimes
-:--------|:----------------|:--------
-CPU | The number of cores | Docker (coming soon)
-RAM | The number of bytes | Process, Docker
-Disk space | The number of bytes | Docker
-
-Here's an example function creation command that allocates 8 cores, 8 GB of RAM, and 10 GB of disk space to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar target/my-functions.jar \
-  --className org.example.functions.MyFunction \
-  --cpu 8 \
-  --ram 8589934592 \
-  --disk 10737418240
-
-```
-
-For more information on resources, see the [Deploying and Managing Pulsar Functions](functions-deploying.md#resources) documentation.
-
-### Logging
-
-Pulsar Functions created using the [Pulsar Functions SDK](#the-pulsar-functions-sdk) can send logs to a log topic that you specify as part of the function's configuration. The function created using the command below, for example, would produce all logs on the `persistent://public/default/my-func-1-log` topic:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name my-func-1 \
-  --logTopic persistent://public/default/my-func-1-log \
-  # Other configs
-
-```
-
-Here's an example [Java function](functions-api.md#java-logging) that logs at different log levels based on the function's input:
-
-```java
-
-public class LoggerFunction implements Function {
-    @Override
-    public Void process(String input, Context context) {
-        Logger LOG = context.getLogger();
-        if (input.length() <= 100) {
-            LOG.info("This string has a length of {}", input);
-        } else {
-            LOG.warn("This string is getting too long! It has {} characters", input);
-        }
-    }
-}
-
-```
-
-### User configuration
-
-Pulsar Functions can be passed arbitrary key-values via the command line (both keys and values must be strings). This set of key-values is called the functions **user configuration**. User configurations must consist of JSON strings.
-
-Here's an example of passing a user configuration to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --userConfig '{"key-1":"value-1","key-2","value-2"}' \
-  # Other configs
-
-```
-
-Here's an example of a function that accesses that config map:
-
-```java
-
-public class ConfigMapFunction implements Function {
-    @Override
-    public Void process(String input, Context context) {
-        String val1 = context.getUserConfigValue("key1").get();
-        String val2 = context.getUserConfigValue("key2").get();
-        context.getLogger().info("The user-supplied values are {} and {}", val1, val2);
-        return null;
-    }
-}
-
-```
-
-### Triggering Pulsar Functions
-
-Pulsar Functions running in [cluster mode](#cluster-run-mode) can be [triggered](functions-deploying.md#triggering-pulsar-functions) via the [command line](#command-line-interface). With triggering you can easily pass a specific value to a function and get the function's return value *without* needing to worry about creating a client, sending a message to the right input topic, etc. Triggering can be very useful for---but is by no means limited to---testing and debugging purposes.
-
-> Triggering a function is ultimately no different from invoking a function by producing a message on one of the function's input topics. The [`pulsar-admin functions trigger`](reference-pulsar-admin.md#trigger) command is essentially a convenient mechanism for sending messages to functions without needing to use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool or a language-specific client library.
-
-Let's take an example Pulsar Function written in Python (using the [native interface](functions-api.md#python-native-functions)) that simply reverses string inputs:
-
-```python
-
-def process(input):
-    return input[::-1]
-
-```
-
-If that function were running in a Pulsar cluster, it could be triggered like this:
-
-```bash
-
-$ bin/pulsar-admin functions trigger \
-  --tenant public \
-  --namespace default \
-  --name reverse-func \
-  --triggerValue "snoitcnuf raslup ot emoclew"
-
-```
-
-That should return `welcome to pulsar functions` as the console output.
-
-> Instead of passing in a string via the CLI, you can also trigger a Pulsar Function with the contents of a file using the `--triggerFile` flag.
-
-## Processing guarantees
-
-The Pulsar Functions feature provides three different messaging semantics that you can apply to any function:
-
-Delivery semantics | Description
-:------------------|:-------
-**At-most-once** delivery | Each message that is sent to the function will most likely be processed but also may not be (hence the "at most")
-**At-least-once** delivery | Each message that is sent to the function could be processed more than once (hence the "at least")
-**Effectively-once** delivery | Each message that is sent to the function will have one output associated with it
-
-This command, for example, would run a function in [cluster mode](#cluster-run-mode) with effectively-once guarantees applied:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name my-effectively-once-function \
-  --processingGuarantees EFFECTIVELY_ONCE \
-  # Other function configs
-
-```
-
-## Metrics
-
-Pulsar Functions that use the [Pulsar Functions SDK](#the-pulsar-functions-sdk) can publish metrics to Pulsar. For more information, see [Metrics for Pulsar Functions](functions-metrics.md).
-
-## State storage
-
-Pulsar Functions use [Apache BookKeeper](https://bookkeeper.apache.org) as a state storage interface. All Pulsar installations, including local standalone installations, include a deployment of BookKeeper bookies.
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-quickstart.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-quickstart.md
deleted file mode 100644
index 3ccc0e531f9ed..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-quickstart.md
+++ /dev/null
@@ -1,316 +0,0 @@
----
-id: functions-quickstart
-title: Getting started with Pulsar Functions
-sidebar_label: "Getting started"
-original_id: functions-quickstart
----
-
-This tutorial will walk you through running a [standalone](reference-terminology.md#standalone) Pulsar [cluster](reference-terminology.md#cluster) on your machine and then running your first Pulsar Functions using that cluster. The first function will run in local run mode (outside your Pulsar [cluster](reference-terminology.md#cluster)), while the second will run in cluster mode (inside your cluster).
-
-> In local run mode, your Pulsar Function will communicate with your Pulsar cluster but will run outside of the cluster.
-
-## Prerequisites
-
-In order to follow along with this tutorial, you'll need to have [Maven](https://maven.apache.org/download.cgi) installed on your machine.
-
-## Run a standalone Pulsar cluster
-
-In order to run our Pulsar Functions, we'll need to run a Pulsar cluster locally first. The easiest way to do that is to run Pulsar in [standalone](reference-terminology.md#standalone) mode. Follow these steps to start up a standalone cluster:
-
-```bash
-
-$ wget pulsar:binary_release_url
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-$ bin/pulsar standalone \
-  --advertised-address 127.0.0.1
-
-```
-
-When running Pulsar in standalone mode, the `public` tenant and `default` namespace will be created automatically for you. That tenant and namespace will be used throughout this tutorial.
-
-## Run a Pulsar Function in local run mode
-
-Let's start with a simple function that takes a string as input from a Pulsar topic, adds an exclamation point to the end of the string, and then publishes that new string to another Pulsar topic. Here's the code for the function:
-
-```java
-
-package org.apache.pulsar.functions.api.examples;
-
-import java.util.function.Function;
-
-public class ExclamationFunction implements Function {
-    @Override
-    public String apply(String input) {
-        return String.format("%s!", input);
-    }
-}
-
-```
-
-A JAR file containing this and several other functions (written in Java) is included with the binary distribution you downloaded above (in the `examples` folder). To run the function in local mode, i.e. on our laptop but outside our Pulsar cluster:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --name exclamation
-
-```
-
-> #### Multiple input topics allowed
->
-> In the example above, a single topic was specified using the `--inputs` flag. You can also specify multiple input topics as a comma-separated list using the same flag. Here's an example:
->
-
-> ```bash
-> 
-> --inputs topic1,topic2
->
-> 
-> ```
-
-
-We can open up another shell and use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool to listen for messages on the output topic:
-
-```bash
-
-$ bin/pulsar-client consume persistent://public/default/exclamation-output \
-  --subscription-name my-subscription \
-  --num-messages 0
-
-```
-
-> Setting the `--num-messages` flag to 0 means that the consumer will listen on the topic indefinitely (rather than only accepting a certain number of messages).
-
-With a listener up and running, we can open up another shell and produce a message on the input topic that we specified:
-
-```bash
-
-$ bin/pulsar-client produce persistent://public/default/exclamation-input \
-  --num-produce 1 \
-  --messages "Hello world"
-
-```
-
-In the output, you should see the following:
-
-```
-
------ got message -----
-Hello world!
-
-```
-
-Success! As you can see, the message has been successfully processed by the exclamation function. To shut down the function, simply hit **Ctrl+C**.
-
-Here's what happened:
-
-* The `Hello world` message that we published to the input topic (`persistent://public/default/exclamation-input`) was passed to the exclamation function that we ran on our machine
-* The exclamation function processed the message (providing a result of `Hello world!`) and published the result to the output topic (`persistent://public/default/exclamation-output`).
-* If our exclamation function *hadn't* been running, Pulsar would have durably stored the message data published to the input topic in [Apache BookKeeper](https://bookkeeper.apache.org) until a consumer consumed and acknowledged the message
-
-## Run a Pulsar Function in cluster mode
-
-[Local run mode](#run-a-pulsar-function-in-local-run-mode) is useful for development and experimentation, but if you want to use Pulsar Functions in a real Pulsar deployment, you'll want to run them in **cluster mode**. In this mode, Pulsar Functions run *inside* your Pulsar cluster and are managed using the same [`pulsar-admin functions`](reference-pulsar-admin.md#functions) interface that we've been using thus far.
-
-This command, for example, would deploy the same exclamation function we ran locally above *in our Pulsar cluster* (rather than outside it):
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --name exclamation
-
-```
-
-You should see `Created successfully` in the output. Now, let's see a list of functions running in our cluster:
-
-```bash
-
-$ bin/pulsar-admin functions list \
-  --tenant public \
-  --namespace default
-
-```
-
-We should see just the `exclamation` function listed there. We can also check the status of our deployed function using the `getstatus` command:
-
-```bash
-
-$ bin/pulsar-admin functions getstatus \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-You should see this JSON output:
-
-```json
-
-{
-  "functionStatusList": [
-    {
-      "running": true,
-      "instanceId": "0"
-    }
-  ]
-}
-
-```
-
-As we can see, (a) the instance is currently running and (b) there is one instance, with an ID of 0, running. We can get other information about the function (topics, tenant, namespace, etc.) using the `get` command instead of `getstatus`:
-
-```bash
-
-$ bin/pulsar-admin functions get \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-You should see this JSON output:
-
-```json
-
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "exclamation",
-  "className": "org.apache.pulsar.functions.api.examples.ExclamationFunction",
-  "output": "persistent://public/default/exclamation-output",
-  "autoAck": true,
-  "inputs": [
-    "persistent://public/default/exclamation-input"
-  ],
-  "parallelism": 1
-}
-
-```
-
-As we can see, the parallelism of the function is 1, meaning that only one instance of the function is running in our cluster. Let's update our function to a parallelism of 3 using the `update` command:
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --tenant public \
-  --namespace default \
-  --name exclamation \
-  --parallelism 3
-
-```
-
-You should see `Updated successfully` in the output. If you run the `get` command from above for the function, you can see that the parallelism has increased to 3, meaning that there are now three instances of the function running in our cluster:
-
-```json
-
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "exclamation",
-  "className": "org.apache.pulsar.functions.api.examples.ExclamationFunction",
-  "output": "persistent://public/default/exclamation-output",
-  "autoAck": true,
-  "inputs": [
-    "persistent://public/default/exclamation-input"
-  ],
-  "parallelism": 3
-}
-
-```
-
-Finally, we can shut down our running function using the `delete` command:
-
-```bash
-
-$ bin/pulsar-admin functions delete \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-If you see `Deleted successfully` in the output, then you've successfully run, updated, and shut down a Pulsar Function running in cluster mode. Congrats! Now, let's go even further and run a brand new function in the next section.
-
-## Writing and running a new function
-
-> In order to write and run the [Python](functions-api.md#functions-for-python) function below, you'll need to install a few dependencies:
-
-> ```bash
-> 
-> $ pip install pulsar-client
->
-> 
-> ```
-
-
-In the above examples, we ran and managed a pre-written Pulsar Function and saw how it worked. To really get our hands dirty, let's write and our own function from scratch, using the Python API. This simple function will also take a string as input but it will reverse the string and publish the resulting, reversed string to the specified topic.
-
-First, create a new Python file:
-
-```bash
-
-$ touch reverse.py
-
-```
-
-In that file, add the following:
-
-```python
-
-def process(input):
-    return input[::-1]
-
-```
-
-Here, the `process` method defines the processing logic of the Pulsar Function. It simply uses some Python slice magic to reverse each incoming string. Now, we can deploy the function using `create`:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py reverse.py \
-  --className reverse \
-  --inputs persistent://public/default/backwards \
-  --output persistent://public/default/forwards \
-  --tenant public \
-  --namespace default \
-  --name reverse
-
-```
-
-If you see `Created successfully`, the function is ready to accept incoming messages. Because the function is running in cluster mode, we can **trigger** the function using the [`trigger`](reference-pulsar-admin.md#trigger) command. This command will send a message that we specify to the function and also give us the function's output. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions trigger \
-  --name reverse \
-  --tenant public \
-  --namespace default \
-  --triggerValue "sdrawrof won si tub sdrawkcab saw gnirts sihT"
-
-```
-
-You should get this output:
-
-```
-
-This string was backwards but is now forwards
-
-```
-
-Once again, success! We created a brand new Pulsar Function, deployed it in our Pulsar standalone cluster in [cluster mode](#run-a-pulsar-function-in-cluster-mode) and successfully triggered the function. If you're ready for more, check out one of these docs:
-
-* [The Pulsar Functions API](functions-api.md)
-* [Deploying Pulsar Functions](functions-deploying.md)
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/functions-state.md b/site2/website/versioned_docs/version-2.1.0-incubating/functions-state.md
deleted file mode 100644
index 493ebe4ec6b11..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/functions-state.md
+++ /dev/null
@@ -1,131 +0,0 @@
----
-id: functions-state
-title: Pulsar Functions State Storage (Developer Preview)
-sidebar_label: "State Storage"
-original_id: functions-state
----
-
-Since Pulsar 2.1.0 release, Pulsar integrates with Apache BookKeeper [table service](https://docs.google.com/document/d/155xAwWv5IdOitHh1NVMEwCMGgB28M3FyMiQSxEpjE-Y/edit#heading=h.56rbh52koe3f)
-for storing the `State` for functions. For example, A `WordCount` function can store its `counters` state into BookKeeper's table service via Pulsar Functions [State API](#api).
-
-## API
-
-### Java API
-
-Currently Pulsar Functions expose following APIs for mutating and accessing State. These APIs are available in the [Context](functions-api.md#context) object when
-you are using [Java SDK](functions-api.md#java-sdk-functions) functions.
-
-#### incrCounter
-
-```java
-
-    /**
-     * Increment the builtin distributed counter referred by key
-     * @param key The name of the key
-     * @param amount The amount to be incremented
-     */
-    void incrCounter(String key, long amount);
-
-```
-
-Application can use `incrCounter` to change the counter of a given `key` by the given `amount`.
-
-#### getCounter
-
-```java
-
-    /**
-     * Retrieve the counter value for the key.
-     *
-     * @param key name of the key
-     * @return the amount of the counter value for this key
-     */
-    long getCounter(String key);
-
-```
-
-Application can use `getCounter` to retrieve the counter of a given `key` mutated by `incrCounter`.
-
-Besides the `counter` API, Pulsar also exposes a general key/value API for functions to store
-general key/value state.
-
-#### putState
-
-```java
-
-    /**
-     * Update the state value for the key.
-     *
-     * @param key name of the key
-     * @param value state value of the key
-     */
-    void putState(String key, ByteBuffer value);
-
-```
-
-#### getState
-
-```
-
-    /**
-     * Retrieve the state value for the key.
-     *
-     * @param key name of the key
-     * @return the state value for the key.
-     */
-    ByteBuffer getState(String key);
-
-```
-
-### Python API
-
-State currently is not supported at [Python SDK](functions-api.md#python-sdk-functions).
-
-## Query State
-
-A Pulsar Function can use the [State API](#api) for storing state into Pulsar's state storage
-and retrieving state back from Pulsar's state storage. Additionally Pulsar also provides
-CLI commands for querying its state.
-
-```shell
-
-$ bin/pulsar-admin functions querystate \
-    --tenant  \
-    --namespace  \
-    --name  \
-    --state-storage-url  \
-    --key  \
-    [---watch]
-
-```
-
-If `--watch` is specified, the CLI will watch the value of the provided `state-key`.
-
-## Example
-
-### Java Example
-
-{@inject: github:WordCountFunction:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java} is a very good example
-demonstrating on how Application can easily store `state` in Pulsar Functions.
-
-```java
-
-public class WordCountFunction implements Function {
-    @Override
-    public Void process(String input, Context context) throws Exception {
-        Arrays.asList(input.split("\\.")).forEach(word -> context.incrCounter(word, 1));
-        return null;
-    }
-}
-
-```
-
-The logic of this `WordCount` function is pretty simple and straightforward:
-
-1. The function first splits the received `String` into multiple words using regex `\\.`.
-2. For each `word`, the function increments the corresponding `counter` by 1 (via `incrCounter(key, amount)`).
-
-### Python Example
-
-State currently is not supported at [Python SDK](functions-api.md#python-sdk-functions).
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-concepts-and-architecture.md b/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-concepts-and-architecture.md
deleted file mode 100644
index fe9c3fbc553b2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-concepts-and-architecture.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-id: concepts-architecture
-title: Pulsar concepts and architecture
-sidebar_label: "Concepts and architecture"
-original_id: concepts-architecture
----
-
-
-
-
-
-
-
-
-
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-docker.md b/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-docker.md
deleted file mode 100644
index 0c3d906873356..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-docker.md
+++ /dev/null
@@ -1,183 +0,0 @@
----
-id: getting-started-docker
-title: Start a standalone cluster with Docker
-sidebar_label: "Pulsar in Docker"
-original_id: getting-started-docker
----
-
-For the purposes of local development and testing, you can run Pulsar in standalone
-mode on your own machine within a Docker container.
-
-If you don't have Docker installed, you can download the [Community edition](https://www.docker.com/community-edition)
-and follow the instructions for your OS.
-
-## Starting Pulsar inside Docker
-
-```shell
-
-$ docker run -it \
-  -p 6650:6650 \
-  -p 8080:8080 \
-  -v $PWD/data:/pulsar/data \
-  apachepulsar/pulsar:{{site.current_version}} \
-  bin/pulsar standalone
-
-```
-
-Under Windows, you should use something like the following docker command:
-
-```shell
-
-$ docker run -it \
-  -p 6650:6650 \
-  -p 8080:8080 \
-  -v "$PWD/data:/pulsar/data".ToLower() \
-  apachepulsar/pulsar:{{site.current_version}} \
-  bin/pulsar standalone
-
-```
-
-A few things to note about this command:
- * `$PWD/data` : The docker host directory under the Windows operating system must be lowercase.`$PWD/data` can provide you with the specified directory, for example: `E:/data`.
- * `-v $PWD/data:/pulsar/data`: This will make the process inside the container to store the
-   data and metadata in the filesystem outside the container, in order to not start "fresh" every
-   time the container is restarted.
-
-If Pulsar has been successfully started, you should see `INFO`-level log messages like this:
-
-```
-
-2017-08-09 22:34:04,030 - INFO  - [main:WebService@213] - Web Service started at http://127.0.0.1:8080
-2017-08-09 22:34:04,038 - INFO  - [main:PulsarService@335] - messaging service is ready, bootstrap service on port=8080, broker url=pulsar://127.0.0.1:6650, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@4db60246
-...
-
-```
-
-> #### Automatically created namespace
-> When you start a local standalone cluster, Pulsar will automatically create a `public/default`
-namespace that you can use for development purposes. All Pulsar topics are managed within namespaces.
-For more info, see [Topics](concepts-messaging.md#topics).
-
-
-## Start publishing and consuming messages
-
-Pulsar currently offers client libraries for [Java](client-libraries-java.md), [Python](client-libraries-python.md),
-and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can
-use one of these root URLs for interacting with your cluster:
-
-* `pulsar://localhost:6650`
-* `http://localhost:8080`
-
-Here's an example that lets you quickly get started with Pulsar by using the [Python](client-libraries-python.md)
-client API.
-
-You can install the Pulsar Python client library directly from [PyPI](https://pypi.org/project/pulsar-client/):
-
-```shell
-
-$ pip install pulsar-client
-
-```
-
-First create a consumer and subscribe to the topic:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-consumer = client.subscribe('my-topic',
-                            subscription_name='my-sub')
-
-while True:
-    msg = consumer.receive()
-    print("Received message: '%s'" % msg.data())
-    consumer.acknowledge(msg)
-
-client.close()
-
-```
-
-Now we can start a producer to send some test messages:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-producer = client.create_producer('my-topic')
-
-for i in range(10):
-    producer.send(('hello-pulsar-%d' % i).encode('utf-8'))
-
-client.close()
-
-```
-
-## Get the topic statistics
-
-In Pulsar you can use REST, Java, or command-line tools to control every aspect of the system.
-You can find detailed documentation of all the APIs in the [Admin API Overview](admin-api-overview.md).
-
-In the simplest example, you can use curl to probe the stats for a particular topic:
-
-```shell
-
-$ curl http://localhost:8080/admin/v2/persistent/public/default/my-topic/stats | python -m json.tool
-
-```
-
-The output will be something like this:
-
-```json
-
-{
-  "averageMsgSize": 0.0,
-  "msgRateIn": 0.0,
-  "msgRateOut": 0.0,
-  "msgThroughputIn": 0.0,
-  "msgThroughputOut": 0.0,
-  "publishers": [
-    {
-      "address": "/172.17.0.1:35048",
-      "averageMsgSize": 0.0,
-      "clientVersion": "1.19.0-incubating",
-      "connectedSince": "2017-08-09 20:59:34.621+0000",
-      "msgRateIn": 0.0,
-      "msgThroughputIn": 0.0,
-      "producerId": 0,
-      "producerName": "standalone-0-1"
-    }
-  ],
-  "replication": {},
-  "storageSize": 16,
-  "subscriptions": {
-    "my-sub": {
-      "blockedSubscriptionOnUnackedMsgs": false,
-      "consumers": [
-        {
-          "address": "/172.17.0.1:35064",
-          "availablePermits": 996,
-          "blockedConsumerOnUnackedMsgs": false,
-          "clientVersion": "1.19.0-incubating",
-          "connectedSince": "2017-08-09 21:05:39.222+0000",
-          "consumerName": "166111",
-          "msgRateOut": 0.0,
-          "msgRateRedeliver": 0.0,
-          "msgThroughputOut": 0.0,
-          "unackedMessages": 0
-        }
-      ],
-      "msgBacklog": 0,
-      "msgRateExpired": 0.0,
-      "msgRateOut": 0.0,
-      "msgRateRedeliver": 0.0,
-      "msgThroughputOut": 0.0,
-      "type": "Exclusive",
-      "unackedMessages": 0
-    }
-  }
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-standalone.md b/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-standalone.md
deleted file mode 100644
index ed672efe71977..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/getting-started-standalone.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-id: getting-started-standalone
-title: Setting up a local standalone cluster
-sidebar_label: "Run Pulsar locally"
-original_id: getting-started-standalone
----
-
-For the purposes of local development and testing, you can run Pulsar in standalone mode on your own machine. Standalone mode includes a Pulsar broker as well as the necessary ZooKeeper and BookKeeper components running inside of a single Java Virtual Machine (JVM) process.
-
-> #### Pulsar in production? 
-> If you're looking to run a full production Pulsar installation, see the [Deploying a Pulsar instance](deploy-bare-metal.md) guide.
-
-
-## Run Pulsar Standalone Manually
-
-### System requirements
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-
-### Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:binary_release_url
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-### What your package contains
-
-The Pulsar binary package initially contains the following directories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's command-line tools, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar
-`licenses` | License files, in `.txt` form, for various components of the Pulsar [codebase](https://github.com/apache/pulsar)
-
-These directories will be created once you begin running Pulsar:
-
-Directory | Contains
-:---------|:--------
-`data` | The data storage directory used by ZooKeeper and BookKeeper
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
-`logs` | Logs created by the installation
-
-
-### Installing Builtin Connectors
-
-Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-If you would like to enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz /path/to/apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ cd apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-> #### NOTES
->
-> If you are running Pulsar in a bare metal cluster, you need to make sure `connectors` tarball is unzipped in every broker's pulsar directory
-> (or in every function-worker's pulsar directory if you are running a separate worker cluster for Pulsar functions).
-> 
-> If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DC/OS](https://dcos.io/)),
-> you can use `apachepulsar/pulsar-all` image instead of `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
-
-### Starting the cluster
-
-Once you have an up-to-date local copy of the release, you can start up a local cluster using the [`pulsar`](reference-cli-tools.md#pulsar) command, which is stored in the `bin` directory, and specifying that you want to start up Pulsar in standalone mode:
-
-```bash
-
-$ bin/pulsar standalone
-
-```
-
-If Pulsar has been successfully started, you should see `INFO`-level log messages like this:
-
-```bash
-
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@95] - Configuration Store cache started
-2017-06-01 14:46:29,192 - INFO  - [main:AuthenticationService@61] - Authentication is disabled
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@108] - Pulsar WebSocket Service started
-
-```
-
-> #### Automatically created namespace
-> When you start a local standalone cluster, Pulsar will automatically create a `public/default` [namespace](concepts-messaging.md#namespaces) that you can use for development purposes. All Pulsar topics are managed within namespaces. For more info, see [Topics](concepts-messaging.md#topics).
-
-## Testing your cluster setup
-
-Pulsar provides a CLI tool called [`pulsar-client`](reference-cli-tools.md#pulsar-client) that enables you to do things like send messages to a Pulsar topic in a running cluster. This command will send a simple message saying `hello-pulsar` to the `my-topic` topic:
-
-```bash
-
-$ bin/pulsar-client produce my-topic --messages "hello-pulsar"
-
-```
-
-If the message has been successfully published to the topic, you should see a confirmation like this in the `pulsar-client` logs:
-
-```
-
-13:09:39.356 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 1 messages successfully produced
-
-```
-
-> #### No need to explicitly create new topics
-> You may have noticed that we did not explicitly create the `my-topic` topic to which we sent the `hello-pulsar` message. If you attempt to write a message to a topic that does not yet exist, Pulsar will automatically create that topic for you.
-
-## Using Pulsar clients locally
-
-Pulsar currently offers client libraries for [Java](client-libraries-java.md), [Python](client-libraries-python.md), and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can use one of these root URLs for interacting with your cluster:
-
-* `http://localhost:8080`
-* `pulsar://localhost:6650`
-
-Here's an example producer for a Pulsar topic using the [Java](client-libraries-java.md) client:
-
-```java
-
-String localClusterUrl = "pulsar://localhost:6650";
-
-PulsarClient client = PulsarClient.builder().serviceUrl(localClusterUrl).build();
-Producer producer = client.newProducer().topic("my-topic").create();
-
-```
-
-Here's an example [Python](client-libraries-python.md) producer:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-producer = client.create_producer('my-topic')
-
-```
-
-Finally, here's an example [C++](client-libraries-cpp.md) producer:
-
-```cpp
-
-Client client("pulsar://localhost:6650");
-Producer producer;
-Result result = client.createProducer("my-topic", producer);
-if (result != ResultOk) {
-    LOG_ERROR("Error creating producer: " << result);
-    return -1;
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-aerospike.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-aerospike.md
deleted file mode 100644
index 29f9ab4095c0d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-aerospike.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-id: io-aerospike
-title: Aerospike Sink Connector
-sidebar_label: "Aerospike Sink Connector"
-original_id: io-aerospike
----
-
-The Aerospike Sink connector is used to write messages to an Aerospike Cluster.
-
-## Sink Configuration Options
-
-The following configuration options are specific to the Aerospike Connector:
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| `seedHosts` | `true` | `null` | Comma separated list of one or more Aerospike cluster hosts; each host can be specified as a valid IP address or hostname followed by an optional port number (default is 3000). | 
-| `keyspace` | `true` | `null` | Aerospike namespace to use. |
-| `keySet` | `false` | `null` | Aerospike set name to use. |
-| `columnName` | `true` | `null` | Aerospike bin name to use. |
-| `maxConcurrentRequests` | `false` | `100` | Maximum number of concurrent Aerospike transactions that a Sink can open. |
-| `timeoutMs` | `false` | `100` | A single timeout value controls `socketTimeout` and `totalTimeout` for Aerospike transactions.  |
-| `retries` | `false` | `1` | Maximum number of retries before aborting a write transaction to Aerospike. |
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-cassandra.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-cassandra.md
deleted file mode 100644
index 68af2c066e994..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-cassandra.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-id: io-cassandra
-title: Cassandra Sink Connector
-sidebar_label: "Cassandra Sink Connector"
-original_id: io-cassandra
----
-
-The Cassandra Sink connector is used to write messages to a Cassandra Cluster.
-
-The tutorial [Connecting Pulsar with Apache Cassandra](io-quickstart.md) shows an example how to use Cassandra Sink
-connector to write messages to a Cassandra table.
-
-## Sink Configuration Options
-
-All the Cassandra sink settings are listed as below. All the settings are required to run a Cassandra sink.
-
-| Name | Default | Required | Description |
-|------|---------|----------|-------------|
-| `roots` | `null` | `true` | Cassandra Contact Points. A list of one or many node address. It is a comma separated `String`. |
-| `keyspace` | `null` | `true` | Cassandra Keyspace name. The keyspace should be created prior to creating the sink. |
-| `columnFamily` | `null` | `true` | Cassandra ColumnFamily name. The column family should be created prior to creating the sink. |
-| `keyname` | `null` | `true` | Key column name. The key column is used for storing Pulsar message keys. If a Pulsar message doesn't have any key associated, the message value will be used as the key. |
-| `columnName` | `null` | `true` | Value column name. The value column is used for storing Pulsar message values. |
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-connectors.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-connectors.md
deleted file mode 100644
index 10e84b89159ff..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-connectors.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-id: io-connectors
-title: Builtin Connectors
-sidebar_label: "Builtin Connectors"
-original_id: io-connectors
----
-
-Pulsar distribution includes a set of common connectors that have been packaged and tested with the rest of Apache Pulsar.
-These connectors import and export data from some of the most commonly used data systems. Using any these connectors is
-as easy as writing a simple connector configuration and running the connector locally or submitting the connector to a
-Pulsar Functions cluster.
-
-- [Aerospike Sink Connector](io-aerospike.md)
-- [Cassandra Sink Connector](io-cassandra.md)
-- [Kafka Sink Connector](io-kafka.md#sink)
-- [Kafka Source Connector](io-kafka.md#source)
-- [Kinesis Sink Connector](io-kinesis.md#sink)
-- [RabbitMQ Source Connector](io-rabbitmq.md#source)
-- [Twitter Firehose Source Connector](io-twitter.md)
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-develop.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-develop.md
deleted file mode 100644
index a329104201597..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-develop.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-id: io-develop
-title: Develop Connectors
-sidebar_label: "Developing Connectors"
-original_id: io-develop
----
-
-This guide describes how developers can write new connectors for Pulsar IO to move data
-between Pulsar and other systems. It describes how to create a Pulsar IO connector.
-
-Pulsar IO connectors are specialized [Pulsar Functions](functions-overview.md). So writing
-a Pulsar IO connector is as simple as writing a Pulsar function. Pulsar IO connectors come
-in two flavors: {@inject: github:Source:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java},
-which import data from another system, and {@inject: github:Sink:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java},
-which export data to another system. For example, [KinesisSink](io-kinesis.md) would export
-the messages of a Pulsar topic to a Kinesis stream, and [RabbitmqSource](io-rabbitmq.md) would import
-the messages of a RabbitMQ queue to a Pulsar topic.
-
-### Developing
-
-#### Develop a source connector
-
-What you need to develop a source connector is to implement {@inject: github:Source:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java}
-interface.
-
-First, you need to implement the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java#L33} method. This method will be called once when the source connector
-is initialized. In this method, you can retrieve all the connector specific settings through
-the passed `config` parameter, and initialize all the necessary resourcess. For example, a Kafka
-connector can create the Kafka client in this `open` method.
-
-Beside the passed-in `config` object, the Pulsar runtime also provides a `SourceContext` for the
-connector to access runtime resources for tasks like collecting metrics. The implementation can
-save the `SourceContext` for further usage.
-
-```java
-
-    /**
-     * Open connector with configuration
-     *
-     * @param config initialization config
-     * @param sourceContext
-     * @throws Exception IO type exceptions when opening a connector
-     */
-    void open(final Map config, SourceContext sourceContext) throws Exception;
-
-```
-
-The main task for a Source implementor is to implement {@inject: github:read:/master/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java#L41}
-method.
-
-```java
-
-    /**
-     * Reads the next message from source.
-     * If source does not have any new messages, this call should block.
-     * @return next message from source.  The return result should never be null
-     * @throws Exception
-     */
-    Record read() throws Exception;
-
-```
-
-The implementation should be blocking on this method if nothing to return. It should never return
-`null`. The returned {@inject: github:Record:/master/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java#L28} should encapsulates the information that is needed by
-Pulsar IO runtime.
-
-These information includes:
-
-- *Topic Name*: _Optional_. If the record is originated from a Pulsar topic, it should be the Pulsar topic name.
-- *Key*: _Optional_. If the record has a key associated with it.
-- *Value*: _Required_. The actual data of this record.
-- *Partition Id*: _Optional_. If the record is originated from a partitioned source,
-  return its partition id. The partition id will be used as part of the unique identifier
-  by Pulsar IO runtime to do message deduplication and achieve exactly-once processing guarantee.
-- *Record Sequence*: _Optional_. If the record is originated from a sequential source,
-  return its record sequence. The record sequence will be used as part of the unique identifier
-  by Pulsar IO runtime to do message deduplication and achieve exactly-once processing guarantee.
-- *Properties*: _Optional_. If the record carries user-defined properties, return those properties.
-
-Additionally, the implementation of the record should provide two methods: `ack` and `fail`. These
-two methods will be used by Pulsar IO connector to acknowledge the records that it has done
-processing and fail the records that it has failed to process.
-
-{@inject: github:KafkaSource:/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java} is a good example to follow.
-
-#### Develop a sink connector
-
-Developing a sink connector is as easy as developing a source connector. You just need to
-implement {@inject: github:Sink:/master/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} interface.
-
-Similarly, you first need to implement the {@inject: github:open:/master/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L36} method to initialize all the necessary resources
-before implementing the {@inject: github:write:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L44} method.
-
-```java
-
-    /**
-     * Open connector with configuration
-     *
-     * @param config initialization config
-     * @param sinkContext
-     * @throws Exception IO type exceptions when opening a connector
-     */
-    void open(final Map config, SinkContext sinkContext) throws Exception;
-
-```
-
-The main task for a Sink implementor is to implement {@inject: github:write:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L44} method.
-
-```java
-
-    /**
-     * Write a message to Sink
-     * @param record record to write to sink
-     * @throws Exception
-     */
-    void write(Record record) throws Exception;
-
-```
-
-In the implementation of `write` method, the implementor can decide how to write the value and
-the optional key to the actual source, and leverage all the provided information such as
-`Partition Id`, `Record Sequence` for achieving different processing guarantees. The implementor
-is also responsible for acknowledging records if it has successfully written them or failing
-records if has failed to write them.
-
-### Testing
-
-Testing connectors can be challenging because Pulsar IO connectors interact with two systems
-that may be difficult to mock - Pulsar and the system the connector is connecting to. It is
-recommended to write very specifically test the functionalities of the connector classes
-while mocking the external services.
-
-Once you have written sufficient unit tests for your connector, we also recommend adding
-separate integration tests to verify end-to-end functionality. In Pulsar, we are using [testcontainers](https://www.testcontainers.org/) for all Pulsar integration tests. Pulsar IO
-{@inject: github:IntegrationTests:/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io} are good examples to follow on integration testing your connectors.
-
-### Packaging
-
-Once you've developed and tested your connector, you must package it so that it can be submitted
-to a [Pulsar Functions](functions-overview.md) cluster. There are two approaches described
-here work with Pulsar Functions' runtime.
-
-If you plan to package and distribute your connector for others to use, you are obligated to
-properly license and copyright your own code and to adhere to the licensing and copyrights of
-all libraries your code uses and that you include in your distribution. If you are using the
-approach described in ["Creating a NAR package"](#creating-a-nar-package), the NAR plugin will
-automatically create a `DEPENDENCIES` file in the generated NAR package, including the proper
-licensing and copyrights of all libraries of your connector.
-
-#### Creating a NAR package
-
-The easiest approach to packaging a Pulsar IO connector is to create a NAR package using [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin).
-
-NAR stands for NiFi Archive. It is a custom packaging mechanism used by Apache NiFi, to provide
-a bit of Java ClassLoader isolation. For more details, you can read this [blog post](https://medium.com/hashmapinc/nifi-nar-files-explained-14113f7796fd) to understand
-how NAR works. Pulsar uses the same mechanism for packaging all the [builtin connectors](io-connectors.md).
-
-All what you need is to include this [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin) in your maven project for your connector. For example:
-
-```xml
-
-
-  
-    org.apache.nifi
-    nifi-nar-maven-plugin
-    1.2.0
-  
-
-
-```
-
-The {@inject: github:TwitterFirehose:/pulsar-io/twitter} connector is a good example to follow.
-
-#### Creating an Uber JAR
-
-An alternative approach is to create an _uber JAR_ that contains all of the connector's JAR files
-and other resource files. No directory internal structure is necessary.
-
-You can use [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html) to create a Uber JAR. For example:
-
-```xml
-
-
-  org.apache.maven.plugins
-  maven-shade-plugin
-  3.1.1
-  
-    
-      package
-      
-        shade
-      
-    
-    
-      
-        
-          *:*
-        
-      
-    
-  
-
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-kafka.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-kafka.md
deleted file mode 100644
index fa1a30ec1b35b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-kafka.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-id: io-kafka
-title: Kafka Connector
-sidebar_label: "Kafka Connector"
-original_id: io-kafka
----
-
-## Source
-
-The Kafka Source Connector is used to pull messages from Kafka topics and persist the messages
-to a Pulsar topic.
-
-### Source Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| bootstrapServers | `true` | `null` | A list of host/port pairs to use for establishing the initial connection to the Kafka cluster. |
-| groupId | `true` | `null` | A unique string that identifies the consumer group this consumer belongs to. |
-| fetchMinBytes | `false` | `null` | Minimum bytes expected for each fetch response. |
-| autoCommitEnabled | `false` | `false` | If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer. This committed offset will be used when the process fails as the position from which the new consumer will begin. | 
-| autoCommitIntervalMs | `false` | `null` | The frequency in ms that the consumer offsets are committed to zookeeper. |
-| sessionTimeoutMs | `false` | `null` | The timeout used to detect consumer failures when using Kafka's group management facility. |
-| topic | `true` | `null` | Topic name to receive records from Kafka |
-| keySerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for key that implements the org.apache.kafka.common.serialization.Serializer interface. |
-| valueSerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for value that implements the org.apache.kafka.common.serialization.Serializer interface. |
-
-## Sink
-
-The Kafka Sink Connector is used to pull messages from Pulsar topics and persist the messages
-to a Kafka topic.
-
-### Sink Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| acks | `true` | `null` | The kafka producer acks mode |
-| batchSize | `true` | `null` | The kafka producer batch size. |
-| maxRequestSize | `true` | `null` | The maximum size of a request in bytes. |
-| topic | `true` | `null` | Topic name to receive records from Kafka |
-| keySerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for value that implements the org.apache.kafka.common.serialization.Serializer interface. |
-| valueSerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for value that implements the org.apache.kafka.common.serialization.Serializer interface. |
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-kinesis.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-kinesis.md
deleted file mode 100644
index de19d130f5c69..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-kinesis.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-id: io-kinesis
-title: AWS Kinesis Connector
-sidebar_label: "AWS Kinesis Connector"
-original_id: io-kinesis
----
-
-## Sink
-
-The Kinesis Sink connector is used to pull data from Pulsar topics and persist the data into
-AWS Kinesis.
-
-### Sink Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| awsEndpoint | `true` | null | kinesis end-point url can be found at : https://docs.aws.amazon.com/general/latest/gr/rande.html |
-| awsRegion | `true` | null | appropriate aws region eg: us-west-1, us-west-2 |
-| awsKinesisStreamName | `true` | null | kinesis stream name |
-| awsCredentialPluginName | `false` | null | Fully-Qualified class name of implementation of {@inject: github:AwsCredentialProviderPlugin:/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsCredentialProviderPlugin.java}. It is a factory class which creates an AWSCredentialsProvider that will be used by Kinesis Sink. If it is empty then KinesisSink will create a default AWSCredentialsProvider which accepts json-map of credentials in `awsCredentialPluginParam` |
-| awsCredentialPluginParam | `false` | null | json-parameters to initialize `AwsCredentialsProviderPlugin` |
-| messageFormat | `true` | `ONLY_RAW_PAYLOAD` | Message format in which kinesis sink converts pulsar messages and publishes to kinesis streams |
-
-### Message Formats
-
-The available message formats are listed as below:
-
-#### **ONLY_RAW_PAYLOAD**
-
-Kinesis sink directly publishes pulsar message payload as a message into the configured kinesis stream.
-#### **FULL_MESSAGE_IN_JSON**
-
-Kinesis sink creates a json payload with pulsar message payload, properties and encryptionCtx, and publishes json payload into the configured kinesis stream.
-
-#### **FULL_MESSAGE_IN_FB**
-
-Kinesis sink creates a flatbuffer serialized paylaod with pulsar message payload, properties and encryptionCtx, and publishes flatbuffer payload into the configured kinesis stream.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-managing.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-managing.md
deleted file mode 100644
index c25e15641efb8..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-managing.md
+++ /dev/null
@@ -1,193 +0,0 @@
----
-id: io-managing
-title: Managing Connectors
-sidebar_label: "Managing Connectors"
-original_id: io-managing
----
-
-This section describes how to manage Pulsar IO connectors in a Pulsar cluster. You will learn how to:
-
-- Deploy builtin connectors
-- Monitor and update running connectors with Pulsar Admin CLI
-- Deploy customized connectors
-- Upgrade a connector
-
-## Using Builtin Connectors
-
-Pulsar bundles several [builtin connectors](io-overview.md#working-with-connectors) that should be used for moving data in and out
-of commonly used systems such as databases, messaging systems. Getting set up to use these builtin connectors is simple. You can follow
-the [instructions](getting-started-standalone.md#installing-builtin-connectors) on installing builtin connectors. After setup, all
-the builtin connectors will be automatically discovered by Pulsar brokers (or function-workers), so no additional installation steps are
-required.
-
-## Configuring Connectors
-
-Configuring Pulsar IO connectors is straightforward. What you need to do is to provide a yaml configuration file when your [run connectors](#running-connectors).
-The yaml configuration file basically tells Pulsar where to locate the sources and sinks and how to connect those sources and sinks with Pulsar topics.
-
-Below is an example yaml configuration file for Cassandra Sink:
-
-```shell
-
-tenant: public
-namespace: default
-name: cassandra-test-sink
-...
-# cassandra specific config
-configs:
-    roots: "localhost:9042"
-    keyspace: "pulsar_test_keyspace"
-    columnFamily: "pulsar_test_table"
-    keyname: "key"
-    columnName: "col"
-
-```
-
-The example yaml basically tells Pulsar which Cassandra cluster to connect, what is the `keyspace` and `columnFamily` to be used in Cassandra for collecting data,
-and how to map a Pulsar message into Cassandra table key and columns.
-
-For details, consult the documentation for [individual connectors](io-overview.md#working-with-connectors).
-
-## Running Connectors
-
-Pulsar connectors can be managed using the [`source`](reference-pulsar-admin.md#source) and [`sink`](reference-pulsar-admin.md#sink) commands of the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool.
-
-### Running sources
-
-You can submit a source to be run in an existing Pulsar cluster using a command of this form:
-
-```bash
-
-$ ./bin/pulsar-admin source create --className   --jar  --tenant  --namespace  --name  --destinationTopicName 
-
-```
-
-Here’s an example command:
-
-```bash
-
-bin/pulsar-admin source create --className org.apache.pulsar.io.twitter.TwitterFireHose --jar ~/application.jar --tenant test --namespace ns1 --name twitter-source --destinationTopicName twitter_data
-
-```
-
-Instead of submitting a source to run on an existing Pulsar cluster, you alternatively can run a source as a process on your local machine:
-
-```bash
-
-bin/pulsar-admin source localrun --className  org.apache.pulsar.io.twitter.TwitterFireHose --jar ~/application.jar --tenant test --namespace ns1 --name twitter-source --destinationTopicName twitter_data
-
-```
-
-If you are submitting a built-in source, you don't need to specify `--className` and `--jar`.
-You can simply specify the source type `--source-type`. The command to submit a built-in source is
-in following form:
-
-```bash
-
-./bin/pulsar-admin source create \
-    --tenant  \
-    --namespace  \
-    --name  \
-    --destinationTopicName  \
-    --source-type 
-
-```
-
-Here's an example to submit a Kafka source:
-
-```bash
-
-./bin/pulsar-admin source create \
-    --tenant test-tenant \
-    --namespace test-namespace \
-    --name test-kafka-source \
-    --destinationTopicName pulsar_sink_topic \
-    --source-type kafka
-
-```
-
-### Running Sinks
-
-You can submit a sink to be run in an existing Pulsar cluster using a command of this form:
-
-```bash
-
-./bin/pulsar-admin sink create --className   --jar  --tenant test --namespace  --name  --inputs 
-
-```
-
-Here’s an example command:
-
-```bash
-
-./bin/pulsar-admin sink create --className  org.apache.pulsar.io.cassandra --jar ~/application.jar --tenant test --namespace ns1 --name cassandra-sink --inputs test_topic
-
-```
-
-Instead of submitting a sink to run on an existing Pulsar cluster, you alternatively can run a sink as a process on your local machine:
-
-```bash
-
-./bin/pulsar-admin sink localrun --className  org.apache.pulsar.io.cassandra --jar ~/application.jar --tenant test --namespace ns1 --name cassandra-sink --inputs test_topic
-
-```
-
-If you are submitting a built-in sink, you don't need to specify `--className` and `--jar`.
-You can simply specify the sink type `--sink-type`. The command to submit a built-in sink is
-in following form:
-
-#### Note
-
-> The `sink-type` parameter of the currently built-in connectors is determined by the setting of the `name` parameter specified in the pulsar-io.yaml file.
-
-```bash
-
-./bin/pulsar-admin sink create \
-    --tenant  \
-    --namespace  \
-    --name  \
-    --inputs  \
-    --sink-type 
-
-```
-
-Here's an example to submit a Cassandra sink:
-
-```bash
-
-./bin/pulsar-admin sink create \
-    --tenant test-tenant \
-    --namespace test-namespace \
-    --name test-cassandra-sink \
-    --inputs pulsar_input_topic \
-    --sink-type cassandra
-
-```
-
-## Monitoring Connectors
-
-Since Pulsar IO connectors are running as [Pulsar Functions](functions-overview.md), so you can use [`functions`](reference-pulsar-admin.md#source) commands
-available in the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool.
-
-### Retrieve Connector Metadata
-
-```
-
-bin/pulsar-admin functions get \
-    --tenant  \
-    --namespace  \
-    --name 
-
-```
-
-### Retrieve Connector Running Status
-
-```
-
-bin/pulsar-admin functions getstatus \
-    --tenant  \
-    --namespace  \
-    --name 
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-overview.md
deleted file mode 100644
index 7479e1cf5ff6d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-overview.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-id: io-overview
-title: Pulsar IO Overview
-sidebar_label: "Overview"
-original_id: io-overview
----
-
-Messaging systems are most powerful when you can easily use them in conjunction with external systems like databases and other messaging systems. **Pulsar IO** is a feature of Pulsar that enables you to easily create, deploy, and manage Pulsar **connectors** that interact with external systems, such as [Apache Cassandra](https://cassandra.apache.org), [Aerospike](https://www.aerospike.com), and many others.
-
-> #### Pulsar IO and Pulsar Functions
-> Under the hood, Pulsar IO connectors are specialized [Pulsar Functions](functions-overview.md) purpose-built to interface with external systems. The [administrative interface](io-quickstart.md) for Pulsar IO is, in fact, quite similar to that of Pulsar Functions.
-
-## Sources and sinks
-
-Pulsar IO connectors come in two types:
-
-* **Sources** feed data *into* Pulsar from other systems. Common sources include other messaging systems and "firehose"-style data pipeline APIs.
-* **Sinks** are fed data *from* Pulsar. Common sinks include other messaging systems and SQL and NoSQL databases.
-
-This diagram illustrates the relationship between sources, sinks, and Pulsar:
-
-![Pulsar IO diagram](/assets/pulsar-io.png "Pulsar IO connectors (sources and sinks)")
-
-## Working with connectors
-
-Pulsar IO connectors can be managed via the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool, in particular the [`source`](reference-pulsar-admin.md#source) and [`sink`](reference-pulsar-admin.md#sink) commands.
-
-> For a guide to managing connectors in your Pulsar installation, see the [Getting started with Pulsar IO](io-quickstart.md)
-
-The following connectors are currently available for Pulsar:
-
-|Name|Java Class|Documentation|
-|---|---|---|
-|[Aerospike sink](https://www.aerospike.com/)|[`org.apache.pulsar.io.aerospike.AerospikeSink`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeStringSink.java)|[Documentation](io-aerospike.md)|
-|[Cassandra sink](https://cassandra.apache.org)|[`org.apache.pulsar.io.cassandra.CassandraSink`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/cassandra/src/main/java/org/apache/pulsar/io/cassandra/CassandraStringSink.java)|[Documentation](io-cassandra.md)|
-|[Kafka source](https://kafka.apache.org)|[`org.apache.pulsar.io.kafka.KafkaSource`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSource.java)|[Documentation](io-kafka.md#source)|
-|[Kafka sink](https://kafka.apache.org)|[`org.apache.pulsar.io.kafka.KafkaSink`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaStringSink.java)|[Documentation](io-kafka.md#sink)|
-|[Kinesis sink](https://aws.amazon.com/kinesis/)|[`org.apache.pulsar.io.kinesis.KinesisSink`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/KinesisSink.java)|[Documentation](io-kinesis.md#sink)|
-|[RabbitMQ source](https://www.rabbitmq.com)|[`org.apache.pulsar.io.rabbitmq.RabbitMQSource`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/rabbitmq/src/main/java/org/apache/pulsar/io/rabbitmq/RabbitMQSource.java)|[Documentation](io-rabbitmq.md#sink)|
-|[Twitter Firehose source](https://developer.twitter.com/en/docs)|[org.apache.pulsar.io.twitter.TwitterFireHose](https://github.com/apache/incubator-pulsar/blob/master/pulsar-io/twitter/src/main/java/org/apache/pulsar/io/twitter/TwitterFireHose.java)|[Documentation](io-twitter.md#source)|
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-quickstart.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-quickstart.md
deleted file mode 100644
index 75031e202edac..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-quickstart.md
+++ /dev/null
@@ -1,473 +0,0 @@
----
-id: io-quickstart
-title: "Tutorial: Connecting Pulsar with Apache Cassandra"
-sidebar_label: "Getting started"
-original_id: io-quickstart
----
-
-This tutorial provides a hands-on look at how you can move data out of Pulsar without writing a single line of code.
-It is helpful to review the [concepts](io-overview.md) for Pulsar I/O in tandem with running the steps in this guide
-to gain a deeper understanding. At the end of this tutorial, you will be able to:
-
-- Connect your Pulsar cluster with your Cassandra cluster
-
-:::tip
-
-1. These instructions assume you are running Pulsar in [standalone mode](getting-started-standalone.md). However all
-the commands used in this tutorial should be able to be used in a multi-nodes Pulsar cluster without any changes.
-2. All the instructions are assumed to run at the root directory of a Pulsar binary distribution.
-
-:::
-
-## Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:binary_release_url
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-## Installing Builtin Connectors
-
-Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-If you would like to enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz /path/to/apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ cp -r apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-## Start Pulsar Service
-
-```bash
-
-bin/pulsar standalone
-
-```
-
-All the components of a Pulsar service will start in order. You can curl those pulsar service endpoints to make sure Pulsar service is up running correctly.
-
-1. Check pulsar binary protocol port.
-
-```bash
-
-telnet localhost 6650
-
-```
-
-2. Check pulsar function cluster
-
-```bash
-
-curl -s http://localhost:8080/admin/v2/functions/cluster
-
-```
-
-Example output:
-
-```shell
-
-[{"workerId":"c-standalone-fw-localhost-6750","workerHostname":"localhost","port":6750}]
-
-```
-
-3. Make sure public tenant and default namespace exist
-
-```bash
-
-curl -s http://localhost:8080/admin/v2/namespaces/public
-
-```
-
-Example outoupt:
-
-```shell
-
-["public/default","public/functions"]
-
-```
-
-4. All builtin connectors should be listed as available.
-
-```bash
-
-curl -s http://localhost:8080/admin/v2/functions/connectors
-
-```
-
-Example output:
-
-```json
-
-[{"name":"aerospike","description":"Aerospike database sink","sinkClass":"org.apache.pulsar.io.aerospike.AerospikeStringSink"},{"name":"cassandra","description":"Writes data into Cassandra","sinkClass":"org.apache.pulsar.io.cassandra.CassandraStringSink"},{"name":"kafka","description":"Kafka source and sink connector","sourceClass":"org.apache.pulsar.io.kafka.KafkaStringSource","sinkClass":"org.apache.pulsar.io.kafka.KafkaBytesSink"},{"name":"kinesis","description":"Kinesis sink connector","sinkClass":"org.apache.pulsar.io.kinesis.KinesisSink"},{"name":"rabbitmq","description":"RabbitMQ source connector","sourceClass":"org.apache.pulsar.io.rabbitmq.RabbitMQSource"},{"name":"twitter","description":"Ingest data from Twitter firehose","sourceClass":"org.apache.pulsar.io.twitter.TwitterFireHose"}]
-
-```
-
-If an error occurred while starting Pulsar service, you may be able to seen exception at the terminal you are running `pulsar/standalone`,
-or you can navigate the `logs` directory under the Pulsar directory to view the logs.
-
-## Connect Pulsar to Apache Cassandra
-
-> Make sure you have docker available at your laptop. If you don't have docker installed, you can follow the [instructions](https://docs.docker.com/docker-for-mac/install/).
-
-We are using `cassandra` docker image to start a single-node cassandra cluster in Docker.
-
-### Setup the Cassandra Cluster
-
-#### Start a Cassandra Cluster
-
-```bash
-
-docker run -d --rm --name=cassandra -p 9042:9042 cassandra
-
-```
-
-Before moving to next steps, make sure the cassandra cluster is up running.
-
-1. Make sure the docker process is running.
-
-```bash
-
-docker ps
-
-```
-
-2. Check the cassandra logs to make sure cassandra process is running as expected.
-
-```bash
-
-docker logs cassandra
-
-```
-
-3. Check the cluster status
-
-```bash
-
-docker exec cassandra nodetool status
-
-```
-
-Example output:
-
-```
-
-Datacenter: datacenter1
-=======================
-Status=Up/Down
-|/ State=Normal/Leaving/Joining/Moving
---  Address     Load       Tokens       Owns (effective)  Host ID                               Rack
-UN  172.17.0.2  103.67 KiB  256          100.0%            af0e4b2f-84e0-4f0b-bb14-bd5f9070ff26  rack1
-
-```
-
-#### Create keyspace and table
-
-We are using `cqlsh` to connect to the cassandra cluster to create keyspace and table.
-
-```bash
-
-$ docker exec -ti cassandra cqlsh localhost
-Connected to Test Cluster at localhost:9042.
-[cqlsh 5.0.1 | Cassandra 3.11.2 | CQL spec 3.4.4 | Native protocol v4]
-Use HELP for help.
-cqlsh>
-
-```
-
-All the following commands are executed in `cqlsh`.
-
-##### Create keyspace `pulsar_test_keyspace`
-
-```bash
-
-cqlsh> CREATE KEYSPACE pulsar_test_keyspace WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};
-
-```
-
-#### Create table `pulsar_test_table`
-
-```bash
-
-cqlsh> USE pulsar_test_keyspace;
-cqlsh:pulsar_test_keyspace> CREATE TABLE pulsar_test_table (key text PRIMARY KEY, col text);
-
-```
-
-### Configure a Cassandra Sink
-
-Now that we have a Cassandra cluster running locally. In this section, we will configure a Cassandra sink connector.
-The Cassandra sink connector will read messages from a Pulsar topic and write the messages into a Cassandra table.
-
-In order to run a Cassandra sink connector, you need to prepare a yaml config file including informations that Pulsar IO
-runtime needs to know. For example, how Pulsar IO can find the cassandra cluster, what is the keyspace and table that
-Pulsar IO will be using for writing Pulsar messages to.
-
-Create a file `examples/cassandra-sink.yml` and edit it to fill in following content:
-
-```
-
-configs:
-    roots: "localhost:9042"
-    keyspace: "pulsar_test_keyspace"
-    columnFamily: "pulsar_test_table"
-    keyname: "key"
-    columnName: "col"
-
-```
-
-To learn more about Cassandra Connector, see [Cassandra Connector](io-cassandra.md).
-
-### Submit a Cassandra Sink
-
-Pulsar provides the [CLI](reference-cli-tools.md) for running and managing Pulsar I/O connectors.
-
-We can run following command to sink a sink connector with type `cassandra` and config file `examples/cassandra-sink.yml`.
-
-#### Note
-
-> The `sink-type` parameter of the currently built-in connectors is determined by the setting of the `name` parameter specified in the pulsar-io.yaml file.
-
-```shell
-
-bin/pulsar-admin sink create \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink \
-    --sink-type cassandra \
-    --sinkConfigFile examples/cassandra-sink.yml \
-    --inputs test_cassandra
-
-```
-
-Once the command is executed, Pulsar will create a sink connector named `cassandra-test-sink` and the sink connector will be running
-as a Pulsar Function and write the messages produced in topic `test_cassandra` to Cassandra table `pulsar_test_table`.
-
-### Inspect the Cassandra Sink
-
-Since an IO connector is running as [Pulsar Functions](functions-overview.md), you can use [functions CLI](reference-pulsar-admin.md#functions)
-for inspecting and managing the IO connectors.
-
-#### Retrieve Sink Info
-
-```bash
-
-bin/pulsar-admin functions get \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
-Example output:
-
-```shell
-
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "cassandra-test-sink",
-  "className": "org.apache.pulsar.functions.api.utils.IdentityFunction",
-  "autoAck": true,
-  "parallelism": 1,
-  "source": {
-    "topicsToSerDeClassName": {
-      "test_cassandra": ""
-    }
-  },
-  "sink": {
-    "configs": "{\"roots\":\"cassandra\",\"keyspace\":\"pulsar_test_keyspace\",\"columnFamily\":\"pulsar_test_table\",\"keyname\":\"key\",\"columnName\":\"col\"}",
-    "builtin": "cassandra"
-  },
-  "resources": {}
-}
-
-```
-
-#### Check Sink Running Status
-
-```bash
-
-bin/pulsar-admin functions getstatus \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
-Example output:
-
-```shell
-
-{
-  "functionStatusList": [
-    {
-      "running": true,
-      "instanceId": "0",
-      "metrics": {
-        "metrics": {
-          "__total_processed__": {},
-          "__total_successfully_processed__": {},
-          "__total_system_exceptions__": {},
-          "__total_user_exceptions__": {},
-          "__total_serialization_exceptions__": {},
-          "__avg_latency_ms__": {}
-        }
-      },
-      "workerId": "c-standalone-fw-localhost-6750"
-    }
-  ]
-}
-
-```
-
-### Verify the Cassandra Sink
-
-Now lets produce some messages to the input topic of the Cassandra sink `test_cassandra`.
-
-```bash
-
-for i in {0..9}; do bin/pulsar-client produce -m "key-$i" -n 1 test_cassandra; done
-
-```
-
-Inspect the sink running status again. You should be able to see 10 messages are processed by the Cassandra sink.
-
-```bash
-
-bin/pulsar-admin functions getstatus \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
-Example output:
-
-```shell
-
-{
-  "functionStatusList": [
-    {
-      "running": true,
-      "numProcessed": "11",
-      "numSuccessfullyProcessed": "11",
-      "lastInvocationTime": "1532031040117",
-      "instanceId": "0",
-      "metrics": {
-        "metrics": {
-          "__total_processed__": {
-            "count": 5.0,
-            "sum": 5.0,
-            "max": 5.0
-          },
-          "__total_successfully_processed__": {
-            "count": 5.0,
-            "sum": 5.0,
-            "max": 5.0
-          },
-          "__total_system_exceptions__": {},
-          "__total_user_exceptions__": {},
-          "__total_serialization_exceptions__": {},
-          "__avg_latency_ms__": {}
-        }
-      },
-      "workerId": "c-standalone-fw-localhost-6750"
-    }
-  ]
-}
-
-```
-
-Finally, lets inspect the results in Cassandra using `cqlsh`
-
-```bash
-
-docker exec -ti cassandra cqlsh localhost
-
-```
-
-Select the rows from the Cassandra table `pulsar_test_table`:
-
-```bash
-
-cqlsh> use pulsar_test_keyspace;
-cqlsh:pulsar_test_keyspace> select * from pulsar_test_table;
-
- key    | col
---------+--------
-  key-5 |  key-5
-  key-0 |  key-0
-  key-9 |  key-9
-  key-2 |  key-2
-  key-1 |  key-1
-  key-3 |  key-3
-  key-6 |  key-6
-  key-7 |  key-7
-  key-4 |  key-4
-  key-8 |  key-8
-
-```
-
-### Delete the Cassandra Sink
-
-```shell
-
-bin/pulsar-admin sink delete \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-rabbitmq.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-rabbitmq.md
deleted file mode 100644
index b99ba35e81a39..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-rabbitmq.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-id: io-rabbitmq
-title: RabbitMQ Connector
-sidebar_label: "RabbitMQ Connector"
-original_id: io-rabbitmq
----
-
-## Source
-
-The RabbitMQ Source connector is used for receiving messages from a RabbitMQ cluster and writing
-messages to Pulsar topics.
-
-### Source Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| `connectionName` | `true` | `null` | A new broker connection name. |
-| `amqUri` | `true` | `null` | An AMQP URI: host, port, username, password and virtual host. |
-| `queueName` | `true` | `null` | RabbitMQ queue name. |
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/io-twitter.md b/site2/website/versioned_docs/version-2.1.0-incubating/io-twitter.md
deleted file mode 100644
index b326ce8dc7433..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/io-twitter.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-id: io-twitter
-title: Twitter Firehose Connector
-sidebar_label: "Twitter Firehose Connector"
-original_id: io-twitter
----
-
-The Twitter Firehose connector is used for receiving tweets from Twitter Firehose and writing
-the tweets to Pulsar topics.
-
-## Source Configuration Options
-
-You can get the OAuth credentials from [Twitter Developers Portal](https://developer.twitter.com/en.html).
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| consumerKey | true | null | Twitter OAuth Consumer Key |
-| consumerSecret | true | null | Twitter OAuth Consumer Secret |
-| token | true | null | Twitter OAuth Token |
-| tokenSecret | true | null | Twitter OAuth Secret |
-| clientName | false | `openconnector-twitter-source"`| Client name |
-| clientHosts | false | `https://stream.twitter.com` | Twitter Firehose hosts that client connects to |
-| clientBufferSize | false | `50000` | The buffer size for buffering tweets fetched from Twitter Firehose |
-
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/pulsar-2.0.md b/site2/website/versioned_docs/version-2.1.0-incubating/pulsar-2.0.md
deleted file mode 100644
index d92cf9c7b52a0..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/pulsar-2.0.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-id: pulsar-2.0
-title: Pulsar 2.0
-sidebar_label: "Pulsar 2.0"
-original_id: pulsar-2.0
----
-
-Pulsar 2.0 is a major new release for Pulsar that brings some bold changes to the platform, including [simplified topic names](#topic-names), the addition of the [Pulsar Functions](functions-overview.md) feature, some terminology changes, and more.
-
-## New features in Pulsar 2.0
-
-Feature | Description
-:-------|:-----------
-[Pulsar Functions](functions-overview.md) | A lightweight compute option for Pulsar
-
-## Major changes
-
-There are a few major changes that you should be aware of, as they may significantly impact your day-to-day usage.
-
-### Properties versus tenants
-
-Previously, Pulsar had a concept of properties. A property is essentially the exact same thing as a tenant, so the "property" terminology has been removed in version 2.0. The [`pulsar-admin properties`](reference-pulsar-admin.md#pulsar-admin) command-line interface, for example, has been replaced with the [`pulsar-admin tenants`](reference-pulsar-admin.md#pulsar-admin-tenants) interface. In some cases the properties terminology is still used but is now considered deprecated and will be removed entirely in a future release.
-
-### Topic names
-
-Prior to version 2.0, *all* Pulsar topics had the following form:
-
-```http
-
-{persistent|non-persistent}://property/cluster/namespace/topic
-
-```
-
-Two important changes have been made in Pulsar 2.0:
-
-* There is no longer a [cluster component](#no-cluster)
-* Properties have been [renamed to tenants](#tenants)
-* You can use a [flexible](#flexible-topic-naming) naming system to shorten many topic names
-
-#### No cluster component
-
-The cluster component has been removed from topic names. Thus, all topic names now have the following form:
-
-```http
-
-{persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-> Existing topics that use the legacy name format will continue to work without any change, and there are no plans to change that.
-
-
-#### Flexible topic naming
-
-All topic names in Pulsar 2.0 internally have the form shown [above](#no-cluster-component) but you can now use shorthand names in many cases (for the sake of simplicity). The flexible naming system stems from the fact that there is now a default topic type, tenant, and namespace:
-
-Topic aspect | Default
-:------------|:-------
-topic type | `persistent`
-tenant | `public`
-namespace | `default`
-
-The table below shows some example topic name translations that use implicit defaults:
-
-Input topic name | Translated topic name
-:----------------|:---------------------
-`my-topic` | `persistent://public/default/my-topic`
-`my-tenant/my-namespace/my-topic` | `persistent://my-tenant/my-namespace/my-topic`
-
-> For [non-persistent topics](concepts-messaging.md#non-persistent-topics) you'll need to continue to specify the entire topic name, as the default-based rules for persistent topic names don't apply. Thus you cannot use a shorthand name like `non-persistent://my-topic` and would need to use `non-persistent://public/default/my-topic` instead
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/pulsar-admin.md b/site2/website/versioned_docs/version-2.1.0-incubating/pulsar-admin.md
deleted file mode 100644
index ff0c575b31596..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/pulsar-admin.md
+++ /dev/null
@@ -1,3394 +0,0 @@
----
-id: pulsar-admin
-title: Pulsar admin CLI
-sidebar_label: "Pulsar Admin CLI"
-original_id: pulsar-admin
----
-
-> **Important**
->
-> This page is deprecated and not updated anymore. For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/)
-
-The `pulsar-admin` tool enables you to manage Pulsar installations, including clusters, brokers, namespaces, tenants, and more.
-
-Usage
-
-```bash
-
-$ pulsar-admin command
-
-```
-
-Commands
-* `broker-stats`
-* `brokers`
-* `clusters`
-* `functions`
-* `functions-worker`
-* `namespaces`
-* `ns-isolation-policy`
-* `sources`
-
-  For more information, see [here](io-cli.md#sources)
-* `sinks`
-  
-  For more information, see [here](io-cli.md#sinks)
-* `topics`
-* `tenants`
-* `resource-quotas`
-* `schemas`
-
-## `broker-stats`
-
-Operations to collect broker statistics
-
-```bash
-
-$ pulsar-admin broker-stats subcommand
-
-```
-
-Subcommands
-* `allocator-stats`
-* `topics(destinations)`
-* `mbeans`
-* `monitoring-metrics`
-* `load-report`
-
-
-### `allocator-stats`
-
-Dump allocator stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats allocator-stats allocator-name
-
-```
-
-### `topics(destinations)`
-
-Dump topic stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats topics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-### `mbeans`
-
-Dump Mbean stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats mbeans options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `monitoring-metrics`
-
-Dump metrics for monitoring
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats monitoring-metrics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `load-report`
-
-Dump broker load-report
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats load-report
-
-```
-
-## `brokers`
-
-Operations about brokers
-
-```bash
-
-$ pulsar-admin brokers subcommand
-
-```
-
-Subcommands
-* `list`
-* `namespaces`
-* `update-dynamic-config`
-* `list-dynamic-config`
-* `get-all-dynamic-config`
-* `get-internal-config`
-* `get-runtime-config`
-* `healthcheck`
-
-### `list`
-List active brokers of the cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list cluster-name
-
-```
-
-### `leader-broker`
-Get the information of the leader broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers leader-broker
-
-```
-
-### `namespaces`
-List namespaces owned by the broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers namespaces cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--url`|The URL for the broker||
-
-
-### `update-dynamic-config`
-Update a broker's dynamic service configuration
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers update-dynamic-config options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--config`|Service configuration parameter name||
-|`--value`|Value for the configuration parameter value specified using the `--config` flag||
-
-
-### `list-dynamic-config`
-Get list of updatable configuration name
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list-dynamic-config
-
-```
-
-### `delete-dynamic-config`
-Delete dynamic-serviceConfiguration of broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers delete-dynamic-config options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--config`|Service configuration parameter name||
-
-
-### `get-all-dynamic-config`
-Get all overridden dynamic-configuration values
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-all-dynamic-config
-
-```
-
-### `get-internal-config`
-Get internal configuration information
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-internal-config
-
-```
-
-### `get-runtime-config`
-Get runtime configuration values
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-runtime-config
-
-```
-
-### `healthcheck`
-Run a health check against the broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers healthcheck
-
-```
-
-## `clusters`
-Operations about clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters subcommand
-
-```
-
-Subcommands
-* `get`
-* `create`
-* `update`
-* `delete`
-* `list`
-* `update-peer-clusters`
-* `get-peer-clusters`
-* `get-failure-domain`
-* `create-failure-domain`
-* `update-failure-domain`
-* `delete-failure-domain`
-* `list-failure-domains`
-
-
-### `get`
-Get the configuration data for the specified cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get cluster-name
-
-```
-
-### `create`
-Provisions a new cluster. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters create cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `update`
-Update the configuration for a cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `delete`
-Deletes an existing cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters delete cluster-name
-
-```
-
-### `list`
-List the existing clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters list
-
-```
-
-### `update-peer-clusters`
-Update peer cluster names
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update-peer-clusters cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--peer-clusters`|Comma separated peer cluster names (Pass empty string "" to delete list)||
-
-### `get-peer-clusters`
-Get list of peer clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get-peer-clusters
-
-```
-
-### `get-failure-domain`
-Get the configuration brokers of a failure domain
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `create-failure-domain`
-Create a new failure domain for a cluster (updates it if already created)
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters create-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-list`|Comma separated broker list||
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `update-failure-domain`
-Update failure domain for a cluster (creates a new one if not exist)
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-list`|Comma separated broker list||
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `delete-failure-domain`
-Delete an existing failure domain
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters delete-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `list-failure-domains`
-List the existing failure domains for a cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters list-failure-domains cluster-name
-
-```
-
-## `functions`
-
-A command-line interface for Pulsar Functions
-
-Usage
-
-```bash
-
-$ pulsar-admin functions subcommand
-
-```
-
-Subcommands
-* `localrun`
-* `create`
-* `delete`
-* `update`
-* `get`
-* `restart`
-* `stop`
-* `start`
-* `status`
-* `stats`
-* `list`
-* `querystate`
-* `putstate`
-* `trigger`
-
-
-### `localrun`
-Run the Pulsar Function locally (rather than deploying it to the Pulsar cluster)
-
-
-Usage
-
-```bash
-
-$ pulsar-admin functions localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The cpu in cores that need to be allocated per function instance(applicable only to docker runtime)||
-|`--ram`|The ram in bytes that need to be allocated per function instance(applicable only to process/docker runtime)||
-|`--disk`|The disk in bytes that need to be allocated per function instance(applicable only to docker runtime)||
-|`--auto-ack`|Whether or not the framework will automatically acknowledge messages||
-|`--subs-name`|Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer||
-|`--broker-service-url `|The URL of the Pulsar broker||
-|`--classname`|The function's class name||
-|`--custom-serde-inputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--custom-schema-inputs`|The map of input topics to Schema class names (as a JSON string)||
-|`--client-auth-params`|Client authentication param||
-|`--client-auth-plugin`|Client authentication plugin using which function-process can connect to broker||
-|`--function-config-file`|The path to a YAML config file specifying the function's configuration||
-|`--hostname-verification-enabled`|Enable hostname verification|false|
-|`--instance-id-offset`|Start the instanceIds from this offset|0|
-|`--inputs`|The function's input topic or topics (multiple topics can be specified as a comma-separated list)||
-|`--log-topic`|The topic to which the function's logs are produced||
-|`--jar`|Path to the jar file for the function (if the function is written in Java). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--output`|The function's output topic (If none is specified, no output is written)||
-|`--output-serde-classname`|The SerDe class to be used for messages output by the function||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processing-guarantees`|The processing guarantees (aka delivery semantics) applied to the function. Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]|ATLEAST_ONCE|
-|`--py`|Path to the main Python file/Python Wheel file for the function (if the function is written in Python). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--go`|Path to the main Go executable binary for the function (if the function is written in Go). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--schema-type`|The builtin schema type or custom schema class name to be used for messages output by the function||
-|`--sliding-interval-count`|The number of messages after which the window slides||
-|`--sliding-interval-duration-ms`|The time duration after which the window slides||
-|`--state-storage-service-url`|The URL for the state storage service. By default, it it set to the service URL of the Apache BookKeeper. This service URL must be added manually when the Pulsar Function runs locally. ||
-|`--tenant`|The function’s tenant||
-|`--topics-pattern`|The topic pattern to consume from list of topics under a namespace that match the pattern. [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a pattern in --custom-serde-inputs (supported for java fun only)||
-|`--user-config`|User-defined config key/values||
-|`--window-length-count`|The number of messages per window||
-|`--window-length-duration-ms`|The time duration of the window in milliseconds||
-|`--dead-letter-topic`|The topic where all messages which could not be processed successfully are sent||
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--max-message-retries`|How many times should we try to process a message before giving up||
-|`--retain-ordering`|Function consumes and processes messages in order||
-|`--retain-key-ordering`|Function consumes and processes messages in key order||
-|`--timeout-ms`|The message timeout in milliseconds||
-|`--tls-allow-insecure`|Allow insecure tls connection|false|
-|`--tls-trust-cert-path`|The tls trust cert file path||
-|`--use-tls`|Use tls connection|false|
-|`--producer-config`| The custom producer configuration (as a JSON string) | |
-
-
-### `create`
-Create a Pulsar Function in cluster mode (i.e. deploy it on a Pulsar cluster)
-
-Usage
-
-```
-
-$ pulsar-admin functions create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The cpu in cores that need to be allocated per function instance(applicable only to docker runtime)||
-|`--ram`|The ram in bytes that need to be allocated per function instance(applicable only to process/docker runtime)||
-|`--disk`|The disk in bytes that need to be allocated per function instance(applicable only to docker runtime)||
-|`--auto-ack`|Whether or not the framework will automatically acknowledge messages||
-|`--subs-name`|Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer||
-|`--classname`|The function's class name||
-|`--custom-serde-inputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--custom-schema-inputs`|The map of input topics to Schema class names (as a JSON string)||
-|`--function-config-file`|The path to a YAML config file specifying the function's configuration||
-|`--inputs`|The function's input topic or topics (multiple topics can be specified as a comma-separated list)||
-|`--log-topic`|The topic to which the function's logs are produced||
-|`--jar`|Path to the jar file for the function (if the function is written in Java). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--name`|The function's name||
-|`--namespace`|The function’s namespace||
-|`--output`|The function's output topic (If none is specified, no output is written)||
-|`--output-serde-classname`|The SerDe class to be used for messages output by the function||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processing-guarantees`|The processing guarantees (aka delivery semantics) applied to the function. Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]|ATLEAST_ONCE|
-|`--py`|Path to the main Python file/Python Wheel file for the function (if the function is written in Python). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--go`|Path to the main Go executable binary for the function (if the function is written in Go). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--schema-type`|The builtin schema type or custom schema class name to be used for messages output by the function||
-|`--sliding-interval-count`|The number of messages after which the window slides||
-|`--sliding-interval-duration-ms`|The time duration after which the window slides||
-|`--tenant`|The function’s tenant||
-|`--topics-pattern`|The topic pattern to consume from list of topics under a namespace that match the pattern. [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a pattern in --custom-serde-inputs (supported for java fun only)||
-|`--user-config`|User-defined config key/values||
-|`--window-length-count`|The number of messages per window||
-|`--window-length-duration-ms`|The time duration of the window in milliseconds||
-|`--dead-letter-topic`|The topic where all messages which could not be processed||
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--max-message-retries`|How many times should we try to process a message before giving up||
-|`--retain-ordering`|Function consumes and processes messages in order||
-|`--retain-key-ordering`|Function consumes and processes messages in key order||
-|`--timeout-ms`|The message timeout in milliseconds||
-|`--producer-config`| The custom producer configuration (as a JSON string) | |
-
-
-### `delete`
-Delete a Pulsar Function that's running on a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `update`
-Update a Pulsar Function that's been deployed to a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions update options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The cpu in cores that need to be allocated per function instance(applicable only to docker runtime)||
-|`--ram`|The ram in bytes that need to be allocated per function instance(applicable only to process/docker runtime)||
-|`--disk`|The disk in bytes that need to be allocated per function instance(applicable only to docker runtime)||
-|`--auto-ack`|Whether or not the framework will automatically acknowledge messages||
-|`--subs-name`|Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer||
-|`--classname`|The function's class name||
-|`--custom-serde-inputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--custom-schema-inputs`|The map of input topics to Schema class names (as a JSON string)||
-|`--function-config-file`|The path to a YAML config file specifying the function's configuration||
-|`--inputs`|The function's input topic or topics (multiple topics can be specified as a comma-separated list)||
-|`--log-topic`|The topic to which the function's logs are produced||
-|`--jar`|Path to the jar file for the function (if the function is written in Java). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--name`|The function's name||
-|`--namespace`|The function’s namespace||
-|`--output`|The function's output topic (If none is specified, no output is written)||
-|`--output-serde-classname`|The SerDe class to be used for messages output by the function||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processing-guarantees`|The processing guarantees (aka delivery semantics) applied to the function. Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]|ATLEAST_ONCE|
-|`--py`|Path to the main Python file/Python Wheel file for the function (if the function is written in Python). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--go`|Path to the main Go executable binary for the function (if the function is written in Go). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--schema-type`|The builtin schema type or custom schema class name to be used for messages output by the function||
-|`--sliding-interval-count`|The number of messages after which the window slides||
-|`--sliding-interval-duration-ms`|The time duration after which the window slides||
-|`--tenant`|The function’s tenant||
-|`--topics-pattern`|The topic pattern to consume from list of topics under a namespace that match the pattern. [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a pattern in --custom-serde-inputs (supported for java fun only)||
-|`--user-config`|User-defined config key/values||
-|`--window-length-count`|The number of messages per window||
-|`--window-length-duration-ms`|The time duration of the window in milliseconds||
-|`--dead-letter-topic`|The topic where all messages which could not be processed||
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--max-message-retries`|How many times should we try to process a message before giving up||
-|`--retain-ordering`|Function consumes and processes messages in order||
-|`--retain-key-ordering`|Function consumes and processes messages in key order||
-|`--timeout-ms`|The message timeout in milliseconds||
-|`--producer-config`| The custom producer configuration (as a JSON string) | |
-
-
-### `get`
-Fetch information about a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `restart`
-Restart function instance
-
-Usage
-
-```bash
-
-$ pulsar-admin functions restart options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (restart all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `stop`
-Stops function instance
-
-Usage
-
-```bash
-
-$ pulsar-admin functions stop options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (stop all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `start`
-Starts a stopped function instance
-
-Usage
-
-```bash
-
-$ pulsar-admin functions start options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (start all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `status`
-Check the current status of a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions status options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (Get-status of all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `stats`
-Get the current stats of a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions stats options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (Get-stats of all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-### `list`
-List all of the Pulsar Functions running under a specific tenant and namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin functions list options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `querystate`
-Fetch the current state associated with a Pulsar Function running in cluster mode
-
-Usage
-
-```bash
-
-$ pulsar-admin functions querystate options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`-k`, `--key`|The key for the state you want to fetch||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-|`-w`, `--watch`|Watch for changes in the value associated with a key for a Pulsar Function|false|
-
-### `putstate`
-Put a key/value pair to the state associated with a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions putstate options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the Pulsar Function||
-|`--name`|The name of a Pulsar Function||
-|`--namespace`|The namespace of a Pulsar Function||
-|`--tenant`|The tenant of a Pulsar Function||
-|`-s`, `--state`|The FunctionState that needs to be put||
-
-### `trigger`
-Triggers the specified Pulsar Function with a supplied value
-
-Usage
-
-```bash
-
-$ pulsar-admin functions trigger options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-|`--topic`|The specific topic name that the function consumes from that you want to inject the data to||
-|`--trigger-file`|The path to the file that contains the data with which you'd like to trigger the function||
-|`--trigger-value`|The value with which you want to trigger the function||
-
-
-## `functions-worker`
-Operations to collect function-worker statistics
-
-```bash
-
-$ pulsar-admin functions-worker subcommand
-
-```
-
-Subcommands
-
-* `function-stats`
-* `get-cluster`
-* `get-cluster-leader`
-* `get-function-assignments`
-* `monitoring-metrics`
-
-### `function-stats`
-
-Dump all functions stats running on this broker
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker function-stats
-
-```
-
-### `get-cluster`
-
-Get all workers belonging to this cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker get-cluster
-
-```
-
-### `get-cluster-leader`
-
-Get the leader of the worker cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker get-cluster-leader
-
-```
-
-### `get-function-assignments`
-
-Get the assignments of the functions across the worker cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker get-function-assignments
-
-```
-
-### `monitoring-metrics`
-
-Dump metrics for Monitoring
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker monitoring-metrics
-
-```
-
-## `namespaces`
-
-Operations for managing namespaces
-
-```bash
-
-$ pulsar-admin namespaces subcommand
-
-```
-
-Subcommands
-* `list`
-* `topics`
-* `policies`
-* `create`
-* `delete`
-* `set-deduplication`
-* `set-auto-topic-creation`
-* `remove-auto-topic-creation`
-* `set-auto-subscription-creation`
-* `remove-auto-subscription-creation`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `grant-subscription-permission`
-* `revoke-subscription-permission`
-* `set-clusters`
-* `get-clusters`
-* `get-backlog-quotas`
-* `set-backlog-quota`
-* `remove-backlog-quota`
-* `get-persistence`
-* `set-persistence`
-* `get-message-ttl`
-* `set-message-ttl`
-* `remove-message-ttl`
-* `get-anti-affinity-group`
-* `set-anti-affinity-group`
-* `get-anti-affinity-namespaces`
-* `delete-anti-affinity-group`
-* `get-retention`
-* `set-retention`
-* `unload`
-* `split-bundle`
-* `set-dispatch-rate`
-* `get-dispatch-rate`
-* `set-replicator-dispatch-rate`
-* `get-replicator-dispatch-rate`
-* `set-subscribe-rate`
-* `get-subscribe-rate`
-* `set-subscription-dispatch-rate`
-* `get-subscription-dispatch-rate`
-* `clear-backlog`
-* `unsubscribe`
-* `set-encryption-required`
-* `set-delayed-delivery`
-* `get-delayed-delivery`
-* `set-subscription-auth-mode`
-* `get-max-producers-per-topic`
-* `set-max-producers-per-topic`
-* `get-max-consumers-per-topic`
-* `set-max-consumers-per-topic`
-* `get-max-consumers-per-subscription`
-* `set-max-consumers-per-subscription`
-* `get-max-unacked-messages-per-subscription`
-* `set-max-unacked-messages-per-subscription`
-* `get-max-unacked-messages-per-consumer`
-* `set-max-unacked-messages-per-consumer`
-* `get-compaction-threshold`
-* `set-compaction-threshold`
-* `get-offload-threshold`
-* `set-offload-threshold`
-* `get-offload-deletion-lag`
-* `set-offload-deletion-lag`
-* `clear-offload-deletion-lag`
-* `get-schema-autoupdate-strategy`
-* `set-schema-autoupdate-strategy`
-* `set-offload-policies`
-* `get-offload-policies`
-* `set-max-subscriptions-per-topic`
-* `get-max-subscriptions-per-topic`
-* `remove-max-subscriptions-per-topic`
-
-
-### `list`
-Get the namespaces for a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces list tenant-name
-
-```
-
-### `topics`
-Get the list of topics for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces topics tenant/namespace
-
-```
-
-### `policies`
-Get the configuration policies of a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces policies tenant/namespace
-
-```
-
-### `create`
-Create a new namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces create tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-b`, `--bundles`|The number of bundles to activate|0|
-|`-c`, `--clusters`|List of clusters this namespace will be assigned||
-
-
-### `delete`
-Deletes a namespace. The namespace needs to be empty
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces delete tenant/namespace
-
-```
-
-### `set-deduplication`
-Enable or disable message deduplication on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-deduplication tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable message deduplication on the specified namespace|false|
-|`--disable`, `-d`|Disable message deduplication on the specified namespace|false|
-
-### `set-auto-topic-creation`
-Enable or disable autoTopicCreation for a namespace, overriding broker settings
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-auto-topic-creation tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable allowAutoTopicCreation on namespace|false|
-|`--disable`, `-d`|Disable allowAutoTopicCreation on namespace|false|
-|`--type`, `-t`|Type of topic to be auto-created. Possible values: (partitioned, non-partitioned)|non-partitioned|
-|`--num-partitions`, `-n`|Default number of partitions of topic to be auto-created, applicable to partitioned topics only||
-
-### `remove-auto-topic-creation`
-Remove override of autoTopicCreation for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-auto-topic-creation tenant/namespace
-
-```
-
-### `set-auto-subscription-creation`
-Enable autoSubscriptionCreation for a namespace, overriding broker settings
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-auto-subscription-creation tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable allowAutoSubscriptionCreation on namespace|false|
-
-### `remove-auto-subscription-creation`
-Remove override of autoSubscriptionCreation for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-auto-subscription-creation tenant/namespace
-
-```
-
-### `permissions`
-Get the permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces permissions tenant/namespace
-
-```
-
-### `grant-permission`
-Grant permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces grant-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces revoke-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--role`|The client role to which to revoke the permissions||
-
-### `grant-subscription-permission`
-Grant permissions to access subscription admin-api
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces grant-subscription-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--roles`|The client roles to which to grant the permissions (comma separated roles)||
-|`--subscription`|The subscription name for which permission will be granted to roles||
-
-### `revoke-subscription-permission`
-Revoke permissions to access subscription admin-api
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces revoke-subscription-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--role`|The client role to which to revoke the permissions||
-|`--subscription`|The subscription name for which permission will be revoked to roles||
-
-### `set-clusters`
-Set replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-clusters tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--clusters`|Replication clusters ID list (comma-separated values)||
-
-
-### `get-clusters`
-Get replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-clusters tenant/namespace
-
-```
-
-### `get-backlog-quotas`
-Get the backlog quota policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-backlog-quotas tenant/namespace
-
-```
-
-### `set-backlog-quota`
-Set a backlog quota policy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--limit`|The backlog size limit (for example `10M` or `16G`)||
-|`-lt`, `--limitTime`|Time limit in second, non-positive number for disabling time limit. (for example 3600 for 1 hour)||
-|`-p`, `--policy`|The retention policy to enforce when the limit is reached. The valid options are: `producer_request_hold`, `producer_exception` or `consumer_backlog_eviction`|
-|`-t`, `--type`|Backlog quota type to set. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Example
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns \
---limit 2G \
---policy producer_request_hold
-
-```
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns \
---limitTime 3600 \
---policy producer_request_hold \
---type message_age
-
-```
-
-### `remove-backlog-quota`
-Remove a backlog quota policy from a namespace
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--type`|Backlog quota type to remove. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-backlog-quota tenant/namespace
-
-```
-
-### `get-persistence`
-Get the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-persistence tenant/namespace
-
-```
-
-### `set-persistence`
-Set the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-persistence tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-a`, `--bookkeeper-ack-quorum`|The number of acks (guaranteed copies) to wait for each entry|0|
-|`-e`, `--bookkeeper-ensemble`|The number of bookies to use for a topic|0|
-|`-w`, `--bookkeeper-write-quorum`|How many writes to make of each entry|0|
-|`-r`, `--ml-mark-delete-max-rate`|Throttling rate of mark-delete operation (0 means no throttle)||
-
-
-### `get-message-ttl`
-Get the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-message-ttl tenant/namespace
-
-```
-
-### `set-message-ttl`
-Set the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-message-ttl tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-ttl`, `--messageTTL`|Message TTL in seconds. When the value is set to `0`, TTL is disabled. TTL is disabled by default. |0|
-
-### `remove-message-ttl`
-Remove the message TTL for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-message-ttl tenant/namespace
-
-```
-
-### `get-anti-affinity-group`
-Get Anti-affinity group name for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-anti-affinity-group tenant/namespace
-
-```
-
-### `set-anti-affinity-group`
-Set Anti-affinity group name for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-anti-affinity-group tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-g`, `--group`|Anti-affinity group name||
-
-### `get-anti-affinity-namespaces`
-Get Anti-affinity namespaces grouped with the given anti-affinity group name
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-anti-affinity-namespaces options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--cluster`|Cluster name||
-|`-g`, `--group`|Anti-affinity group name||
-|`-p`, `--tenant`|Tenant is only used for authorization. Client has to be admin of any of the tenant to access this api||
-
-### `delete-anti-affinity-group`
-Remove Anti-affinity group name for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces delete-anti-affinity-group tenant/namespace
-
-```
-
-### `get-retention`
-Get the retention policy that is applied to each topic within the specified namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-retention tenant/namespace
-
-```
-
-### `set-retention`
-Set the retention policy for each topic within the specified namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-retention tenant/namespace
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|The retention size limits (for example 10M, 16G or 3T) for each topic in the namespace. 0 means no retention and -1 means infinite size retention||
-|`-t`, `--time`|The retention time in minutes, hours, days, or weeks. Examples: 100m, 13h, 2d, 5w. 0 means no retention and -1 means infinite time retention||
-
-
-### `unload`
-Unload a namespace or namespace bundle from the current serving broker.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unload tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-
-### `split-bundle`
-Split a namespace-bundle from the current serving broker
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces split-bundle tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-|`-u`, `--unload`|Unload newly split bundles after splitting old bundle|false|
-
-### `set-dispatch-rate`
-Set message-dispatch-rate for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-dispatch-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bd`, `--byte-dispatch-rate`|The byte dispatch rate (default -1 will be overwrite if not passed)|-1|
-|`-dt`, `--dispatch-rate-period`|The dispatch rate period in second type (default 1 second will be overwrite if not passed)|1|
-|`-md`, `--msg-dispatch-rate`|The message dispatch rate (default -1 will be overwrite if not passed)|-1|
-
-### `get-dispatch-rate`
-Get configured message-dispatch-rate for all topics of the namespace (Disabled if value < 0)
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-dispatch-rate tenant/namespace
-
-```
-
-### `set-replicator-dispatch-rate`
-Set replicator message-dispatch-rate for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-replicator-dispatch-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bd`, `--byte-dispatch-rate`|The byte dispatch rate (default -1 will be overwrite if not passed)|-1|
-|`-dt`, `--dispatch-rate-period`|The dispatch rate period in second type (default 1 second will be overwrite if not passed)|1|
-|`-md`, `--msg-dispatch-rate`|The message dispatch rate (default -1 will be overwrite if not passed)|-1|
-
-### `get-replicator-dispatch-rate`
-Get replicator configured message-dispatch-rate for all topics of the namespace (Disabled if value < 0)
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-replicator-dispatch-rate tenant/namespace
-
-```
-
-### `set-subscribe-rate`
-Set subscribe-rate per consumer for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-subscribe-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-sr`, `--subscribe-rate`|The subscribe rate (default -1 will be overwrite if not passed)|-1|
-|`-st`, `--subscribe-rate-period`|The subscribe rate period in second type (default 30 second will be overwrite if not passed)|30|
-
-### `get-subscribe-rate`
-Get configured subscribe-rate per consumer for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-subscribe-rate tenant/namespace
-
-```
-
-### `set-subscription-dispatch-rate`
-Set subscription message-dispatch-rate for all subscription of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-subscription-dispatch-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bd`, `--byte-dispatch-rate`|The byte dispatch rate (default -1 will be overwrite if not passed)|-1|
-|`-dt`, `--dispatch-rate-period`|The dispatch rate period in second type (default 1 second will be overwrite if not passed)|1|
-|`-md`, `--sub-msg-dispatch-rate`|The message dispatch rate (default -1 will be overwrite if not passed)|-1|
-
-### `get-subscription-dispatch-rate`
-Get subscription configured message-dispatch-rate for all topics of the namespace (Disabled if value < 0)
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-subscription-dispatch-rate tenant/namespace
-
-```
-
-### `clear-backlog`
-Clear the backlog for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces clear-backlog tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-|`-force`, `--force`|Whether to force a clear backlog without prompt|false|
-|`-s`, `--sub`|The subscription name||
-
-
-### `unsubscribe`
-Unsubscribe the given subscription on all destinations on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unsubscribe tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-|`-s`, `--sub`|The subscription name||
-
-### `set-encryption-required`
-Enable or disable message encryption required for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-encryption-required tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-d`, `--disable`|Disable message encryption required|false|
-|`-e`, `--enable`|Enable message encryption required|false|
-
-### `set-delayed-delivery`
-Set the delayed delivery policy on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-delayed-delivery tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-d`, `--disable`|Disable delayed delivery messages|false|
-|`-e`, `--enable`|Enable delayed delivery messages|false|
-|`-t`, `--time`|The tick time for when retrying on delayed delivery messages|1s|
-
-
-### `get-delayed-delivery`
-Get the delayed delivery policy on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-delayed-delivery-time tenant/namespace
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-t`, `--time`|The tick time for when retrying on delayed delivery messages|1s|
-
-
-### `set-subscription-auth-mode`
-Set subscription auth mode on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-subscription-auth-mode tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-m`, `--subscription-auth-mode`|Subscription authorization mode for Pulsar policies. Valid options are: [None, Prefix]||
-
-### `get-max-producers-per-topic`
-Get maxProducersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-producers-per-topic tenant/namespace
-
-```
-
-### `set-max-producers-per-topic`
-Set maxProducersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-producers-per-topic tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-p`, `--max-producers-per-topic`|maxProducersPerTopic for a namespace|0|
-
-### `get-max-consumers-per-topic`
-Get maxConsumersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-consumers-per-topic tenant/namespace
-
-```
-
-### `set-max-consumers-per-topic`
-Set maxConsumersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-consumers-per-topic tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-consumers-per-topic`|maxConsumersPerTopic for a namespace|0|
-
-### `get-max-consumers-per-subscription`
-Get maxConsumersPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-consumers-per-subscription tenant/namespace
-
-```
-
-### `set-max-consumers-per-subscription`
-Set maxConsumersPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-consumers-per-subscription tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-consumers-per-subscription`|maxConsumersPerSubscription for a namespace|0|
-
-### `get-max-unacked-messages-per-subscription`
-Get maxUnackedMessagesPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-unacked-messages-per-subscription tenant/namespace
-
-```
-
-### `set-max-unacked-messages-per-subscription`
-Set maxUnackedMessagesPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-unacked-messages-per-subscription tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-unacked-messages-per-subscription`|maxUnackedMessagesPerSubscription for a namespace|-1|
-
-### `get-max-unacked-messages-per-consumer`
-Get maxUnackedMessagesPerConsumer for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-unacked-messages-per-consumer tenant/namespace
-
-```
-
-### `set-max-unacked-messages-per-consumer`
-Set maxUnackedMessagesPerConsumer for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-unacked-messages-per-consumer tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-unacked-messages-per-consumer`|maxUnackedMessagesPerConsumer for a namespace|-1|
-
-
-### `get-compaction-threshold`
-Get compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-compaction-threshold tenant/namespace
-
-```
-
-### `set-compaction-threshold`
-Set compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-compaction-threshold tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-t`, `--threshold`|Maximum number of bytes in a topic backlog before compaction is triggered (eg: 10M, 16G, 3T). 0 disables automatic compaction|0|
-
-
-### `get-offload-threshold`
-Get offloadThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-threshold tenant/namespace
-
-```
-
-### `set-offload-threshold`
-Set offloadThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-offload-threshold tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|Maximum number of bytes stored in the pulsar cluster for a topic before data will start being automatically offloaded to longterm storage (eg: 10M, 16G, 3T, 100). Negative values disable automatic offload. 0 triggers offloading as soon as possible.|-1|
-
-### `get-offload-deletion-lag`
-Get offloadDeletionLag, in minutes, for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-deletion-lag tenant/namespace
-
-```
-
-### `set-offload-deletion-lag`
-Set offloadDeletionLag for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-offload-deletion-lag tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--lag`|Duration to wait after offloading a ledger segment, before deleting the copy of that segment from cluster local storage. (eg: 10m, 5h, 3d, 2w).|-1|
-
-### `clear-offload-deletion-lag`
-Clear offloadDeletionLag for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces clear-offload-deletion-lag tenant/namespace
-
-```
-
-### `get-schema-autoupdate-strategy`
-Get the schema auto-update strategy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-schema-autoupdate-strategy tenant/namespace
-
-```
-
-### `set-schema-autoupdate-strategy`
-Set the schema auto-update strategy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-schema-autoupdate-strategy tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--compatibility`|Compatibility level required for new schemas created via a Producer. Possible values (Full, Backward, Forward, None).|Full|
-|`-d`, `--disabled`|Disable automatic schema updates.|false|
-
-### `get-publish-rate`
-Get the message publish rate for each topic in a namespace, in bytes as well as messages per second 
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-publish-rate tenant/namespace
-
-```
-
-### `set-publish-rate`
-Set the message publish rate for each topic in a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-publish-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-m`, `--msg-publish-rate`|Threshold for number of messages per second per topic in the namespace (-1 implies not set, 0 for no limit).|-1|
-|`-b`, `--byte-publish-rate`|Threshold for number of bytes per second per topic in the namespace (-1 implies not set, 0 for no limit).|-1|
-
-### `set-offload-policies`
-Set the offload policy for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-offload-policies tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-d`, `--driver`|Driver to use to offload old data to long term storage,(Possible values: S3, aws-s3, google-cloud-storage)||
-|`-r`, `--region`|The long term storage region||
-|`-b`, `--bucket`|Bucket to place offloaded ledger into||
-|`-e`, `--endpoint`|Alternative endpoint to connect to||
-|`-i`, `--aws-id`|AWS Credential Id to use when using driver S3 or aws-s3||
-|`-s`, `--aws-secret`|AWS Credential Secret to use when using driver S3 or aws-s3||
-|`-ro`, `--s3-role`|S3 Role used for STSAssumeRoleSessionCredentialsProvider using driver S3 or aws-s3||
-|`-rsn`, `--s3-role-session-name`|S3 role session name used for STSAssumeRoleSessionCredentialsProvider using driver S3 or aws-s3||
-|`-mbs`, `--maxBlockSize`|Max block size|64MB|
-|`-rbs`, `--readBufferSize`|Read buffer size|1MB|
-|`-oat`, `--offloadAfterThreshold`|Offload after threshold size (eg: 1M, 5M)||
-|`-oae`, `--offloadAfterElapsed`|Offload after elapsed in millis (or minutes, hours,days,weeks eg: 100m, 3h, 2d, 5w).||
-
-### `get-offload-policies`
-Get the offload policy for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-policies tenant/namespace
-
-```
-
-### `set-max-subscriptions-per-topic`
-Set the maximum subscription per topic for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-subscriptions-per-topic tenant/namespace
-
-```
-
-### `get-max-subscriptions-per-topic`
-Get the maximum subscription per topic for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-subscriptions-per-topic tenant/namespace
-
-```
-
-### `remove-max-subscriptions-per-topic`
-Remove the maximum subscription per topic for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-max-subscriptions-per-topic tenant/namespace
-
-```
-
-## `ns-isolation-policy`
-Operations for managing namespace isolation policies.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy subcommand
-
-```
-
-Subcommands
-* `set`
-* `get`
-* `list`
-* `delete`
-* `brokers`
-* `broker`
-
-### `set`
-Create/update a namespace isolation policy for a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy set cluster-name policy-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--auto-failover-policy-params`|Comma-separated name=value auto failover policy parameters|[]|
-|`--auto-failover-policy-type`|Auto failover policy type name. Currently available options: min_available.|[]|
-|`--namespaces`|Comma-separated namespaces regex list|[]|
-|`--primary`|Comma-separated primary broker regex list|[]|
-|`--secondary`|Comma-separated secondary broker regex list|[]|
-
-
-### `get`
-Get the namespace isolation policy of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy get cluster-name policy-name
-
-```
-
-### `list`
-List all namespace isolation policies of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy list cluster-name
-
-```
-
-### `delete`
-Delete namespace isolation policy of a cluster. This operation requires superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy delete
-
-```
-
-### `brokers`
-List all brokers with namespace-isolation policies attached to it. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy brokers cluster-name
-
-```
-
-### `broker`
-Get broker with namespace-isolation policies attached to it. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy broker cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--broker`|Broker name to get namespace-isolation policies attached to it||
-
-## `topics`
-Operations for managing Pulsar topics (both persistent and non-persistent). 
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subcommand
-
-```
-
-From Pulsar 2.7.0, some namespace-level policies are available on topic level. To enable topic-level policy in Pulsar, you need to configure the following parameters in the `broker.conf` file. 
-
-```shell
-
-systemTopicEnabled=true
-topicLevelPoliciesEnabled=true
-
-```
-
-Subcommands
-* `compact`
-* `compaction-status`
-* `offload`
-* `offload-status`
-* `create-partitioned-topic`
-* `create-missed-partitions`
-* `delete-partitioned-topic`
-* `create`
-* `get-partitioned-topic-metadata`
-* `update-partitioned-topic`
-* `list-partitioned-topics`
-* `list`
-* `terminate`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `lookup`
-* `bundle-range`
-* `delete`
-* `unload`
-* `create-subscription`
-* `subscriptions`
-* `unsubscribe`
-* `stats`
-* `stats-internal`
-* `info-internal`
-* `partitioned-stats`
-* `partitioned-stats-internal`
-* `skip`
-* `clear-backlog`
-* `expire-messages`
-* `expire-messages-all-subscriptions`
-* `peek-messages`
-* `reset-cursor`
-* `get-message-by-id`
-* `last-message-id`
-* `get-backlog-quotas`
-* `set-backlog-quota`
-* `remove-backlog-quota`
-* `get-persistence`
-* `set-persistence`
-* `remove-persistence`
-* `get-message-ttl`
-* `set-message-ttl`
-* `remove-message-ttl`
-* `get-deduplication`
-* `set-deduplication`
-* `remove-deduplication`
-* `get-retention`
-* `set-retention`
-* `remove-retention`
-* `get-dispatch-rate`
-* `set-dispatch-rate`
-* `remove-dispatch-rate`
-* `get-max-unacked-messages-per-subscription`
-* `set-max-unacked-messages-per-subscription`
-* `remove-max-unacked-messages-per-subscription`
-* `get-max-unacked-messages-per-consumer`
-* `set-max-unacked-messages-per-consumer`
-* `remove-max-unacked-messages-per-consumer`
-* `get-delayed-delivery`
-* `set-delayed-delivery`
-* `remove-delayed-delivery`
-* `get-max-producers`
-* `set-max-producers`
-* `remove-max-producers`
-* `get-max-consumers`
-* `set-max-consumers`
-* `remove-max-consumers`
-* `get-compaction-threshold`
-* `set-compaction-threshold`
-* `remove-compaction-threshold`
-* `get-offload-policies`
-* `set-offload-policies`
-* `remove-offload-policies`
-* `get-inactive-topic-policies`
-* `set-inactive-topic-policies`
-* `remove-inactive-topic-policies`
-* `set-max-subscriptions`
-* `get-max-subscriptions`
-* `remove-max-subscriptions`
-
-### `compact`
-Run compaction on the specified topic (persistent topics only)
-
-Usage
-
-```
-
-$ pulsar-admin topics compact persistent://tenant/namespace/topic
-
-```
-
-### `compaction-status`
-Check the status of a topic compaction (persistent topics only)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics compaction-status persistent://tenant/namespace/topic
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `offload`
-Trigger offload of data from a topic to long-term storage (e.g. Amazon S3)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--size-threshold`|The maximum amount of data to keep in BookKeeper for the specific topic||
-
-
-### `offload-status`
-Check the status of data offloading from a topic to long-term storage
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload-status persistent://tenant/namespace/topic op
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `create-partitioned-topic`
-Create a partitioned topic. A partitioned topic must be created before producers can publish to it.
-
-:::note
-
-By default, after 60 seconds of creation, topics are considered inactive and deleted automatically to prevent from generating trash data.
-To disable this feature, set `brokerDeleteInactiveTopicsEnabled` to `false`.
-To change the frequency of checking inactive topics, set `brokerDeleteInactiveTopicsFrequencySeconds` to your desired value.
-For more information about these two parameters, see [here](reference-configuration.md#broker).
-
-:::
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-### `create-missed-partitions`
-Try to create partitions for partitioned topic. The partitions of partition topic has to be created, 
-can be used by repair partitions when topic auto creation is disabled
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-missed-partitions persistent://tenant/namespace/topic
-
-```
-
-### `delete-partitioned-topic`
-Delete a partitioned topic. This will also delete all the partitions of the topic if they exist.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete-partitioned-topic {persistent|non-persistent}
-
-```
-
-### `create`
-Creates a non-partitioned topic. A non-partitioned topic must explicitly be created by the user if allowAutoTopicCreation or createIfMissing is disabled.
-
-:::note
-
-By default, after 60 seconds of creation, topics are considered inactive and deleted automatically to prevent from generating trash data.
-To disable this feature, set `brokerDeleteInactiveTopicsEnabled`  to `false`.
-To change the frequency of checking inactive topics, set `brokerDeleteInactiveTopicsFrequencySeconds` to your desired value.
-For more information about these two parameters, see [here](reference-configuration.md#broker).
-
-:::
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create {persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-### `get-partitioned-topic-metadata`
-Get the partitioned topic metadata. If the topic is not created or is a non-partitioned topic, this will return an empty topic with zero partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-partitioned-topic-metadata {persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-### `update-partitioned-topic`
-Update existing non-global partitioned topic. New updating number of partitions must be greater than existing number of partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics update-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-### `list-partitioned-topics`
-Get the list of partitioned topics under a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics list-partitioned-topics tenant/namespace
-
-```
-
-### `list`
-Get the list of topics under a namespace
-
-Usage
-
-```
-
-$ pulsar-admin topics list tenant/cluster/namespace
-
-```
-
-### `terminate`
-Terminate a persistent topic (disallow further messages from being published on the topic)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics terminate persistent://tenant/namespace/topic
-
-```
-
-### `partitioned-terminate`
-Terminate a persistent topic (disallow further messages from being published on the topic)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-terminate persistent://tenant/namespace/topic
-
-```
-
-### `permissions`
-Get the permissions on a topic. Retrieve the effective permissions for a destination. These permissions are defined by the permissions set at the namespace level combined (union) with any eventual specific permissions set on the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics permissions topic
-
-```
-
-### `grant-permission`
-Grant a new permission to a client role on a single topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics grant-permission {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions to a client role on a single topic. If the permission was not set at the topic level, but rather at the namespace level, this operation will return an error (HTTP status code 412).
-
-Usage
-
-```bash
-
-$ pulsar-admin topics revoke-permission topic
-
-```
-
-### `lookup`
-Look up a topic from the current serving broker
-
-Usage
-
-```bash
-
-$ pulsar-admin topics lookup topic
-
-```
-
-### `bundle-range`
-Get the namespace bundle which contains the given topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics bundle-range topic
-
-```
-
-### `delete`
-Delete a topic. The topic cannot be deleted if there are any active subscriptions or producers connected to the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete topic
-
-```
-
-### `unload`
-Unload a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unload topic
-
-```
-
-### `create-subscription`
-Create a new subscription on a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-subscription [options] persistent://tenant/namespace/topic
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-m`, `--messageId`|messageId where to create the subscription. It can be either 'latest', 'earliest' or (ledgerId:entryId)|latest|
-|`-s`, `--subscription`|Subscription to reset position on||
-
-### `subscriptions`
-Get the list of subscriptions on the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subscriptions topic
-
-```
-
-### `unsubscribe`
-Delete a durable subscriber from a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unsubscribe topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to delete||
-|`-f`, `--force`|Disconnect and close all consumers and delete subscription forcefully|false|
-
-
-### `stats`
-Get the stats for the topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats topic
-
-```
-
-:::note
-
-The unit of `storageSize` and `averageMsgSize` is Byte.
-
-:::
-
-### `stats-internal`
-Get the internal stats for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats-internal topic
-
-```
-
-### `info-internal`
-Get the internal metadata info for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics info-internal topic
-
-```
-
-### `partitioned-stats`
-Get the stats for the partitioned topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-stats topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--per-partition`|Get per-partition stats|false|
-
-### `partitioned-stats-internal`
-Get the internal stats for the partitioned topic and its connected producers and consumers. All the rates are computed over a 1 minute window and are relative the last completed 1 minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-stats-internal topic
-
-```
-
-### `skip`
-Skip some messages for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics skip topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages to skip|0|
-|`-s`, `--subscription`|The subscription on which to skip messages||
-
-
-### `clear-backlog`
-Clear backlog (skip all the messages) for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics clear-backlog topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to clear||
-
-
-### `expire-messages`
-Expire messages that are older than the given expiry time (in seconds) for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-|`-s`, `--subscription`|The subscription to skip messages on||
-
-
-### `expire-messages-all-subscriptions`
-Expire messages older than the given expiry time (in seconds) for all subscriptions
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages-all-subscriptions topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-
-
-### `peek-messages`
-Peek some messages for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics peek-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages|0|
-|`-s`, `--subscription`|Subscription to get messages from||
-
-
-### `reset-cursor`
-Reset position for subscription to a position that is closest to timestamp or messageId.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics reset-cursor topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|Subscription to reset position on||
-|`-t`, `--time`|The time in minutes to reset back to (or minutes, hours, days, weeks, etc.). Examples: `100m`, `3h`, `2d`, `5w`.||
-|`-m`, `--messageId`| The message ID to reset back to (`ledgerId:entryId` or earliest or latest). ||
-
-### `get-message-by-id`
-Get message by ledger id and entry id
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-message-by-id topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-l`, `--ledgerId`|The ledger id |0|
-|`-e`, `--entryId`|The entry id |0|
-
-### `last-message-id`
-Get the last commit message ID of the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics last-message-id persistent://tenant/namespace/topic
-
-```
-
-### `get-backlog-quotas`
-Get the backlog quota policies for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-backlog-quotas tenant/namespace/topic
-
-```
-
-### `set-backlog-quota`
-Set a backlog quota policy for a topic.
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--limit`|The backlog size limit (for example `10M` or `16G`)||
-|`-lt`, `--limitTime`|Time limit in second, non-positive number for disabling time limit. (for example 3600 for 1 hour)||
-|`-p`, `--policy`|The retention policy to enforce when the limit is reached. The valid options are: `producer_request_hold`, `producer_exception` or `consumer_backlog_eviction`|
-|`-t`, `--type`|Backlog quota type to set. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-backlog-quota tenant/namespace/topic options
-
-```
-
-Example
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns/my-topic \
---limit 2G \
---policy producer_request_hold
-
-```
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns/my-topic \
---limitTime 3600 \
---policy producer_request_hold \
---type message_age
-
-```
-
-### `remove-backlog-quota`
-Remove a backlog quota policy from a topic.
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--type`|Backlog quota type to remove. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-backlog-quota tenant/namespace/topic
-
-```
-
-### `get-persistence`
-Get the persistence policies for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-persistence tenant/namespace/topic
-
-```
-
-### `set-persistence`
-Set the persistence policies for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-persistence tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-e`, `--bookkeeper-ensemble`|Number of bookies to use for a topic|0|
-|`-w`, `--bookkeeper-write-quorum`|How many writes to make of each entry|0|
-|`-a`, `--bookkeeper-ack-quorum`|Number of acks (guaranteed copies) to wait for each entry|0|
-|`-r`, `--ml-mark-delete-max-rate`|Throttling rate of mark-delete operation (0 means no throttle)||
-
-### `remove-persistence`
-Remove the persistence policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-persistence tenant/namespace/topic
-
-```
-
-### `get-message-ttl`
-Get the message TTL for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-message-ttl tenant/namespace/topic
-
-```
-
-### `set-message-ttl`
-Set the message TTL for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-message-ttl tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-ttl`, `--messageTTL`|Message TTL for a topic in second, allowed range from 1 to `Integer.MAX_VALUE` |0|
-
-### `remove-message-ttl`
-Remove the message TTL for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-message-ttl tenant/namespace/topic
-
-```
-
-Options 
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable message deduplication on the specified topic.|false|
-|`--disable`, `-d`|Disable message deduplication on the specified topic.|false|
-
-### `get-deduplication`
-Get a deduplication policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-deduplication tenant/namespace/topic
-
-```
-
-### `set-deduplication`
-Set a deduplication policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-deduplication tenant/namespace/topic options
-
-```
-
-### `remove-deduplication`
-Remove a deduplication policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-deduplication tenant/namespace/topic
-
-```
-
-## `tenants`
-Operations for managing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants subcommand
-
-```
-
-Subcommands
-* `list`
-* `get`
-* `create`
-* `update`
-* `delete`
-
-### `list`
-List the existing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants list
-
-```
-
-### `get`
-Gets the configuration of a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants get tenant-name
-
-```
-
-### `create`
-Creates a new tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants create tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-### `update`
-Updates a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants update tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-
-### `delete`
-Deletes an existing tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants delete tenant-name
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-f`, `--force`|Delete a tenant forcefully by deleting all namespaces under it.|false|
-
-
-## `resource-quotas`
-Operations for managing resource quotas
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas subcommand
-
-```
-
-Subcommands
-* `get`
-* `set`
-* `reset-namespace-bundle-quota`
-
-
-### `get`
-Get the resource quota for a specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-### `set`
-Set the resource quota for the specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas set options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bi`, `--bandwidthIn`|The expected inbound bandwidth (in bytes/second)|0|
-|`-bo`, `--bandwidthOut`|Expected outbound bandwidth (in bytes/second)0|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-d`, `--dynamic`|Allow to be dynamically re-calculated (or not)|false|
-|`-mem`, `--memory`|Expectred memory usage (in megabytes)|0|
-|`-mi`, `--msgRateIn`|Expected incoming messages per second|0|
-|`-mo`, `--msgRateOut`|Expected outgoing messages per second|0|
-|`-n`, `--namespace`|The namespace as tenant/namespace, for example my-tenant/my-ns. Must be specified together with -b/--bundle.||
-
-
-### `reset-namespace-bundle-quota`
-Reset the specified namespace bundle's resource quota to a default value.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas reset-namespace-bundle-quota options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-
-## `schemas`
-Operations related to Schemas associated with Pulsar topics.
-
-Usage
-
-```
-
-$ pulsar-admin schemas subcommand
-
-```
-
-Subcommands
-* `upload`
-* `delete`
-* `get`
-* `extract`
-
-
-### `upload`
-Upload the schema definition for a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas upload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--filename`|The path to the schema definition file. An example schema file is available under conf directory.||
-
-
-### `delete`
-Delete the schema definition associated with a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas delete persistent://tenant/namespace/topic
-
-```
-
-### `get`
-Retrieve the schema definition associated with a topic (at a given version if version is supplied).
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas get persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--version`|The version of the schema definition to retrieve for a topic.||
-
-### `extract`
-Provide the schema definition for a topic via Java class name contained in a JAR file
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas extract persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--classname`|The Java class name||
-|`-j`, `--jar`|A path to the JAR file which contains the above Java class||
-|`-t`, `--type`|The type of the schema (avro or json)||
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/reference-cli-tools.md b/site2/website/versioned_docs/version-2.1.0-incubating/reference-cli-tools.md
deleted file mode 100644
index 4ae70b77834c5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/reference-cli-tools.md
+++ /dev/null
@@ -1,734 +0,0 @@
----
-id: reference-cli-tools
-title: Pulsar command-line tools
-sidebar_label: "Pulsar CLI tools"
-original_id: reference-cli-tools
----
-
-Pulsar offers several command-line tools that you can use for managing Pulsar installations, performance testing, using command-line producers and consumers, and more.
-
-All Pulsar command-line tools can be run from the `bin` directory of your [installed Pulsar package](getting-started-standalone.md). The following tools are currently documented:
-
-* [`pulsar`](#pulsar)
-* [`pulsar-client`](#pulsar-client)
-* [`pulsar-daemon`](#pulsar-daemon)
-* [`pulsar-perf`](#pulsar-perf)
-* [`bookkeeper`](#bookkeeper)
-
-> ### Getting help
-> You can get help for any CLI tool, command, or subcommand using the `--help` flag, or `-h` for short. Here's an example:
-
-> ```shell
-> 
-> $ bin/pulsar broker --help
->
-> 
-> ```
-
-
-## `pulsar`
-
-The pulsar tool is used to start Pulsar components, such as bookies and ZooKeeper, in the foreground.
-
-These processes can also be started in the background, using nohup, using the pulsar-daemon tool, which has the same command interface as pulsar.
-
-Usage:
-
-```bash
-
-$ pulsar command
-
-```
-
-Commands:
-* `bookie`
-* `broker`
-* `compact-topic`
-* `discovery`
-* `configuration-store`
-* `initialize-cluster-metadata`
-* `proxy`
-* `standalone`
-* `websocket`
-* `zookeeper`
-* `zookeeper-shell`
-
-Example:
-
-```bash
-
-$ PULSAR_BROKER_CONF=/path/to/broker.conf pulsar broker
-
-```
-
-The table below lists the environment variables that you can use to configure the `pulsar` tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|`PULSAR_LOG_CONF`|Log4j configuration file|`conf/log4j2.yaml`|
-|`PULSAR_BROKER_CONF`|Configuration file for broker|`conf/broker.conf`|
-|`PULSAR_BOOKKEEPER_CONF`|description: Configuration file for bookie|`conf/bookkeeper.conf`|
-|`PULSAR_ZK_CONF`|Configuration file for zookeeper|`conf/zookeeper.conf`|
-|`PULSAR_CONFIGURATION_STORE_CONF`|Configuration file for the configuration store|`conf/global_zookeeper.conf`|
-|`PULSAR_DISCOVERY_CONF`|Configuration file for discovery service|`conf/discovery.conf`|
-|`PULSAR_WEBSOCKET_CONF`|Configuration file for websocket proxy|`conf/websocket.conf`|
-|`PULSAR_STANDALONE_CONF`|Configuration file for standalone|`conf/standalone.conf`|
-|`PULSAR_EXTRA_OPTS`|Extra options to be passed to the jvm||
-|`PULSAR_EXTRA_CLASSPATH`|Extra paths for Pulsar's classpath||
-|`PULSAR_PID_DIR`|Folder where the pulsar server PID file should be stored||
-|`PULSAR_STOP_TIMEOUT`|Wait time before forcefully killing the Bookie server instance if attempts to stop it are not successful||
-
-
-
-### `bookie`
-
-Starts up a bookie server
-
-Usage:
-
-```bash
-
-$ pulsar bookie options
-
-```
-
-Options
-
-|Option|Description|Default|
-|---|---|---|
-|`-readOnly`|Force start a read-only bookie server|false|
-|`-withAutoRecovery`|Start auto-recover service bookie server|false|
-
-
-Example
-
-```bash
-
-$ PULSAR_BOOKKEEPER_CONF=/path/to/bookkeeper.conf pulsar bookie \
-  -readOnly \
-  -withAutoRecovery
-
-```
-
-### `broker`
-
-Starts up a Pulsar broker
-
-Usage
-
-```bash
-
-$ pulsar broker options
-
-```
-
-Options
-|Option|Description|Default|
-|---|---|---|
-|`-bc` , `--bookie-conf`|Configuration file for BookKeeper||
-|`-rb` , `--run-bookie`|Run a BookKeeper bookie on the same host as the Pulsar broker|false|
-|`-ra` , `--run-bookie-autorecovery`|Run a BookKeeper autorecovery daemon on the same host as the Pulsar broker|false|
-
-Example
-
-```bash
-
-$ PULSAR_BROKER_CONF=/path/to/broker.conf pulsar broker
-
-```
-
-### `compact-topic`
-
-Run compaction against a Pulsar topic (in a new process)
-
-Usage
-
-```bash
-
-$ pulsar compact-topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t` , `--topic`|The Pulsar topic that you would like to compact||
-
-Example
-
-```bash
-
-$ pulsar compact-topic --topic topic-to-compact
-
-```
-
-### `discovery`
-
-Run a discovery server
-
-Usage
-
-```bash
-
-$ pulsar discovery
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_DISCOVERY_CONF=/path/to/discovery.conf pulsar discovery
-
-```
-
-### `configuration-store`
-
-Starts up the Pulsar configuration store
-
-Usage
-
-```bash
-
-$ pulsar configuration-store
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_CONFIGURATION_STORE_CONF=/path/to/configuration_store.conf pulsar configuration-store
-
-```
-
-### `initialize-cluster-metadata`
-
-One-time cluster metadata initialization
-
-Usage
-
-```bash
-
-$ pulsar initialize-cluster-metadata options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-ub` , `--broker-service-url`|The broker service URL for the new cluster||
-|`-tb` , `--broker-service-url-tls`|The broker service URL for the new cluster with TLS encryption||
-|`-c` , `--cluster`|Cluster name||
-|`--configuration-store`|The configuration store quorum connection string||
-|`-uw` , `--web-service-url`|The web service URL for the new cluster||
-|`-tw` , `--web-service-url-tls`|The web service URL for the new cluster with TLS encryption||
-|`-zk` , `--zookeeper`|The local ZooKeeper quorum connection string||
-
-
-### `proxy`
-
-Manages the Pulsar proxy
-
-Usage
-
-```bash
-
-$ pulsar proxy options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--configuration-store`|Configuration store connection string||
-|`-zk` , `--zookeeper-servers`|Local ZooKeeper connection string||
-
-Example
-
-```bash
-
-$ PULSAR_PROXY_CONF=/path/to/proxy.conf pulsar proxy \
-  --zookeeper-servers zk-0,zk-1,zk2 \
-  --configuration-store zk-0,zk-1,zk-2
-
-```
-
-### `standalone`
-
-Run a broker service with local bookies and local ZooKeeper
-
-Usage
-
-```bash
-
-$ pulsar standalone options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-a` , `--advertised-address`|The standalone broker advertised address||
-|`--bookkeeper-dir`|Local bookies’ base data directory|data/standalone/bookkeeper|
-|`--bookkeeper-port`|Local bookies’ base port|3181|
-|`--no-broker`|Only start ZooKeeper and BookKeeper services, not the broker|false|
-|`--num-bookies`|The number of local bookies|1|
-|`--only-broker`|Only start the Pulsar broker service (not ZooKeeper or BookKeeper)||
-|`--wipe-data`|Clean up previous ZooKeeper/BookKeeper data||
-|`--zookeeper-dir`|Local ZooKeeper’s data directory|data/standalone/zookeeper|
-|`--zookeeper-port` |Local ZooKeeper’s port|2181|
-
-Example
-
-```bash
-
-$ PULSAR_STANDALONE_CONF=/path/to/standalone.conf pulsar standalone
-
-```
-
-### `websocket`
-
-Usage
-
-```bash
-
-$ pulsar websocket
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_WEBSOCKET_CONF=/path/to/websocket.conf pulsar websocket
-
-```
-
-### `zookeeper`
-
-Starts up a ZooKeeper cluster
-
-Usage
-
-```bash
-
-$ pulsar zookeeper
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_ZK_CONF=/path/to/zookeeper.conf pulsar zookeeper
-
-```
-
-### `zookeeper-shell`
-
-Connects to a running ZooKeeper cluster using the ZooKeeper shell
-
-Usage
-
-```bash
-
-$ pulsar zookeeper-shell options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration file for ZooKeeper||
-
-
-
-## `pulsar-client`
-
-The pulsar-client tool
-
-Usage
-
-```bash
-
-$ pulsar-client command
-
-```
-
-Commands
-* `produce`
-* `consume`
-
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class, for example "key1:val1,key2:val2" or "{\"key1\":\"val1\",\"key2\":\"val2\"}" ||
-|`--auth-plugin`|Authentication plugin class name||
-|`--url`|Broker URL to which to connect|pulsar://localhost:6650/|
-
-
-### `produce`
-Send a message or messages to a specific broker and topic
-
-Usage
-
-```bash
-
-$ pulsar-client produce topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-f`, `--files`|Comma-separated file paths to send; either -m or -f must be specified|[]|
-|`-m`, `--messages`|Comma-separated string of messages to send; either -m or -f must be specified|[]|
-|`-n`, `--num-produce`|The number of times to send the message(s); the count of messages/files * num-produce should be below 1000|1|
-|`-r`, `--rate`|Rate (in messages per second) at which to produce; a value 0 means to produce messages as fast as possible|0.0|
-
-
-### `consume`
-Consume messages from a specific broker and topic
-
-Usage
-
-```bash
-
-$ pulsar-client consume topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--hex`|Display binary messages in hexadecimal format.|false|
-|`-n`, `--num-messages`|Number of messages to consume, 0 means to consume forever.|0|
-|`-r`, `--rate`|Rate (in messages per second) at which to produce; a value 0 means to produce messages as fast as possible|0.0|
-|`-s`, `--subscription-name`|Subscription name||
-|`-t`, `--subscription-type`|The type of the subscription. Possible values: Exclusive, Shared, Failover.|Exclusive|
-
-
-
-## `pulsar-daemon`
-A wrapper around the pulsar tool that’s used to start and stop processes, such as ZooKeeper, bookies, and Pulsar brokers, in the background using nohup.
-
-pulsar-daemon has a similar interface to the pulsar command but adds start and stop commands for various services. For a listing of those services, run pulsar-daemon to see the help output or see the documentation for the pulsar command.
-
-Usage
-
-```bash
-
-$ pulsar-daemon command
-
-```
-
-Commands
-* `start`
-* `stop`
-
-
-### `start`
-Start a service in the background using nohup.
-
-Usage
-
-```bash
-
-$ pulsar-daemon start service
-
-```
-
-### `stop`
-Stop a service that’s already been started using start.
-
-Usage
-
-```bash
-
-$ pulsar-daemon stop service options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|-force|Stop the service forcefully if not stopped by normal shutdown.|false|
-
-
-
-## `pulsar-perf`
-A tool for performance testing a Pulsar broker.
-
-Usage
-
-```bash
-
-$ pulsar-perf command
-
-```
-
-Commands
-* `consume`
-* `produce`
-* `monitor-brokers`
-* `simulation-client`
-* `simulation-controller`
-
-Environment variables
-The table below lists the environment variables that you can use to configure the pulsar-perf tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|`PULSAR_LOG_CONF`|Log4j configuration file|conf/log4j2.yaml|
-|`PULSAR_CLIENT_CONF`|Configuration file for the client|conf/client.conf|
-|`PULSAR_EXTRA_OPTS`|Extra options to be passed to the JVM||
-|`PULSAR_EXTRA_CLASSPATH`|Extra paths for Pulsar's classpath||
-
-
-### `consume`
-Run a consumer
-
-Usage
-
-```
-
-$ pulsar-perf consume options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth_params`|Authentication parameters in the form of key1:val1,key2:val2||
-|`--auth_plugin`|Authentication plugin class name||
-|`-b`, `--batch-time-window`|Batch messages in a window of the specified number of milliseconds|1|
-|`-z`, `--compression`|Compress messages’ payload. Possible values are NONE, LZ4, or ZLIB.||
-|`--conf-file`|Configuration file||
-|`-c`, `--max-connections`|Max number of TCP connections to a single broker|0|
-|`-o`, `--max-outstanding`|Max number of outstanding messages|1000|
-|`-m`, `--num-messages`|Number of messages to publish in total. If set to 0, it will keep publishing.|0|
-|`-n`, `--num-producers`|The number of producers (per topic)|1|
-|`-t`, `--num-topic`|The number of topics|1|
-|`-f`, `--payload-file`|Use payload from a file instead of an empty buffer||
-|`-r`, `--rate`|Publish rate msg/s across topics|100|
-|`-u`, `--service-url`|Pulsar service URL||
-|`-s`, `--size`|Message size (in bytes)|1024|
-|`-i`, `--stats-interval-seconds`|Statistics interval seconds. If 0, statistics will be disabled.|0|
-|`-time`, `--test-duration`|Test duration in secs. If set to 0, it will keep publishing.|0|
-
-
-### `produce`
-Run a producer
-
-Usage
-
-```bash
-
-$ pulsar-perf produce options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth_params`|Authentication parameters in the form of key1:val1,key2:val2||
-|`--auth_plugin`|Authentication plugin class name||
-|`-b`, `--batch-time-window`|Batch messages in a window of the specified number of milliseconds|1|
-|`-z`, `--compression`|Compress messages’ payload. Possible values are NONE, LZ4, or ZLIB.||
-|`--conf-file`|Configuration file||
-|`-c`, `--max-connections`|Max number of TCP connections to a single broker|0|
-|`-o`, `--max-outstanding`|Max number of outstanding messages|1000|
-|`-m`, `--num-messages`|Number of messages to publish in total. If set to 0, it will keep publishing.|0|
-|`-n`, `--num-producers`|The number of producers (per topic)|1|
-|`-t`, `--num-topic`|The number of topics|1|
-|`-f`, `--payload-file`|Use payload from a file instead of an empty buffer||
-|`-r`, `--rate`|Publish rate msg/s across topics|100|
-|`-u`, `--service-url`|Pulsar service URL||
-|`-s`, `--size`|Message size (in bytes)|1024|
-|`-i`, `--stats-interval-seconds`|Statistics interval seconds. If 0, statistics will be disabled.|0|
-|`-time`, `--test-duration`|Test duration in secs. If set to 0, it will keep publishing.|0|
-
-
-
-### `monitor-brokers`
-Continuously receive broker data and/or load reports
-
-Usage
-
-```bash
-
-$ pulsar-perf monitor-brokers options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--connect-string`|A connection string for one or more ZooKeeper servers||
-
-
-### `simulation-client`
-Run a simulation server acting as a Pulsar client. Uses the client configuration specified in conf/client.conf.
-
-Usage
-
-```bash
-
-$ pulsar-perf simulation-client
-
-```
-
-### `simulation-controller`
-Run a simulation controller to give commands to servers
-
-Usage
-
-```bash
-
-$ pulsar-perf simulation-controller options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--client-port`|The port that the clients are listening on|0|
-|`--clients`|Comma-separated list of client hostnames||
-|`--cluster`|The cluster to test on||
-
-
-## `bookkeeper`
-A tool for managing BookKeeper.
-
-Usage
-
-```bash
-
-$ bookkeeper command
-
-```
-
-Commands
-* `autorecovery`
-* `bookie`
-* `localbookie`
-* `upgrade`
-* `shell`
-
-
-Environment variables
-The table below lists the environment variables that you can use to configure the bookkeeper tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|BOOKIE_LOG_CONF|Log4j configuration file|conf/log4j2.yaml|
-|BOOKIE_CONF|BookKeeper configuration file|conf/bk_server.conf|
-|BOOKIE_EXTRA_OPTS|Extra options to be passed to the JVM||
-|BOOKIE_EXTRA_CLASSPATH|Extra paths for BookKeeper's classpath||  
-|ENTRY_FORMATTER_CLASS|The Java class used to format entries||
-|BOOKIE_PID_DIR|Folder where the BookKeeper server PID file should be stored||
-|BOOKIE_STOP_TIMEOUT|Wait time before forcefully killing the Bookie server instance if attempts to stop it are not successful||
-
-
-### `auto-recovery`
-Runs an auto-recovery service
-
-Usage
-
-```bash
-
-$ bookkeeper autorecovery options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-
-
-### `bookie`
-Starts up a BookKeeper server (aka bookie)
-
-Usage
-
-```bash
-
-$ bookkeeper bookie options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-|-readOnly|Force start a read-only bookie server|false|
-|-withAutoRecovery|Start auto-recovery service bookie server|false|
-
-
-### `localbookie`
-Runs a test ensemble of N bookies locally
-
-Usage
-
-```bash
-
-$ bookkeeper localbookie N
-
-```
-
-### `upgrade`
-Upgrade the bookie’s filesystem
-
-Usage
-
-```bash
-
-$ bookkeeper upgrade options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-|`-u`, `--upgrade`|Upgrade the bookie’s directories||
-
-
-### `shell`
-Run shell for admin commands. To see a full listing of those commands, run bookkeeper shell without an argument.
-
-Usage
-
-```bash
-
-$ bookkeeper shell
-
-```
-
-Example
-
-```bash
-
-$ bookkeeper shell bookiesanity
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/reference-configuration.md b/site2/website/versioned_docs/version-2.1.0-incubating/reference-configuration.md
deleted file mode 100644
index 04dec2c2474c8..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/reference-configuration.md
+++ /dev/null
@@ -1,466 +0,0 @@
----
-id: reference-configuration
-title: Pulsar configuration
-sidebar_label: "Pulsar configuration"
-original_id: reference-configuration
----
-
-
-
-
-Pulsar configuration can be managed either via a series of configuration files contained in the [`conf`](https://github.com/apache/incubator-pulsar/tree/master/conf) directory of a Pulsar [installation](getting-started-standalone.md)
-
-* [BookKeeper](#bookkeeper)
-* [Broker](#broker)
-* [Client](#client)
-* [Service discovery](#service-discovery)
-* [Log4j](#log4j)
-* [Log4j shell](#log4j-shell)
-* [Standalone](#standalone)
-* [WebSocket](#websocket)
-* [ZooKeeper](#zookeeper)
-
-## BookKeeper
-
-BookKeeper is a replicated log storage system that Pulsar uses for durable storage of all messages.
-
-
-|Name|Description|Default|
-|---|---|---|
-|bookiePort|The port on which the bookie server listens.|3181|
-|allowLoopback|Whether the bookie is allowed to use a loopback interface as its primary interface (i.e. the interface used to establish its identity). By default, loopback interfaces are not allowed as the primary interface. Using a loopback interface as the primary interface usually indicates a configuration error. For example, it’s fairly common in some VPS setups to not configure a hostname or to have the hostname resolve to `127.0.0.1`. If this is the case, then all bookies in the cluster will establish their identities as `127.0.0.1:3181` and only one will be able to join the cluster. For VPSs configured like this, you should explicitly set the listening interface.|false|
-|listeningInterface|The network interface on which the bookie listens. If not set, the bookie will listen on all interfaces.|eth0|
-|journalDirectory|The directory where Bookkeeper outputs its write-ahead log (WAL)|data/bookkeeper/journal|
-|ledgerDirectories|The directory where Bookkeeper outputs ledger snapshots. This could define multiple directories to store snapshots separated by comma, for example `ledgerDirectories=/tmp/bk1-data,/tmp/bk2-data`. Ideally, ledger dirs and the journal dir are each in a different device, which reduces the contention between random I/O and sequential write. It is possible to run with a single disk, but performance will be significantly lower.|data/bookkeeper/ledgers|
-|ledgerManagerType|The type of ledger manager used to manage how ledgers are stored, managed, and garbage collected. See [BookKeeper Internals](http://bookkeeper.apache.org/docs/latest/getting-started/concepts) for more info.|hierarchical|
-|zkLedgersRootPath|The root ZooKeeper path used to store ledger metadata. This parameter is used by the ZooKeeper-based ledger manager as a root znode to store all ledgers.|/ledgers|
-|ledgerStorageClass|Ledger storage implementation class|org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage|
-|entryLogFilePreallocationEnabled|Enable or disable entry logger preallocation|true|
-|logSizeLimit|Max file size of the entry logger, in bytes. A new entry log file will be created when the old one reaches the file size limitation.|1073741824|
-|minorCompactionThreshold|Threshold of minor compaction. Entry log files whose remaining size percentage reaches below this threshold will be compacted in a minor compaction. If set to less than zero, the minor compaction is disabled.|0.2|
-|minorCompactionInterval|Time interval to run minor compaction, in seconds. If set to less than zero, the minor compaction is disabled.|3600|
-|majorCompactionThreshold|The threshold of major compaction. Entry log files whose remaining size percentage reaches below this threshold will be compacted in a major compaction. Those entry log files whose remaining size percentage is still higher than the threshold will never be compacted. If set to less than zero, the minor compaction is disabled.|0.5|
-|majorCompactionInterval|The time interval to run major compaction, in seconds. If set to less than zero, the major compaction is disabled.|86400|
-|compactionMaxOutstandingRequests|Sets the maximum number of entries that can be compacted without flushing. When compacting, the entries are written to the entrylog and the new offsets are cached in memory. Once the entrylog is flushed the index is updated with the new offsets. This parameter controls the number of entries added to the entrylog before a flush is forced. A higher value for this parameter means more memory will be used for offsets. Each offset consists of 3 longs. This parameter should not be modified unless you’re fully aware of the consequences.|100000|
-|compactionRate|The rate at which compaction will read entries, in adds per second.|1000|
-|isThrottleByBytes|Throttle compaction by bytes or by entries.|false|
-|compactionRateByEntries|The rate at which compaction will read entries, in adds per second.|1000|
-|compactionRateByBytes|Set the rate at which compaction reads entries. The unit is bytes added per second.|1000000|
-|journalMaxSizeMB|Max file size of journal file, in megabytes. A new journal file will be created when the old one reaches the file size limitation.|2048|
-|journalMaxBackups|The max number of old journal files to keep. Keeping a number of old journal files would help data recovery in special cases.|5|
-|journalPreAllocSizeMB|How space to pre-allocate at a time in the journal.|16|
-|journalWriteBufferSizeKB|The of the write buffers used for the journal.|64|
-|journalRemoveFromPageCache|Whether pages should be removed from the page cache after force write.|true|
-|journalAdaptiveGroupWrites|Whether to group journal force writes, which optimizes group commit for higher throughput.|true|
-|journalMaxGroupWaitMSec|The maximum latency to impose on a journal write to achieve grouping.|1|
-|journalAlignmentSize|All the journal writes and commits should be aligned to given size|4096|
-|journalBufferedWritesThreshold|Maximum writes to buffer to achieve grouping|524288|
-|journalFlushWhenQueueEmpty|If we should flush the journal when journal queue is empty|false|
-|numJournalCallbackThreads|The number of threads that should handle journal callbacks|8|
-|rereplicationEntryBatchSize|The number of max entries to keep in fragment for re-replication|5000|
-|gcWaitTime|How long the interval to trigger next garbage collection, in milliseconds. Since garbage collection is running in background, too frequent gc will heart performance. It is better to give a higher number of gc interval if there is enough disk capacity.|900000|
-|gcOverreplicatedLedgerWaitTime|How long the interval to trigger next garbage collection of overreplicated ledgers, in milliseconds. This should not be run very frequently since we read the metadata for all the ledgers on the bookie from zk.|86400000|
-|flushInterval|How long the interval to flush ledger index pages to disk, in milliseconds. Flushing index files will introduce much random disk I/O. If separating journal dir and ledger dirs each on different devices, flushing would not affect performance. But if putting journal dir and ledger dirs on same device, performance degrade significantly on too frequent flushing. You can consider increment flush interval to get better performance, but you need to pay more time on bookie server restart after failure.|60000|
-|bookieDeathWatchInterval|Interval to watch whether bookie is dead or not, in milliseconds|1000|
-|zkServers|A list of one of more servers on which zookeeper is running. The server list can be comma separated values, for example: zkServers=zk1:2181,zk2:2181,zk3:2181.|localhost:2181|
-|zkTimeout|ZooKeeper client session timeout in milliseconds Bookie server will exit if it received SESSION_EXPIRED because it was partitioned off from ZooKeeper for more than the session timeout JVM garbage collection, disk I/O will cause SESSION_EXPIRED. Increment this value could help avoiding this issue|30000|
-|serverTcpNoDelay|This settings is used to enabled/disabled Nagle’s algorithm, which is a means of improving the efficiency of TCP/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance.|true|
-|openFileLimit|Max number of ledger index files could be opened in bookie server If number of ledger index files reaches this limitation, bookie server started to swap some ledgers from memory to disk. Too frequent swap will affect performance. You can tune this number to gain performance according your requirements.|0|
-|pageSize|Size of a index page in ledger cache, in bytes A larger index page can improve performance writing page to disk, which is efficient when you have small number of ledgers and these ledgers have similar number of entries. If you have large number of ledgers and each ledger has fewer entries, smaller index page would improve memory usage.|8192|
-|pageLimit|How many index pages provided in ledger cache If number of index pages reaches this limitation, bookie server starts to swap some ledgers from memory to disk. You can increment this value when you found swap became more frequent. But make sure pageLimit*pageSize should not more than JVM max memory limitation, otherwise you would got OutOfMemoryException. In general, incrementing pageLimit, using smaller index page would gain better performance in lager number of ledgers with fewer entries case If pageLimit is -1, bookie server will use 1/3 of JVM memory to compute the limitation of number of index pages.|0|
-|readOnlyModeEnabled|If all ledger directories configured are full, then support only read requests for clients. If "readOnlyModeEnabled=true" then on all ledger disks full, bookie will be converted to read-only mode and serve only read requests. Otherwise the bookie will be shutdown. By default this will be disabled.|true|
-|diskUsageThreshold|For each ledger dir, maximum disk space which can be used. Default is 0.95f. i.e. 95% of disk can be used at most after which nothing will be written to that partition. If all ledger dir partitions are full, then bookie will turn to readonly mode if ‘readOnlyModeEnabled=true’ is set, else it will shutdown. Valid values should be in between 0 and 1 (exclusive).|0.95|
-|diskCheckInterval|Disk check interval in milli seconds, interval to check the ledger dirs usage.|10000|
-|auditorPeriodicCheckInterval|Interval at which the auditor will do a check of all ledgers in the cluster. By default this runs once a week. The interval is set in seconds. To disable the periodic check completely, set this to 0. Note that periodic checking will put extra load on the cluster, so it should not be run more frequently than once a day.|604800|
-|auditorPeriodicBookieCheckInterval|The interval between auditor bookie checks. The auditor bookie check, checks ledger metadata to see which bookies should contain entries for each ledger. If a bookie which should contain entries is unavailable, thea the ledger containing that entry is marked for recovery. Setting this to 0 disabled the periodic check. Bookie checks will still run when a bookie fails. The interval is specified in seconds.|86400|
-|numAddWorkerThreads|number of threads that should handle write requests. if zero, the writes would be handled by netty threads directly.|0|
-|numReadWorkerThreads|number of threads that should handle read requests. if zero, the reads would be handled by netty threads directly.|8|
-|maxPendingReadRequestsPerThread|If read workers threads are enabled, limit the number of pending requests, to avoid the executor queue to grow indefinitely.|2500|
-|readBufferSizeBytes|The number of bytes we should use as capacity for BufferedReadChannel.|4096|
-|writeBufferSizeBytes|The number of bytes used as capacity for the write buffer|65536|
-|useHostNameAsBookieID|Whether the bookie should use its hostname to register with the coordination service (e.g.: zookeeper service). When false, bookie will use its ipaddress for the registration.|false|
-|statsProviderClass||org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider|
-|prometheusStatsHttpPort||8000|
-|dbStorage_writeCacheMaxSizeMb|Size of Write Cache. Memory is allocated from JVM direct memory. Write cache is used to buffer entries before flushing into the entry log For good performance, it should be big enough to hold a substantial amount of entries in the flush interval.|25% of direct memory|
-|dbStorage_readAheadCacheMaxSizeMb|Size of Read cache. Memory is allocated from JVM direct memory. This read cache is pre-filled doing read-ahead whenever a cache miss happens|256|
-|dbStorage_readAheadCacheBatchSize|How many entries to pre-fill in cache after a read cache miss|1000|
-|dbStorage_rocksDB_blockCacheSize|Size of RocksDB block-cache. For best performance, this cache should be big enough to hold a significant portion of the index database which can reach ~2GB in some cases|268435456|
-|dbStorage_rocksDB_writeBufferSizeMB||64|
-|dbStorage_rocksDB_sstSizeInMB||64|
-|dbStorage_rocksDB_blockSize||65536|
-|dbStorage_rocksDB_bloomFilterBitsPerKey||10|
-|dbStorage_rocksDB_numLevels||-1|
-|dbStorage_rocksDB_numFilesInLevel0||4|
-|dbStorage_rocksDB_maxSizeInLevel1MB||256|
-
-
-
-## Broker
-
-Pulsar brokers are responsible for handling incoming messages from producers, dispatching messages to consumers, replicating data between clusters, and more.
-
-|Name|Description|Default|
-|---|---|---|
-|enablePersistentTopics|  Whether persistent topics are enabled on the broker |true|
-|enableNonPersistentTopics| Whether non-persistent topics are enabled on the broker |true|
-|functionsWorkerEnabled|  Whether the Pulsar Functions worker service is enabled in the broker  |false|
-|zookeeperServers|  Zookeeper quorum connection string  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|brokerServicePort| Broker data port  |6650|
-|brokerServicePortTls|  Broker data port for TLS  |6651|
-|webServicePort|  Port to use to server HTTP request  |8080|
-|webServicePortTls| Port to use to server HTTPS request |8443|
-|webSocketServiceEnabled| Enable the WebSocket API service in broker  |false|
-|bindAddress| Hostname or IP address the service binds on, default is 0.0.0.0.  |0.0.0.0|
-|advertisedAddress| Hostname or IP address the service advertises to the outside world. If not set, the value of `InetAddress.getLocalHost().getHostName()` is used.  ||
-|clusterName| Name of the cluster to which this broker belongs to ||
-|brokerDeduplicationEnabled|  Sets the default behavior for message deduplication in the broker. If enabled, the broker will reject messages that were already stored in the topic. This setting can be overridden on a per-namespace basis.  |false|
-|brokerDeduplicationMaxNumberOfProducers| The maximum number of producers for which information will be stored for deduplication purposes.  |10000|
-|brokerDeduplicationEntriesInterval|  The number of entries after which a deduplication informational snapshot is taken. A larger interval will lead to fewer snapshots being taken, though this would also lengthen the topic recovery time (the time required for entries published after the snapshot to be replayed). |1000|
-|brokerDeduplicationProducerInactivityTimeoutMinutes| The time of inactivity (in minutes) after which the broker will discard deduplication information related to a disconnected producer. |360|
-|zooKeeperSessionTimeoutMillis| Zookeeper session timeout in milliseconds |30000|
-|brokerShutdownTimeoutMs| Time to wait for broker graceful shutdown. After this time elapses, the process will be killed  |3000|
-|backlogQuotaCheckEnabled|  Enable backlog quota check. Enforces action on topic when the quota is reached  |true|
-|backlogQuotaCheckIntervalInSeconds|  How often to check for topics that have reached the quota |60|
-|backlogQuotaDefaultLimitGB|  Default per-topic backlog quota limit |10|
-|brokerDeleteInactiveTopicsEnabled| Enable the deletion of inactive topics. If topics are not consumed for some while, these inactive topics might be cleaned up. Deleting inactive topics is enabled by default. The default period is 1 minute.  |true|
-|brokerDeleteInactiveTopicsFrequencySeconds|  How often to check for inactive topics  |60|
-|messageExpiryCheckIntervalInMinutes| How frequently to proactively check and purge expired messages  |5|
-|brokerServiceCompactionMonitorIntervalInSeconds| Interval between checks to see if topics with compaction policies need to be compacted  |60|
-|activeConsumerFailoverDelayTimeMillis| How long to delay rewinding cursor and dispatching messages when active consumer is changed.  |1000|
-|clientLibraryVersionCheckEnabled|  Enable check for minimum allowed client library version |false|
-|clientLibraryVersionCheckAllowUnversioned| Allow client libraries with no version information  |true|
-|statusFilePath|  Path for the file used to determine the rotation status for the broker when responding to service discovery health checks ||
-|preferLaterVersions| If true, (and ModularLoadManagerImpl is being used), the load manager will attempt to use only brokers running the latest software version (to minimize impact to bundles)  |false|
-|tlsEnabled|  Enable TLS  |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-|tlsTrustCertsFilePath| Path for the trusted TLS certificate file ||
-|tlsAllowInsecureConnection|  Accept untrusted TLS certificate from client  |false|
-|maxUnackedMessagesPerConsumer| Max number of unacknowledged messages allowed to receive messages by a consumer on a shared subscription. Broker will stop sending messages to consumer once, this limit reaches until consumer starts acknowledging messages back. Using a value of 0, is disabling unackeMessage limit check and consumer can receive messages without any restriction  |50000|
-|maxUnackedMessagesPerSubscription| Max number of unacknowledged messages allowed per shared subscription. Broker will stop dispatching messages to all consumers of the subscription once this limit reaches until consumer starts acknowledging messages back and unack count reaches to limit/2. Using a value of 0, is disabling unackedMessage-limit check and dispatcher can dispatch messages without any restriction  |200000|
-|maxConcurrentLookupRequest|  Max number of concurrent lookup request broker allows to throttle heavy incoming lookup traffic |10000|
-|maxConcurrentTopicLoadRequest| Max number of concurrent topic loading request broker allows to control number of zk-operations |5000|
-|authenticationEnabled| Enable authentication |false|
-|authenticationProviders| Authentication provider name list, which is comma separated list of class names  ||
-|authorizationEnabled|  Enforce authorization |false|
-|superUserRoles|  Role names that are treated as "super-user", meaning they will be able to do all admin operations and publish/consume from all topics ||
-|brokerClientAuthenticationPlugin|  Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters  ||
-|brokerClientAuthenticationParameters|||
-|athenzDomainNames| Supported Athenz provider domain names(comma separated) for authentication  ||
-|bookkeeperClientAuthenticationPlugin|  Authentication plugin to use when connecting to bookies ||
-|bookkeeperClientAuthenticationParametersName|  BookKeeper auth plugin implementation specifics parameters name and values  ||
-|bookkeeperClientAuthenticationParameters|||   
-|bookkeeperClientTimeoutInSeconds|  Timeout for BK add / read operations  |30|
-|bookkeeperClientSpeculativeReadTimeoutInMillis|  Speculative reads are initiated if a read request doesn’t complete within a certain time Using a value of 0, is disabling the speculative reads |0|
-|bookkeeperClientHealthCheckEnabled|  Enable bookies health check. Bookies that have more than the configured number of failure within the interval will be quarantined for some time. During this period, new ledgers won’t be created on these bookies  |true|
-|bookkeeperClientHealthCheckIntervalSeconds||60|
-|bookkeeperClientHealthCheckErrorThresholdPerInterval||5|
-|bookkeeperClientHealthCheckQuarantineTimeInSeconds ||1800|
-|bookkeeperClientRackawarePolicyEnabled|  Enable rack-aware bookie selection policy. BK will chose bookies from different racks when forming a new bookie ensemble  |true|
-|bookkeeperClientIsolationGroups| Enable bookie isolation by specifying a list of bookie groups to choose from. Any bookie outside the specified groups will not be used by the broker  ||
-|managedLedgerDefaultEnsembleSize|  Number of bookies to use when creating a ledger |2|
-|managedLedgerDefaultWriteQuorum| Number of copies to store for each message  |2|
-|managedLedgerDefaultAckQuorum| Number of guaranteed copies (acks to wait before write is complete) |2|
-|managedLedgerCacheSizeMB|  Amount of memory to use for caching data payload in managed ledger. This memory is allocated from JVM direct memory and it’s shared across all the topics running in the same broker  |1024|
-|managedLedgerCacheEvictionWatermark| Threshold to which bring down the cache level when eviction is triggered  |0.9|
-|managedLedgerDefaultMarkDeleteRateLimit| Rate limit the amount of writes per second generated by consumer acking the messages  |1.0|
-|managedLedgerMaxEntriesPerLedger| The max number of entries to append to a ledger before triggering a rollover. A ledger rollover is triggered after the min rollover time has passed and one of the following conditions is true: 
    • The max rollover time has been reached
    • The max entries have been written to the ledger
    • The max ledger size has been written to the ledger
    |50000|
-|managedLedgerMinLedgerRolloverTimeMinutes| Minimum time between ledger rollover for a topic  |10|
-|managedLedgerMaxLedgerRolloverTimeMinutes| Maximum time before forcing a ledger rollover for a topic |240|
-|managedLedgerCursorMaxEntriesPerLedger|  Max number of entries to append to a cursor ledger  |50000|
-|managedLedgerCursorRolloverTimeInSeconds|  Max time before triggering a rollover on a cursor ledger  |14400|
-|managedLedgerMaxUnackedRangesToPersist|  Max number of "acknowledgment holes" that are going to be persistently stored. When acknowledging out of order, a consumer will leave holes that are supposed to be quickly filled by acking all the messages. The information of which messages are acknowledged is persisted by compressing in "ranges" of messages that were acknowledged. After the max number of ranges is reached, the information will only be tracked in memory and messages will be redelivered in case of crashes.  |1000|
-|autoSkipNonRecoverableData|  Skip reading non-recoverable/unreadable data-ledger under managed-ledger’s list.It helps when data-ledgers gets corrupted at bookkeeper and managed-cursor is stuck at that ledger. |false|
-|loadBalancerEnabled| Enable load balancer  |true|
-|loadBalancerPlacementStrategy| Strategy to assign a new bundle weightedRandomSelection ||
-|loadBalancerReportUpdateThresholdPercentage| Percentage of change to trigger load report update  |10|
-|loadBalancerReportUpdateMaxIntervalMinutes|  maximum interval to update load report  |15|
-|loadBalancerHostUsageCheckIntervalMinutes| Frequency of report to collect  |1|
-|loadBalancerSheddingIntervalMinutes| Load shedding interval. Broker periodically checks whether some traffic should be offload from some over-loaded broker to other under-loaded brokers  |30|
-|loadBalancerSheddingGracePeriodMinutes|  Prevent the same topics to be shed and moved to other broker more than once within this timeframe |30|
-|loadBalancerBrokerMaxTopics| Usage threshold to allocate max number of topics to broker  |50000|
-|loadBalancerBrokerUnderloadedThresholdPercentage|  Usage threshold to determine a broker as under-loaded |1|
-|loadBalancerBrokerOverloadedThresholdPercentage| Usage threshold to determine a broker as over-loaded  |85|
-|loadBalancerResourceQuotaUpdateIntervalMinutes|  Interval to update namespace bundle resource quota |15|
-|loadBalancerBrokerComfortLoadLevelPercentage|  Usage threshold to determine a broker is having just right level of load  |65|
-|loadBalancerAutoBundleSplitEnabled|  enable/disable namespace bundle auto split  |false|
-|loadBalancerNamespaceBundleMaxTopics|  maximum topics in a bundle, otherwise bundle split will be triggered  |1000|
-|loadBalancerNamespaceBundleMaxSessions|  maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered  |1000|
-|loadBalancerNamespaceBundleMaxMsgRate| maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered  |1000|
-|loadBalancerNamespaceBundleMaxBandwidthMbytes| maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered  |100|
-|loadBalancerNamespaceMaximumBundles| maximum number of bundles in a namespace  |128|
-|replicationMetricsEnabled| Enable replication metrics  |true|
-|replicationConnectionsPerBroker| Max number of connections to open for each broker in a remote cluster More connections host-to-host lead to better throughput over high-latency links.  |16|
-|replicationProducerQueueSize|  Replicator producer queue size  |1000|
-|replicatorPrefix|  Replicator prefix used for replicator producer name and cursor name pulsar.repl||
-|replicationTlsEnabled| Enable TLS when talking with other clusters to replicate messages |false|
-|defaultRetentionTimeInMinutes| Default message retention time. 0 means retention is disabled. -1 means data is not removed by time quota  ||
-|defaultRetentionSizeInMB|  Default retention size. 0 means retention is disabled. -1 means data is not removed by size quota  |0|
-|keepAliveIntervalSeconds|  How often to check whether the connections are still alive  |30|
-|brokerServicePurgeInactiveFrequencyInSeconds|  How often broker checks for inactive topics to be deleted (topics with no subscriptions and no one connected) |60|
-|loadManagerClassName|  Name of load manager to use |org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl|
-|managedLedgerOffloadDriver|  Driver to use to offload old data to long term storage (Possible values: S3)  ||
-|managedLedgerOffloadMaxThreads|  Maximum number of thread pool threads for ledger offloading |2|
-|s3ManagedLedgerOffloadRegion|  For Amazon S3 ledger offload, AWS region  ||
-|s3ManagedLedgerOffloadBucket|  For Amazon S3 ledger offload, Bucket to place offloaded ledger into ||
-|s3ManagedLedgerOffloadServiceEndpoint| For Amazon S3 ledger offload, Alternative endpoint to connect to (useful for testing) ||
-|s3ManagedLedgerOffloadMaxBlockSizeInBytes| For Amazon S3 ledger offload, Max block size in bytes. (64MB by default, 5MB minimum) |67108864|
-|s3ManagedLedgerOffloadReadBufferSizeInBytes| For Amazon S3 ledger offload, Read buffer size in bytes (1MB by default)  |1048576|
-
-
-
-
-## Client
-
-The [`pulsar-client`](reference-cli-tools.md#pulsar-client) CLI tool can be used to publish messages to Pulsar and consume messages from Pulsar topics. This tool can be used in lieu of a client library.
-
-|Name|Description|Default|
-|---|---|---|
-|webServiceUrl| The web URL for the cluster.  |http://localhost:8080/|
-|brokerServiceUrl|  The Pulsar protocol URL for the cluster.  |pulsar://localhost:6650/|
-|authPlugin|  The authentication plugin.  ||
-|authParams|  The authentication parameters for the cluster, as a comma-separated string. ||
-|useTls|  Whether or not TLS authentication will be enforced in the cluster.  |false|
-|tlsAllowInsecureConnection|||    
-|tlsTrustCertsFilePath|||
-
-
-## Service discovery
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  Zookeeper quorum connection string (comma-separated)  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|zookeeperSessionTimeoutMs| ZooKeeper session timeout |30000|
-|servicePort| Port to use to server binary-proto request  |6650|
-|servicePortTls|  Port to use to server binary-proto-tls request  |6651|
-|webServicePort|  Port that discovery service listen on |8080|
-|webServicePortTls| Port to use to server HTTPS request |8443|
-|bindOnLocalhost| Control whether to bind directly on localhost rather than on normal hostname  |false|
-|authenticationEnabled| Enable authentication |false|
-|authenticationProviders| Authentication provider name list, which is comma separated list of class names (comma-separated) ||
-|authorizationEnabled|  Enforce authorization |false|
-|superUserRoles|  Role names that are treated as "super-user", meaning they will be able to do all admin operations and publish/consume from all topics (comma-separated) ||
-|tlsEnabled|  Enable TLS  |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-
-
-
-## Log4j
-
-
-|Name|Default|
-|---|---|
-|pulsar.root.logger|  WARN,CONSOLE|
-|pulsar.log.dir|  logs|
-|pulsar.log.file| pulsar.log|
-|log4j.rootLogger|  ${pulsar.root.logger}|
-|log4j.appender.CONSOLE|  org.apache.log4j.ConsoleAppender|
-|log4j.appender.CONSOLE.Threshold|  DEBUG|
-|log4j.appender.CONSOLE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.CONSOLE.layout.ConversionPattern| %d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n|
-|log4j.appender.ROLLINGFILE|  org.apache.log4j.DailyRollingFileAppender|
-|log4j.appender.ROLLINGFILE.Threshold|  DEBUG|
-|log4j.appender.ROLLINGFILE.File| ${pulsar.log.dir}/${pulsar.log.file}|
-|log4j.appender.ROLLINGFILE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.ROLLINGFILE.layout.ConversionPattern| %d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n|
-|log4j.appender.TRACEFILE|  org.apache.log4j.FileAppender|
-|log4j.appender.TRACEFILE.Threshold|  TRACE|
-|log4j.appender.TRACEFILE.File| pulsar-trace.log|
-|log4j.appender.TRACEFILE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.TRACEFILE.layout.ConversionPattern| %d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n|
-
-
-## Log4j shell
-
-|Name|Default|
-|---|---|
-|bookkeeper.root.logger|  ERROR,CONSOLE|
-|log4j.rootLogger|  ${bookkeeper.root.logger}|
-|log4j.appender.CONSOLE|  org.apache.log4j.ConsoleAppender|
-|log4j.appender.CONSOLE.Threshold|  DEBUG|
-|log4j.appender.CONSOLE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.CONSOLE.layout.ConversionPattern| %d{ABSOLUTE} %-5p %m%n|
-|log4j.logger.org.apache.zookeeper| ERROR|
-|log4j.logger.org.apache.bookkeeper|  ERROR|
-|log4j.logger.org.apache.bookkeeper.bookie.BookieShell| INFO|
-
-
-## Standalone
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  The quorum connection string for local ZooKeeper  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|brokerServicePort| The port on which the standalone broker listens for connections |6650|
-|webServicePort|  The port used by the standalone broker for HTTP requests  |8080|
-|bindAddress| The hostname or IP address on which the standalone service binds  |0.0.0.0|
-|advertisedAddress| The hostname or IP address that the standalone service advertises to the outside world. If not set, the value of `InetAddress.getLocalHost().getHostName()` is used.  ||
-|clusterName| The name of the cluster that this broker belongs to. |standalone|
-|zooKeeperSessionTimeoutMillis| The ZooKeeper session timeout, in milliseconds. |30000|
-|brokerShutdownTimeoutMs| The time to wait for graceful broker shutdown. After this time elapses, the process will be killed. |3000|
-|backlogQuotaCheckEnabled|  Enable the backlog quota check, which enforces a specified action when the quota is reached.  |true|
-|backlogQuotaCheckIntervalInSeconds|  How often to check for topics that have reached the backlog quota.  |60|
-|backlogQuotaDefaultLimitGB|  The default per-topic backlog quota limit.  |10|
-|brokerDeleteInactiveTopicsEnabled| Enable the deletion of inactive topics. If topics are not consumed for some while, these inactive topics might be cleaned up. Deleting inactive topics is enabled by default. The default period is 1 minute. |true|
-|brokerDeleteInactiveTopicsFrequencySeconds|  How often to check for inactive topics, in seconds. |60|
-|messageExpiryCheckIntervalInMinutes| How often to proactively check and purged expired messages. |5|
-|activeConsumerFailoverDelayTimeMillis| How long to delay rewinding cursor and dispatching messages when active consumer is changed.  |1000|
-|clientLibraryVersionCheckEnabled|  Enable checks for minimum allowed client library version. |false|
-|clientLibraryVersionCheckAllowUnversioned| Allow client libraries with no version information  |true|
-|statusFilePath|  The path for the file used to determine the rotation status for the broker when responding to service discovery health checks |/usr/local/apache/htdocs|
-|maxUnackedMessagesPerConsumer| The maximum number of unacknowledged messages allowed to be received by consumers on a shared subscription. The broker will stop sending messages to a consumer once this limit is reached or until the consumer begins acknowledging messages. A value of 0 disables the unacked message limit check and thus allows consumers to receive messages without any restrictions. |50000|
-|maxUnackedMessagesPerSubscription| The same as above, except per subscription rather than per consumer.  |200000|
-|authenticationEnabled| Enable authentication for the broker. |false|
-|authenticationProviders| A comma-separated list of class names for authentication providers. |false|
-|authorizationEnabled|  Enforce authorization in brokers. |false|
-|superUserRoles|  Role names that are treated as "superusers." Superusers are authorized to perform all admin tasks. ||  
-|brokerClientAuthenticationPlugin|  The authentication settings of the broker itself. Used when the broker connects to other brokers either in the same cluster or from other clusters. ||
-|brokerClientAuthenticationParameters|  The parameters that go along with the plugin specified using brokerClientAuthenticationPlugin.  ||
-|athenzDomainNames| Supported Athenz authentication provider domain names as a comma-separated list.  ||
-|bookkeeperClientAuthenticationPlugin|  Authentication plugin to be used when connecting to bookies (BookKeeper servers). ||
-|bookkeeperClientAuthenticationParametersName|  BookKeeper authentication plugin implementation parameters and values.  ||
-|bookkeeperClientAuthenticationParameters|  Parameters associated with the bookkeeperClientAuthenticationParametersName ||
-|bookkeeperClientTimeoutInSeconds|  Timeout for BookKeeper add and read operations. |30|
-|bookkeeperClientSpeculativeReadTimeoutInMillis|  Speculative reads are initiated if a read request doesn’t complete within a certain time. A value of 0 disables speculative reads.  |0|
-|bookkeeperClientHealthCheckEnabled|  Enable bookie health checks.  |true|
-|bookkeeperClientHealthCheckIntervalSeconds|  The time interval, in seconds, at which health checks are performed. New ledgers are not created during health checks.  |60|
-|bookkeeperClientHealthCheckErrorThresholdPerInterval|  Error threshold for health checks.  |5|
-|bookkeeperClientHealthCheckQuarantineTimeInSeconds|  If bookies have more than the allowed number of failures within the time interval specified by bookkeeperClientHealthCheckIntervalSeconds |1800|
-|bookkeeperClientRackawarePolicyEnabled|    |true|
-|bookkeeperClientIsolationGroups|||   
-|managedLedgerDefaultEnsembleSize|    |1|
-|managedLedgerDefaultWriteQuorum|   |1|
-|managedLedgerDefaultAckQuorum|   |1|
-|managedLedgerCacheSizeMB|    |1024|
-|managedLedgerCacheEvictionWatermark|   |0.9|
-|managedLedgerDefaultMarkDeleteRateLimit|   |0.1|
-|managedLedgerMaxEntriesPerLedger|    |50000|
-|managedLedgerMinLedgerRolloverTimeMinutes|   |10|
-|managedLedgerMaxLedgerRolloverTimeMinutes|   |240|
-|managedLedgerCursorMaxEntriesPerLedger|    |50000|
-|managedLedgerCursorRolloverTimeInSeconds|    |14400|
-|autoSkipNonRecoverableData|    |false|
-|loadBalancerEnabled|   |false|
-|loadBalancerPlacementStrategy|   |weightedRandomSelection|
-|loadBalancerReportUpdateThresholdPercentage|   |10|
-|loadBalancerReportUpdateMaxIntervalMinutes|    |15|
-|loadBalancerHostUsageCheckIntervalMinutes|  |1|
-|loadBalancerSheddingIntervalMinutes|   |30|
-|loadBalancerSheddingGracePeriodMinutes|    |30|
-|loadBalancerBrokerMaxTopics|   |50000|
-|loadBalancerBrokerUnderloadedThresholdPercentage|    |1|
-|loadBalancerBrokerOverloadedThresholdPercentage|   |85|
-|loadBalancerResourceQuotaUpdateIntervalMinutes|    |15|
-|loadBalancerBrokerComfortLoadLevelPercentage|    |65|
-|loadBalancerAutoBundleSplitEnabled|    |false|
-|loadBalancerNamespaceBundleMaxTopics|    |1000|
-|loadBalancerNamespaceBundleMaxSessions|    |1000|
-|loadBalancerNamespaceBundleMaxMsgRate|   |1000|
-|loadBalancerNamespaceBundleMaxBandwidthMbytes|   |100|
-|loadBalancerNamespaceMaximumBundles|   |128|
-|replicationMetricsEnabled|   |true|
-|replicationConnectionsPerBroker|   |16|
-|replicationProducerQueueSize|    |1000|
-|defaultRetentionTimeInMinutes|   |0|
-|defaultRetentionSizeInMB|    |0|
-|keepAliveIntervalSeconds|    |30|
-|brokerServicePurgeInactiveFrequencyInSeconds|    |60|
-
-
-
-
-
-## WebSocket
-
-|Name|Description|Default|
-|---|---|---|
-|configurationStoreServers    |||
-|zooKeeperSessionTimeoutMillis|   |30000|
-|serviceUrl|||
-|serviceUrlTls|||
-|brokerServiceUrl||| 
-|brokerServiceUrlTls|||
-|webServicePort||8080|
-|webServicePortTls||8443|
-|bindAddress||0.0.0.0|
-|clusterName |||
-|authenticationEnabled||false|
-|authenticationProviders|||   
-|authorizationEnabled||false|
-|superUserRoles |||
-|brokerClientAuthenticationPlugin|||
-|brokerClientAuthenticationParameters||| 
-|tlsEnabled||false|
-|tlsAllowInsecureConnection||false|
-|tlsCertificateFilePath|||
-|tlsKeyFilePath |||
-|tlsTrustCertsFilePath|||
-
-
-## Pulsar proxy 
-
-The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) can be configured in the `conf/proxy.conf` file.
-
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  The ZooKeeper quorum connection string (as a comma-separated list)  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|zookeeperSessionTimeoutMs| ZooKeeper session timeout (in milliseconds) |30000|
-|servicePort| The port to use for server binary Protobuf requests |6650|
-|servicePortTls|  The port to use to server binary Protobuf TLS requests  |6651|
-|statusFilePath|  Path for the file used to determine the rotation status for the proxy instance when responding to service discovery health checks ||
-|authenticationEnabled| Whether authentication is enabled for the Pulsar proxy  |false|
-|authenticationProviders| Authentication provider name list (a comma-separated list of class names) ||
-|authorizationEnabled|  Whether authorization is enforced by the Pulsar proxy |false|
-|authorizationProvider| Authorization provider as a fully qualified class name  |org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider|
-|brokerClientAuthenticationPlugin|  The authentication plugin used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientAuthenticationParameters|  The authentication parameters used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientTrustCertsFilePath|  The path to trusted certificates used by the Pulsar proxy to authenticate with Pulsar brokers ||
-|superUserRoles|  Role names that are treated as "super-users," meaning that they will be able to perform all admin ||
-|forwardAuthorizationCredentials| Whether client authorization credentials are forwarded to the broker for re-authorization. Authentication must be enabled via authenticationEnabled=true for this to take effect.  |false|
-|maxConcurrentInboundConnections| Max concurrent inbound connections. The proxy will reject requests beyond that. |10000|
-|maxConcurrentLookupRequests| Max concurrent outbound connections. The proxy will error out requests beyond that. |10000|
-|tlsEnabledInProxy| Whether TLS is enabled for the proxy  |false|
-|tlsEnabledWithBroker|  Whether TLS is enabled when communicating with Pulsar brokers |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-|tlsTrustCertsFilePath| Path for the trusted TLS certificate pem file ||
-|tlsHostnameVerificationEnabled|  Whether the hostname is validated when the proxy creates a TLS connection with brokers  |false|
-|tlsRequireTrustedClientCertOnConnect|  Whether client certificates are required for TLS. Connections are rejected if the client certificate isn’t trusted. |false|
-
-
-## ZooKeeper
-
-ZooKeeper handles a broad range of essential configuration- and coordination-related tasks for Pulsar. The default configuration file for ZooKeeper is in the `conf/zookeeper.conf` file in your Pulsar installation. The following parameters are available:
-
-
-|Name|Description|Default|
-|---|---|---|
-|tickTime|  The tick is the basic unit of time in ZooKeeper, measured in milliseconds and used to regulate things like heartbeats and timeouts. tickTime is the length of a single tick.  |2000|
-|initLimit| The maximum time, in ticks, that the leader ZooKeeper server allows follower ZooKeeper servers to successfully connect and sync. The tick time is set in milliseconds using the tickTime parameter. |10|
-|syncLimit| The maximum time, in ticks, that a follower ZooKeeper server is allowed to sync with other ZooKeeper servers. The tick time is set in milliseconds using the tickTime parameter.  |5|
-|dataDir| The location where ZooKeeper will store in-memory database snapshots as well as the transaction log of updates to the database. |data/zookeeper|
-|clientPort|  The port on which the ZooKeeper server will listen for connections. |2181|
-|autopurge.snapRetainCount| In ZooKeeper, auto purge determines how many recent snapshots of the database stored in dataDir to retain within the time interval specified by autopurge.purgeInterval (while deleting the rest).  |3|
-|autopurge.purgeInterval| The time interval, in hours, by which the ZooKeeper database purge task is triggered. Setting to a non-zero number will enable auto purge; setting to 0 will disable. Read this guide before enabling auto purge. |1|
-|maxClientCnxns|  The maximum number of client connections. Increase this if you need to handle more ZooKeeper clients. |60|
-
-
-
-
-In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
-a `server.N` line to the `conf/zookeeper.conf` file for each node in the ZooKeeper cluster, where `N` is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-> We strongly recommend consulting the [ZooKeeper Administrator's Guide](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html) for a more thorough and comprehensive introduction to ZooKeeper configuration
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/reference-pulsar-admin.md b/site2/website/versioned_docs/version-2.1.0-incubating/reference-pulsar-admin.md
deleted file mode 100644
index ce6f9ec1308df..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/reference-pulsar-admin.md
+++ /dev/null
@@ -1,2045 +0,0 @@
----
-id: reference-pulsar-admin
-title: Pulsar admin CLI
-sidebar_label: "Pulsar Admin CLI"
-original_id: reference-pulsar-admin
----
-
-The `pulsar-admin` tool enables you to manage Pulsar installations, including clusters, brokers, namespaces, tenants, and more.
-
-Usage
-
-```bash
-
-$ pulsar-admin command
-
-```
-
-Commands
-* `broker-stats`
-* `brokers`
-* `clusters`
-* `functions`
-* `namespaces`
-* `ns-isolation-policy`
-* `sink`
-* `source`
-* `topics`
-* `tenants`
-* `resource-quotas`
-* `schemas`
-
-## `broker-stats`
-
-Operations to collect broker statistics
-
-```bash
-
-$ pulsar-admin broker-stats subcommand
-
-```
-
-Subcommands
-* `allocator-stats`
-* `destinations`
-* `mbeans`
-* `monitoring-metrics`
-* `topics`
-
-
-### `allocator-stats`
-
-Dump allocator stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats allocator-stats allocator-name
-
-```
-
-### `destinations`
-
-Dump topic stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats destinations options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-### `mbeans`
-
-Dump Mbean stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats mbeans options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `monitoring-metrics`
-
-Dump metrics for monitoring
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats monitoring-metrics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `topics`
-
-Dump topic stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats topics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-## `brokers`
-
-Operations about brokers
-
-```bash
-
-$ pulsar-admin brokers subcommand
-
-```
-
-Subcommands
-* `list`
-* `namespaces`
-* `update-dynamic-config`
-* `list-dynamic-config`
-* `get-all-dynamic-config`
-* `get-internal-config`
-
-### `list`
-List active brokers of the cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list cluster-name
-
-```
-
-### `namespaces`
-List namespaces owned by the broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers namespaces cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--url`|The URL for the broker||
-
-
-### `update-dynamic-config`
-Update a broker's dynamic service configuration
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers update-dynamic-config options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--config`|Service configuration parameter name||
-|`--value`|Value for the configuration parameter value specified using the `--config` flag||
-
-
-### `list-dynamic-config`
-Get list of updatable configuration name
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list-dynamic-config
-
-```
-
-### `get-all-dynamic-config`
-Get all overridden dynamic-configuration values
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-all-dynamic-config
-
-```
-
-### `get-internal-config`
-Get internal configuration information
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-internal-config
-
-```
-
-## `clusters`
-Operations about clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters subcommand
-
-```
-
-Subcommands
-* `get`
-* `create`
-* `update`
-* `delete`
-* `list`
-* `update-peer-clusters`
-
-
-### `get`
-Get the configuration data for the specified cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get cluster-name
-
-```
-
-### `create`
-Provisions a new cluster. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters create cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `update`
-Update the configuration for a cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `delete`
-Deletes an existing cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters delete cluster-name
-
-```
-
-### `list`
-List the existing clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters list
-
-```
-
-### `update-peer-clusters`
-Update peer cluster names
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update-peer-clusters peer-cluster-names
-
-```
-
-## `functions`
-
-A command-line interface for Pulsar Functions
-
-Usage
-
-```bash
-
-$ pulsar-admin functions subcommand
-
-```
-
-Subcommands
-* `localrun`
-* `create`
-* `delete`
-* `update`
-* `get`
-* `getstatus`
-* `list`
-* `querystate`
-* `trigger`
-
-
-### `localrun`
-Run a Pulsar Function locally
-
-
-Usage
-
-```bash
-
-$ pulsar-admin functions localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The CPU to allocate to each function instance (in number of cores)||
-|`--ram`|The RAM to allocate to each function instance (in bytes)||
-|`--disk`|The disk space to allocate to each function instance (in bytes)||
-|`--brokerServiceUrl `|The URL of the Pulsar broker||
-|`--className`|The name of the function’s class||
-|`--customSerdeInputs`|A map of the input topic to SerDe name||
-|`--functionConfigFile`|The path of the YAML config file used to configure the function||
-|`--inputs`|The input topics for the function (as a comma-separated list if more than one topic is desired)||
-|`--logTopic`|The topic to which logs from this function are published||
-|`--jar`|A path to the JAR file for the function (if the function is written in Java)||
-|`--name`|The name of the function|The value specified by --className|
-|`--namespace`|The function’s namespace||
-|`--output`|The name of the topic to which the function publishes its output (if any)||
-|`--outputSerdeClassName`|The SerDe class used for the function’s output||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processingGuarantees`|The processing guarantees applied to the function. Can be one of: ATLEAST_ONCE, ATMOST_ONCE, or EFFECTIVELY_ONCE|ATLEAST_ONCE|
-|`--py`|The path of the Python file containing the function’s processing logic (if the function is written in Python)||
-|`--stateStorageServiceUrl`|The service URL for the function’s state storage (if the function uses a storage system different from the Apache BookKeeper cluster used by Pulsar)||
-|`--subscriptionType`|The subscription type used by the function when consuming messages on the input topic(s). Can be either SHARED or EXCLUSIVE|SHARED|
-|`--tenant`|The function’s tenant||
-|`--userConfig`|A user-supplied config value, set as a key/value pair. You can set multiple user config values.||
-
-
-### `create`
-Creates a new Pulsar Function on the target infrastructure
-
-Usage
-
-```
-
-$ pulsar-admin functions create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The CPU to allocate to each function instance (in number of cores)||
-|`--ram`|The RAM to allocate to each function instance (in bytes)||
-|`--disk`|The disk space to allocate to each function instance (in bytes)||
-|`--brokerServiceUrl `|The URL of the Pulsar broker||
-|`--className`|The name of the function’s class||
-|`--customSerdeInputs`|A map of the input topic to SerDe name||
-|`--functionConfigFile`|The path of the YAML config file used to configure the function||
-|`--inputs`|The input topics for the function (as a comma-separated list if more than one topic is desired)||
-|`--logTopic`|The topic to which logs from this function are published||
-|`--jar`|A path to the JAR file for the function (if the function is written in Java)||
-|`--name`|The name of the function|The value specified by --className|
-|`--namespace`|The function’s namespace||
-|`--output`|The name of the topic to which the function publishes its output (if any)||
-|`--outputSerdeClassName`|The SerDe class used for the function’s output||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processingGuarantees`|The processing guarantees applied to the function. Can be one of: ATLEAST_ONCE, ATMOST_ONCE, or EFFECTIVELY_ONCE|ATLEAST_ONCE|
-|`--py`|The path of the Python file containing the function’s processing logic (if the function is written in Python)||
-|`--stateStorageServiceUrl`|The service URL for the function’s state storage (if the function uses a storage system different from the Apache BookKeeper cluster used by Pulsar)||
-|`--subscriptionType`|The subscription type used by the function when consuming messages on the input topic(s). Can be either SHARED or EXCLUSIVE|SHARED|
-|`--tenant`|The function’s tenant||
-|`--userConfig`|A user-supplied config value, set as a key/value pair. You can set multiple user config values.||
-
-
-### `delete`
-Deletes an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function to delete||
-|`--namespace`|The namespace of the function to delete||
-|`--tenant`|The tenant of the function to delete||
-
-
-### `update`
-Updates an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions update options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--className`|The name of the function’s class||
-|`--customSerdeInputs`|A map of the input topic to SerDe name||
-|`--functionConfigFile`|The path of the YAML config file used to configure the function||
-|`--inputs`|The input topics for the function (as a comma-separated list if more than one topic is desired)||
-|`--logTopic`|The topic to which logs from this function are published||
-|`--jar`|A path to the JAR file for the function (if the function is written in Java)||
-|`--name`|The name of the function|The value specified by --className|
-|`--namespace`|The function’s namespace||
-|`--output`|The name of the topic to which the function publishes its output (if any)||
-|`--outputSerdeClassName`|The SerDe class used for the function’s output||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processingGuarantees`|The processing guarantees applied to the function. Can be one of: ATLEAST_ONCE, ATMOST_ONCE, or EFFECTIVELY_ONCE|ATLEAST_ONCE|
-|`--py`|The path of the Python file containing the function’s processing logic (if the function is written in Python)||
-|`--subscriptionType`|The subscription type used by the function when consuming messages on the input topic(s). Can be either SHARED or EXCLUSIVE|SHARED|
-|`--tenant`|The function’s tenant||
-|`--userConfig`|A user-supplied config value, set as a key/value pair. You can set multiple user config values.||
-
-### `get`
-Fetch information about an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function||
-|`--namespace`|The namespace of the function||
-|`--tenant`|The tenant of the function||
-
-
-### `getstatus`
-Get the status of an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions getstatus options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function||
-|`--namespace`|The namespace of the function||
-|`--tenant`|The tenant of the function||
-
-
-### `list`
-List all Pulsar Functions for a specific tenant and namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin functions list options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--namespace`|The namespace of the function||
-|`--tenant`|The tenant of the function||
-
-
-### `querystate`
-Retrieve the current state of a Pulsar Function by key
-
-Usage
-
-```bash
-
-$ pulsar-admin functions querystate options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-k`, `--key`|The key for the state you want to fetch||
-|`--name`|The name of the function whose state you want to query||
-|`--namespace`|The namespace of the function whose state you want to query||
-|`--tenant`|The tenant of the function whose state you want to query||
-|`-u`, `--storage-service-url`|The service URL for the function’s state storage (if the function uses a storage system different from the Apache BookKeeper cluster used by Pulsar)||
-|`-w`, `--watch`|If set, watching for state changes is enabled|false|
-
-
-### `trigger`
-Triggers the specified Pulsar Function with a supplied value or file data
-
-Usage
-
-```bash
-
-$ pulsar-admin functions trigger options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the Pulsar Function to trigger||
-|`--namespace`|The namespace of the Pulsar Function to trigger||
-|`--tenant`|The tenant of the Pulsar Function to trigger||
-|`--triggerFile`|The path to the file containing the data with which the Pulsar Function is to be triggered||
-|`--triggerValue`|The value with which the Pulsar Function is to be triggered||
-
-
-## `namespaces`
-
-Operations for managing namespaces
-
-```bash
-
-$ pulsar-admin namespaces subcommand
-
-```
-
-Subcommands
-* `list`
-* `list-cluster`
-* `destinations`
-* `policies`
-* `create`
-* `delete`
-* `set-deduplication`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `set-clusters`
-* `get-clusters`
-* `get-backlog-quotas`
-* `set-backlog-quota`
-* `remove-backlog-quota`
-* `get-persistence`
-* `set-persistence`
-* `get-message-ttl`
-* `set-message-ttl`
-* `get-retention`
-* `set-retention`
-* `unload`
-* `clear-backlog`
-* `unsubscribe`
-* `get-compaction-threshold`
-* `set-compaction-threshold`
-* `get-offload-threshold`
-* `set-offload-threshold`
-
-
-### `list`
-Get the namespaces for a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces list tenant-name
-
-```
-
-### `list-cluster`
-Get the namespaces for a tenant in the cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces list-cluster tenant/cluster
-
-```
-
-### `destinations`
-Get the destinations for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces destinations tenant/cluster/namespace
-
-```
-
-### `policies`
-Get the policies of a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces policies tenant/cluster/namespace
-
-```
-
-### `create`
-Create a new namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces create tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-b` , `--bundles`|The number of bundles to activate|0|
-
-
-### `delete`
-Deletes a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces delete tenant/cluster/namespace
-
-```
-
-### `set-deduplication`
-Enable or disable message deduplication on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-deduplication tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable message deduplication on the specified namespace|false|
-|`--disable`, `-d`|Disable message deduplication on the specified namespace|false|
-
-
-### `permissions`
-Get the permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces permissions tenant/cluster/namespace
-
-```
-
-### `grant-permission`
-Grant permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces grant-permission tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces revoke-permission tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--role`|The client role to which to grant the permissions||
-
-
-### `set-clusters`
-Set replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-clusters tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--clusters`|Replication clusters ID list (comma-separated values)||
-
-
-### `get-clusters`
-Get replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-clusters tenant/cluster/namespace
-
-```
-
-### `get-backlog-quotas`
-Get the backlog quota policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-backlog-quotas tenant/cluster/namespace
-
-```
-
-### `set-backlog-quota`
-Set a backlog quota for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--limit`|The backlog size limit (for example `10M` or `16G`)||
-|`-p`, `--policy`|The retention policy to enforce when the limit is reached. The valid options are: `producer_request_hold`, `producer_exception` or `consumer_backlog_eviction`|
-
-Example
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-prop/my-cluster/my-ns \
---limit 2G \
---policy producer_request_hold
-
-```
-
-### `remove-backlog-quota`
-Remove a backlog quota policy from a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-backlog-quota tenant/cluster/namespace
-
-```
-
-### `get-persistence`
-Get the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-persistence tenant/cluster/namespace
-
-```
-
-### `set-persistence`
-Set the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-persistence tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-a`, `--bookkeeper-ack-quorum`|The number of acks (guaranteed copies) to wait for each entry|0|
-|`-e`, `--bookkeeper-ensemble`|The number of bookies to use for a topic|0|
-|`-w`, `--bookkeeper-write-quorum`|How many writes to make of each entry|0|
-|`-r`, `--ml-mark-delete-max-rate`|Throttling rate of mark-delete operation (0 means no throttle)||
-
-
-### `get-message-ttl`
-Get the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-message-ttl tenant/cluster/namespace
-
-```
-
-### `set-message-ttl`
-Set the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-message-ttl options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-ttl`, `--messageTTL`|Message TTL in seconds. When the value is set to `0`, TTL is disabled. TTL is disabled by default.|0|
-
-
-### `get-retention`
-Get the retention policy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-retention tenant/cluster/namespace
-
-```
-
-### `set-retention`
-Set the retention policy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-retention tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|The retention size limits (for example 10M, 16G or 3T). 0 means no retention and -1 means infinite size retention||
-|`-t`, `--time`|The retention time in minutes, hours, days, or weeks. Examples: 100m, 13h, 2d, 5w. 0 means no retention and -1 means infinite time retention||
-
-
-### `unload`
-Unload a namespace or namespace bundle from the current serving broker.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unload tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|||
-
-
-### `clear-backlog`
-Clear the backlog for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces clear-backlog tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|||   
-|`-f`, `--force`|Whether to force a clear backlog without prompt|false|
-|`-s`, `--sub`|The subscription name||
-
-
-### `unsubscribe`
-Unsubscribe the given subscription on all destinations on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unsubscribe tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|||   
-|`-s`, `--sub`|The subscription name||
-
-
-### `get-compaction-threshold`
-Get compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-compaction-threshold tenant/namespace
-
-```
-
-### `set-compaction-threshold`
-Set compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-compaction-threshold tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-t`, `--threshold`|Maximum number of bytes in a topic backlog before compaction is triggered (eg: 10M, 16G, 3T). 0 disables automatic compaction|0|
-
-
-### `get-offload-threshold`
-Get offloadThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-threshold tenant/namespace
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|Maximum number of bytes stored in the pulsar cluster for a topic before data will start being automatically offloaded to longterm storage (eg: 10M, 16G, 3T, 100). Negative values disable automatic offload. 0 triggers offloading as soon as possible.|-1|
-
-
-
-## `ns-isolation-policy`
-Operations for managing namespace isolation policies.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy subcommand
-
-```
-
-Subcommands
-* `set`
-* `get`
-* `list`
-* `delete`
-
-### `set`
-Create/update a namespace isolation policy for a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy set cluster-name policy-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--auto-failover-policy-params`|Comma-separated name=value auto failover policy parameters|[]|
-|`--auto-failover-policy-type`|Auto failover policy type name. Currently available options: min_available.|[]|
-|`--namespaces`|Comma-separated namespaces regex list|[]|
-|`--primary`|Comma-separated primary broker regex list|[]|
-|`--secondary`|Comma-separated secondary broker regex list|[]|
-
-
-### `get`
-Get the namespace isolation policy of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy get cluster-name policy-name
-
-```
-
-### `list`
-List all namespace isolation policies of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy list cluster-name
-
-```
-
-### `delete`
-Delete namespace isolation policy of a cluster. This operation requires superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy delete
-
-```
-
-## `sink`
-
-An interface for managing Pulsar IO sinks (egress data from Pulsar)
-
-Usage
-
-```bash
-
-$ pulsar-admin sink subcommand
-
-```
-
-Subcommands
-* `create`
-* `delete`
-* `localrun`
-
-
-### `create`
-Submit a Pulsar IO sink connector to run in a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin sink create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--className`|The sink’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--customSerdeInputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--disk`|The disk (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--inputs`|The sink’s input topic(s) (multiple topics can be specified as a comma-separated list)||
-|`--jar`|Path to the Java jar file for the sink||
-|`--name`|The sink’s name||
-|`--namespace`|The sink’s namespace||
-|`--parallelism`|"The sink’s parallelism factor (i.e. the number of sink instances to run)."||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the sink. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--sinkConfig`|Sink config key/values||
-|`--sinkConfigFile`|The path to a YAML config file specifying the sink’s configuration||
-|`--tenant`|The sink’s tenant||
-
-
-### `delete`
-Stops a Pulsar IO sink
-
-Usage
-
-```bash
-
-$ pulsar-admin sink delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function to delete||
-|`--namespace`|The namespace of the function to delete||
-|`--tenant`|The tenant of the function to delete||
-
-
-### `localrun`
-Run the Pulsar sink locally (rather than in the Pulsar cluster)
-
-Usage
-
-```bash
-
-$ pulsar-admin sink localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--brokerServiceUrl`|The URL for the Pulsar broker||
-|`--className`|The sink’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--customSerdeInputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--disk`|The disk (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--inputs`|The sink’s input topic(s) (multiple topics can be specified as a comma-separated list)||
-|`--jar`|Path to the Java jar file for the sink||
-|`--name`|The sink’s name||
-|`--namespace`|The sink’s namespace||
-|`--parallelism`|"The sink’s parallelism factor (i.e. the number of sink instances to run)."||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the sink. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--sinkConfig`|Sink config key/values||
-|`--sinkConfigFile`|The path to a YAML config file specifying the sink’s configuration||
-|`--tenant`|The sink’s tenant||
-
-
-
-## `source`
-An interface for managing Pulsar IO sources (ingress data into Pulsar)
-
-Usage
-
-```bash
-
-$ pulsar-admin source subcommand
-
-```
-
-Subcommands
-* `create`
-* `delete`
-* `localrun`
-
-
-### `create`
-Submit a Pulsar IO source connector to run in a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin source create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--className`|The source’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--deserializationClassName`|The SerDe classname for the source||
-|`--destinationTopicName`|The Pulsar topic to which data is sent||
-|`--disk`|The disk (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--jar`|Path to the Java jar file for the source||
-|`--name`|The source’s name||
-|`--namespace`|The source’s namespace||
-|`--parallelism`|The source’s parallelism factor (i.e. the number of source instances to run).||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the source. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--sourceConfig`|Source config key/values||
-|`--sourceConfigFile`|The path to a YAML config file specifying the source’s configuration||
-|`--tenant`|The source’s tenant||
-
-
-### `delete`
-Stops a Pulsar IO source
-
-Usage
-
-```bash
-
-$ pulsar-admin source delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function to delete||
-|`--namespace`|The namespace of the function to delete||
-|`--tenant`|The tenant of the function to delete||
-
-
-### `localrun`
-Run the Pulsar source locally (rather than in the Pulsar cluster)
-
-Usage
-
-```bash
-
-$ pulsar-admin source localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--className`|The source’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--deserializationClassName`|The SerDe classname for the source||
-|`--destinationTopicName`|The Pulsar topic to which data is sent||
-|`--disk`|The disk (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--jar`|Path to the Java jar file for the source||
-|`--name`|The source’s name||
-|`--namespace`|The source’s namespace||
-|`--parallelism`|The source’s parallelism factor (i.e. the number of source instances to run).||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the source. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--sourceConfig`|Source config key/values||
-|`--sourceConfigFile`|The path to a YAML config file specifying the source’s configuration||
-|`--tenant`|The source’s tenant||
-
-
-
-## `topics`
-Operations for managing Pulsar topics (both persistent and non persistent)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subcommand
-
-```
-
-Subcommands
-* `compact`
-* `compaction-status`
-* `offload`
-* `offload-status`
-* `create-partitioned-topic`
-* `delete-partitioned-topic`
-* `get-partitioned-topic-metadata`
-* `update-partitioned-topic`
-* `list`
-* `list-in-bundle`
-* `terminate`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `lookup`
-* `bundle-range`
-* `delete`
-* `unload`
-* `subscriptions`
-* `unsubscribe`
-* `stats`
-* `stats-internal`
-* `info-internal`
-* `partitioned-stats`
-* `skip`
-* `skip-all`
-* `expire-messages`
-* `expire-messages-all-subscriptions`
-* `peek-messages`
-* `reset-cursor`
-
-
-### `compact`
-Run compaction on the specified topic (persistent topics only)
-
-Usage
-
-```
-
-$ pulsar-admin topics compact persistent://tenant/namespace/topic
-
-```
-
-### `compaction-status`
-Check the status of a topic compaction (persistent topics only)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics compaction-status persistent://tenant/namespace/topic
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `offload`
-Trigger offload of data from a topic to long-term storage (e.g. Amazon S3)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--size-threshold`|The maximum amount of data to keep in BookKeeper for the specific topic||
-
-
-### `offload-status`
-Check the status of data offloading from a topic to long-term storage
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload-status persistent://tenant/namespace/topic op
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `create-partitioned-topic`
-Create a partitioned topic. A partitioned topic must be created before producers can publish to it.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-
-### `delete-partitioned-topic`
-Delete a partitioned topic. This will also delete all the partitions of the topic if they exist.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete-partitioned-topic {persistent|non-persistent}
-
-```
-
-### `get-partitioned-topic-metadata`
-Get the partitioned topic metadata. If the topic is not created or is a non-partitioned topic, this will return an empty topic with zero partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-partitioned-topic-metadata {persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-### `update-partitioned-topic`
-Update existing non-global partitioned topic. New updating number of partitions must be greater than existing number of partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics update-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-### `list`
-Get the list of topics under a namespace
-
-Usage
-
-```
-
-$ pulsar-admin topics list tenant/cluster/namespace
-
-```
-
-### `list-in-bundle`
-Get a list of non-persistent topics present under a namespace bundle
-
-Usage
-
-```
-
-$ pulsar-admin topics list-in-bundle tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-b`, `--bundle`|The bundle range||
-
-
-### `terminate`
-Terminate a persistent topic (disallow further messages from being published on the topic)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics terminate persistent://tenant/namespace/topic
-
-```
-
-### `permissions`
-Get the permissions on a topic. Retrieve the effective permissions for a destination. These permissions are defined by the permissions set at the namespace level combined (union) with any eventual specific permissions set on the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics permissions topic
-
-```
-
-### `grant-permission`
-Grant a new permission to a client role on a single topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics grant-permission {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions to a client role on a single topic. If the permission was not set at the topic level, but rather at the namespace level, this operation will return an error (HTTP status code 412).
-
-Usage
-
-```bash
-
-$ pulsar-admin topics revoke-permission topic
-
-```
-
-### `lookup`
-Look up a topic from the current serving broker
-
-Usage
-
-```bash
-
-$ pulsar-admin topics lookup topic
-
-```
-
-### `bundle-range`
-Get the namespace bundle which contains the given topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics bundle-range topic
-
-```
-
-### `delete`
-Delete a topic. The topic cannot be deleted if there are any active subscriptions or producers connected to the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete topic
-
-```
-
-### `unload`
-Unload a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unload topic
-
-```
-
-### `subscriptions`
-Get the list of subscriptions on the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subscriptions topic
-
-```
-
-### `unsubscribe`
-Delete a durable subscriber from a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unsubscribe topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to delete||
-
-
-### `stats`
-Get the stats for the topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats topic
-
-```
-
-### `stats-internal`
-Get the internal stats for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats-internal topic
-
-```
-
-### `info-internal`
-Get the internal metadata info for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics info-internal topic
-
-```
-
-### `partitioned-stats`
-Get the stats for the partitioned topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-stats topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--per-partition`|Get per-partition stats|false|
-
-
-### `skip`
-Skip some messages for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics skip topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages to skip|0|
-|`-s`, `--subscription`|The subscription on which to skip messages||
-
-
-### `skip-all`
-Skip all the messages for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics skip-all topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to clear||
-
-
-### `expire-messages`
-Expire messages that are older than the given expiry time (in seconds) for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-|`-s`, `--subscription`|The subscription to skip messages on||
-
-
-### `expire-messages-all-subscriptions`
-Expire messages older than the given expiry time (in seconds) for all subscriptions
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages-all-subscriptions topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-
-
-### `peek-messages`
-Peek some messages for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics peek-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages|0|
-|`-s`, `--subscription`|Subscription to get messages from||
-
-
-### `reset-cursor`
-Reset position for subscription to closest to timestamp
-
-Usage
-
-```bash
-
-$ pulsar-admin topics reset-cursor topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|Subscription to reset position on||
-|`-t`, `--time`|The time, in minutes, to reset back to (or minutes, hours, days, weeks, etc.). Examples: `100m`, `3h`, `2d`, `5w`.||
-
-
-
-## `tenants`
-Operations for managing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants subcommand
-
-```
-
-Subcommands
-* `list`
-* `get`
-* `create`
-* `update`
-* `delete`
-
-### `list`
-List the existing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants list
-
-```
-
-### `get`
-Gets the configuration of a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants get tenant-name
-
-```
-
-### `create`
-Creates a new tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants create tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-### `update`
-Updates a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants update tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-
-### `delete`
-Deletes an existing tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants delete tenant-name
-
-```
-
-## `resource-quotas`
-Operations for managing resource quotas
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas subcommand
-
-```
-
-Subcommands
-* `get`
-* `set`
-* `reset-namespace-bundle-quota`
-
-
-### `get`
-Get the resource quota for a specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-### `set`
-Set the resource quota for the specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas set options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bi`, `--bandwidthIn`|The expected inbound bandwidth (in bytes/second)|0|
-|`-bo`, `--bandwidthOut`|Expected outbound bandwidth (in bytes/second)0|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-d`, `--dynamic`|Allow to be dynamically re-calculated (or not)|false|
-|`-mem`, `--memory`|Expectred memory usage (in megabytes)|0|
-|`-mi`, `--msgRateIn`|Expected incoming messages per second|0|
-|`-mo`, `--msgRateOut`|Expected outgoing messages per second|0|
-|`-n`, `--namespace`|The namespace as tenant/namespace, for example my-tenant/my-ns. Must be specified together with -b/--bundle.||
-
-
-### `reset-namespace-bundle-quota`
-Reset the specified namespace bundle's resource quota to a default value.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas reset-namespace-bundle-quota options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-
-## `schemas`
-Operations related to Schemas associated with Pulsar topics.
-
-Usage
-
-```
-
-$ pulsar-admin schemas subcommand
-
-```
-
-Subcommands
-* `upload`
-* `delete`
-* `get`
-
-
-### `upload`
-Upload the schema definition for a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas upload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--filename`|The path to the schema definition file. An example schema file is available under conf directory.||
-
-
-### `delete`
-Delete the schema definition associated with a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas delete persistent://tenant/namespace/topic
-
-```
-
-### `get`
-Retrieve the schema definition associated with a topic (at a given version if version is supplied).
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas get persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--version`|The version of the schema definition to retrieve for a topic.||
-
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/reference-rest-api-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/reference-rest-api-overview.md
deleted file mode 100644
index 4bdcf23483a2b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/reference-rest-api-overview.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-id: reference-rest-api-overview
-title: Pulsar REST APIs
-sidebar_label: "Pulsar REST APIs"
----
-
-A REST API (also known as RESTful API, REpresentational State Transfer Application Programming Interface) is a set of definitions and protocols for building and integrating application software, using HTTP requests to GET, PUT, POST, and DELETE data following the REST standards. In essence, REST API is a set of remote calls using standard methods to request and return data in a specific format between two systems. 
-
-Pulsar provides a variety of REST APIs that enable you to interact with Pulsar to retrieve information or perform an action. 
-
-| REST API category | Description |
-| --- | --- |
-| [Admin](https://pulsar.apache.org/admin-rest-api/?version=master) | REST APIs for administrative operations.|
-| [Functions](https://pulsar.apache.org/functions-rest-api/?version=master) | REST APIs for function-specific operations.|
-| [Sources](https://pulsar.apache.org/source-rest-api/?version=master) | REST APIs for source-specific operations.|
-| [Sinks](https://pulsar.apache.org/sink-rest-api/?version=master) | REST APIs for sink-specific operations.|
-| [Packages](https://pulsar.apache.org/packages-rest-api/?version=master) | REST APIs for package-specific operations. A package can be a group of functions, sources, and sinks.|
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/reference-terminology.md b/site2/website/versioned_docs/version-2.1.0-incubating/reference-terminology.md
deleted file mode 100644
index ec38e7aa43144..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/reference-terminology.md
+++ /dev/null
@@ -1,162 +0,0 @@
----
-id: reference-terminology
-title: Pulsar Terminology
-sidebar_label: "Terminology"
-original_id: reference-terminology
----
-
-Here is a glossary of terms related to Apache Pulsar:
-
-### Concepts
-
-#### Pulsar
-
-Pulsar is a distributed messaging system originally created by Yahoo but now under the stewardship of the Apache Software Foundation.
-
-#### Message
-
-Messages are the basic unit of Pulsar. They're what [producers](#producer) publish to [topics](#topic)
-and what [consumers](#consumer) then consume from topics.
-
-#### Topic
-
-A named channel used to pass messages published by [producers](#producer) to [consumers](#consumer) who
-process those [messages](#message).
-
-#### Partitioned Topic
-
-A topic that is served by multiple Pulsar [brokers](#broker), which enables higher throughput.
-
-#### Namespace
-
-A grouping mechanism for related [topics](#topic).
-
-#### Namespace Bundle
-
-A virtual group of [topics](#topic) that belong to the same [namespace](#namespace). A namespace bundle
-is defined as a range between two 32-bit hashes, such as 0x00000000 and 0xffffffff.
-
-#### Tenant
-
-An administrative unit for allocating capacity and enforcing an authentication/authorization scheme.
-
-#### Subscription
-
-A lease on a [topic](#topic) established by a group of [consumers](#consumer). Pulsar has three subscription
-modes (exclusive, shared, and failover).
-
-#### Pub-Sub
-
-A messaging pattern in which [producer](#producer) processes publish messages on [topics](#topic) that
-are then consumed (processed) by [consumer](#consumer) processes.
-
-#### Producer
-
-A process that publishes [messages](#message) to a Pulsar [topic](#topic).
-
-#### Consumer
-
-A process that establishes a subscription to a Pulsar [topic](#topic) and processes messages published
-to that topic by [producers](#producer).
-
-#### Reader
-
-Pulsar readers are message processors much like Pulsar [consumers](#consumer) but with two crucial differences:
-
-- you can specify *where* on a topic readers begin processing messages (consumers always begin with the latest
-  available unacked message);
-- readers don't retain data or acknowledge messages.
-
-#### Cursor
-
-The subscription position for a [consumer](#consumer).
-
-#### Acknowledgment (ack)
-
-A message sent to a Pulsar broker by a [consumer](#consumer) that a message has been successfully processed.
-An acknowledgement (ack) is Pulsar's way of knowing that the message can be deleted from the system;
-if no acknowledgement, then the message will be retained until it's processed.
-
-#### Unacknowledged
-
-A message that has been delivered to a consumer for processing but not yet confirmed as processed by the consumer.
-
-#### Retention Policy
-
-Size and/or time limits that you can set on a [namespace](#namespace) to configure retention of [messages](#message)
-that have already been [acknowledged](#acknowledgement-ack).
-
-#### Multi-Tenancy
-
-The ability to isolate [namespaces](#namespace), specify quotas, and configure authentication and authorization
-on a per-[tenant](#tenant) basis.
-
-### Architecture
-
-#### Standalone
-
-A lightweight Pulsar broker in which all components run in a single Java Virtual Machine (JVM) process. Standalone
-clusters can be run on a single machine and are useful for development purposes.
-
-#### Cluster
-
-A set of Pulsar [brokers](#broker) and [BookKeeper](#bookkeeper) servers (aka [bookies](#bookie)).
-Clusters can reside in different geographical regions and replicate messages to one another
-in a process called [geo-replication](#geo-replication).
-
-#### Instance
-
-A group of Pulsar [clusters](#cluster) that act together as a single unit.
-
-#### Geo-Replication
-
-Replication of messages across Pulsar [clusters](#cluster), potentially in different datacenters
-or geographical regions.
-
-#### Configuration Store
-
-Pulsar's configuration store (previously known as global ZooKeeper) is a ZooKeeper quorum that
-is used for configuration-specific tasks. A multi-cluster Pulsar installation requires just one
-configuration store across all [clusters](#cluster).
-
-#### Topic Lookup
-
-A service provided by Pulsar [brokers](#broker) that enables connecting clients to automatically determine
-which Pulsar [cluster](#cluster) is responsible for a [topic](#topic) (and thus where message traffic for
-the topic needs to be routed).
-
-#### Service Discovery
-
-A mechanism provided by Pulsar that enables connecting clients to use just a single URL to interact
-with all the [brokers](#broker) in a [cluster](#cluster).
-
-#### Broker
-
-A stateless component of Pulsar [clusters](#cluster) that runs two other components: an HTTP server
-exposing a REST interface for administration and topic lookup and a [dispatcher](#dispatcher) that
-handles all message transfers. Pulsar clusters typically consist of multiple brokers.
-
-#### Dispatcher
-
-An asynchronous TCP server used for all data transfers in-and-out a Pulsar [broker](#broker). The Pulsar
-dispatcher uses a custom binary protocol for all communications.
-
-### Storage
-
-#### BookKeeper
-
-[Apache BookKeeper](http://bookkeeper.apache.org/) is a scalable, low-latency persistent log storage
-service that Pulsar uses to store data.
-
-#### Bookie
-
-Bookie is the name of an individual BookKeeper server. It is effectively the storage server of Pulsar.
-
-#### Ledger
-
-An append-only data structure in [BookKeeper](#bookkeeper) that is used to persistently store messages in Pulsar [topics](#topic).
-
-### Functions
-
-Pulsar Functions are lightweight functions that can consume messages from Pulsar topics, apply custom processing logic, and, if desired, publish results to topics.
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-athenz.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-athenz.md
deleted file mode 100644
index 1f9a0bb694c2a..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-athenz.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-id: security-athenz
-title: Authentication using Athenz
-sidebar_label: "Authentication using Athenz"
-original_id: security-athenz
----
-
-[Athenz](https://github.com/AthenZ/athenz) is a role-based authentication/authorization system. In Pulsar, Athenz role tokens (aka *z-tokens*) can be used to establish the identify of the client.
-
-## Athenz authentication settings
-
-In a [decentralized Athenz system](https://github.com/AthenZ/athenz/blob/master/docs/decent_authz_flow.md) there is both an [authori**Z**ation **M**anagement **S**ystem](https://github.com/AthenZ/athenz/blob/master/docs/setup_zms.md) (ZMS) server and an  [authori**Z**ation **T**oken **S**ystem](https://github.com/AthenZ/athenz/blob/master/docs/setup_zts) (ZTS) server.
-
-To begin, you need to set up Athenz service access control. You should create domains for the *provider* (which provides some resources to other services with some authentication/authorization policies) and the *tenant* (which is provisioned to access some resources in a provider). In this case, the provider corresponds to the Pulsar service itself and the tenant corresponds to each application using Pulsar (typically, a [tenant](reference-terminology.md#tenant) in Pulsar).
-
-### Create the tenant domain and service
-
-On the [tenant](reference-terminology.md#tenant) side, you need to:
-
-1. Create a domain, such as `shopping`
-2. Generate a private/public key pair
-3. Create a service, such as `some_app`, on the domain with the public key
-
-Note that the private key generated in step 2 needs to be specified when the Pulsar client connects to the [broker](reference-terminology.md#broker) (see client configuration examples for [Java](client-libraries-java.md#tls-authentication) and [C++](client-libraries-cpp.md#tls-authentication)).
-
-For more specific steps involving the Athenz UI, please refer to [this doc](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#client-tenant-domain).
-
-### Create the provider domain and add the tenant service to some role members
-
-On the provider side, you need to:
-
-1. Create a domain, such as `pulsar`
-2. Create a role
-3. Add the tenant service to members of the role
-
-Note that in step 2 any action and resource can be specified since they are not used on Pulsar. In other words, Pulsar uses the Athenz role token only for authentication, *not* for authorization.
-
-For more specific steps involving UI, please refer to [this doc](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#server-provider-domain).
-
-## Configure the broker for Athenz
-
-> ### TLS encryption strongly recommended
->
-> Please note that using TLS encryption is strongly recommended when using Athenz as an authentication provider,
-> as it can protect role tokens from being intercepted and reused (see also [this doc](https://github.com/AthenZ/athenz/blob/master/docs/data_model)).
-
-In the `conf/broker.conf` configuration file in your Pulsar installation, you need to provide the class name of the Athenz authentication provider as well as a comma-separated list of provider domain names.
-
-```properties
-
-# Add the Athenz auth provider
-authenticationEnabled=true
-authorizationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-athenzDomainNames=pulsar
-
-# Enable TLS
-tlsEnabled=true
-tlsCertificateFilePath=/path/to/broker-cert.pem
-tlsKeyFilePath=/path/to/broker-key.pem
-
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-brokerClientAuthenticationParameters={"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}
-
-```
-
-> A full listing of parameters available in the `conf/broker.conf` file, as well as the default
-> values for those parameters, can be found in [Broker Configuration](reference-configuration.md#broker).
-
-## Configure clients for Athenz
-
-For more information on Pulsar client authentication using Athenz, see the following language-specific docs:
-
-* [Java client](client-libraries-java.md#athenz)
-
-## Configure CLI tools for Athenz
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-pulsar-admin.md), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:
-
-```properties
-
-# URL for the broker
-serviceUrl=https://broker.example.com:8443/
-
-# Set Athenz auth plugin and its parameters
-authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-authParams={"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}
-
-# Enable TLS
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/cacert.pem
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-authorization.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-authorization.md
deleted file mode 100644
index e2025ad6b2727..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-authorization.md
+++ /dev/null
@@ -1,128 +0,0 @@
----
-id: security-authorization
-title: Authentication and authorization in Pulsar
-sidebar_label: "Authorization and ACLs"
-original_id: security-authorization
----
-
-
-In Pulsar, the [authentication provider](security-overview.md#authentication-providers) is charged with properly identifying clients and
-associating them with [role tokens](security-overview.md#role-tokens). If only authentication is enabled, an authenticated role token will have the ability to access all resources in the cluster. *Authorization* is the process that determines *what* clients are able to do.
-
-The role tokens with the most privileges are the *superusers*. The *superusers* can create and destroy tenants, along with having full access to all tenant resources.
-
-When a [tenant](reference-terminology.md#tenant) is created by a superuser, that tenant is assigned an admin role. A client with the admin role token can then create, modify and destroy namespaces, and grant and revoke permissions to *other role tokens* on those namespaces.
-
-## Broker and Proxy Setup
-
-### Enabling Authorization and Assigning Superusers
-
-Authorization is enabled and superusers are assigned in the broker ([`conf/broker.conf`](reference-configuration.md#broker)) and proxy ([`conf/proxy.conf`](reference-configuration.md#proxy)) configuration files.
-
-```properties
-
-authorizationEnabled=true
-superUserRoles=my-super-user-1,my-super-user-2
-
-```
-
-> A full list of parameters available in the `conf/broker.conf` file,
-> as well as the default values for those parameters, can be found in [Broker Configuration](reference-configuration.md#broker) 
-
-Typically, superuser roles are used for administrators and clients but also for broker-to-broker authorization. When using [geo-replication](concepts-replication.md), every broker needs to be able to publish to all the other clusters' topics.
-
-### Proxy Roles
-
-By default, the broker treats the connection between a proxy and the broker as a normal user connection. The user is authenticated as the role configured in ```proxy.conf``` (see ["Enabling TLS Authentication on Proxies"](security-tls-authentication#on-proxies)). However, this is rarely the behaviour that the user desires when connecting to the cluster through a proxy. The user expects to be able to interact with the cluster as the role for which they have authenticated with the proxy.
-
-Pulsar uses *Proxy roles* to enable this. Proxy roles are specified in the broker configuration file, [`conf/broker.conf`](reference-configuration.md#broker). If a client that is authenticated with a broker is one of its ```proxyRoles```, all requests from that client must also carry information about the role of the client that is authenticated with the proxy. If this information, which we call the *original principal*, is missing, the client will not be able to access anything.
-
-Both the *proxy role* and the *original principle* must be authorized to access a resource for that resource to be accessible via the proxy. Administrators can take two approaches to this.
-
-The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role ```proxy1```, when a tenant is created by the superuser, ```proxy1``` should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, ```proxy1``` should also be granted the same permissions.
-
-Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the *original principal* of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.
-
-Roles can be specified as proxy roles in [`conf/broker.conf`](reference-configuration.md#broker).
-
-```properties
-
-proxyRoles=my-proxy-role
-
-# if you want to allow superusers to use the proxy (see above)
-superUserRoles=my-super-user-1,my-super-user-2,my-proxy-role
-
-```
-
-## Administering Tenants
-
-### Creating a new tenant
-
-A Pulsar [tenant](reference-terminology.md#tenant) is typically provisioned by Pulsar [instance](reference-terminology.md#instance) administrators or by some kind of self-service portal.
-
-Tenants are managed using the [`pulsar-admin`](reference-pulsar-admin.md) tool. Here's an example tenant creation command:
-
-```shell
-
-$ bin/pulsar-admin tenants create my-tenant \
-  --admin-roles my-admin-role \
-  --allowed-clusters us-west,us-east
-
-```
-
-This command will create a new tenant `my-tenant` that will be allowed to use the clusters `us-west` and `us-east`.
-
-A client that successfully identified itself as having the role `my-admin-role` would then be allowed to perform all administrative tasks on this tenant.
-
-The structure of topic names in Pulsar reflects the hierarchy between tenants, clusters, and namespaces:
-
-```shell
-
-persistent://tenant/namespace/topic
-
-```
-
-### Managing permissions
-
-You can use [Pulsar Admin Tools](admin-api-permissions.md) for managing permission in Pulsar.
-
-### Pulsar admin authentication
-
-```java
-
-String authPluginClassName = "com.org.MyAuthPluginClass";
-String authParams = "param1:value1";
-boolean useTls = false;
-boolean tlsAllowInsecureConnection = false;
-String tlsTrustCertsFilePath = null;
-
-ClientConfiguration config = new ClientConfiguration();
-config.setAuthentication(authPluginClassName, authParams);
-config.setUseTls(useTls);
-config.setTlsAllowInsecureConnection(tlsAllowInsecureConnection);
-config.setTlsTrustCertsFilePath(tlsTrustCertsFilePath);
-
-PulsarAdmin admin = new PulsarAdmin(url, config);
-
-```
-
-To use TLS:
-
-```java
-
-String authPluginClassName = "com.org.MyAuthPluginClass";
-String authParams = "param1:value1";
-boolean useTls = false;
-boolean tlsAllowInsecureConnection = false;
-String tlsTrustCertsFilePath = null;
-
-ClientConfiguration config = new ClientConfiguration();
-config.setAuthentication(authPluginClassName, authParams);
-config.setUseTls(useTls);
-config.setTlsAllowInsecureConnection(tlsAllowInsecureConnection);
-config.setTlsTrustCertsFilePath(tlsTrustCertsFilePath);
-
-PulsarAdmin admin = new PulsarAdmin(url, config);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-encryption.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-encryption.md
deleted file mode 100644
index 134ea853b23d0..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-encryption.md
+++ /dev/null
@@ -1,184 +0,0 @@
----
-id: security-encryption
-title: Pulsar Encryption
-sidebar_label: "End-to-End Encryption"
-original_id: security-encryption
----
-
-Pulsar encryption allows applications to encrypt messages at the producer and decrypt at the consumer. Encryption is performed using the public/private key pair configured by the application. Encrypted messages can only be decrypted by consumers with a valid key.
-
-## Asymmetric and symmetric encryption
-
-Pulsar uses dynamically generated symmetric AES key to encrypt messages(data). The AES key(data key) is encrypted using application provided ECDSA/RSA key pair, as a result there is no need to share the secret with everyone.
-
-Key is a public/private key pair used for encryption/decryption. The producer key is the public key, and the consumer key is the private key of the key pair.
-
-The application configures the producer with the public  key. This key is used to encrypt the AES data key. The encrypted data key is sent as part of message header. Only entities with the private key(in this case the consumer) will be able to decrypt the data key which is used to decrypt the message.
-
-A message can be encrypted with more than one key.  Any one of the keys used for encrypting the message is sufficient to decrypt the message
-
-Pulsar does not store the encryption key anywhere in the pulsar service. If you lose/delete the private key, your message is irretrievably lost, and is unrecoverable
-
-## Producer
-![alt text](/assets/pulsar-encryption-producer.jpg "Pulsar Encryption Producer")
-
-## Consumer
-![alt text](/assets/pulsar-encryption-consumer.jpg "Pulsar Encryption Consumer")
-
-## Here are the steps to get started:
-
-1. Create your ECDSA or RSA public/private key pair.
-
-```shell
-
-openssl ecparam -name secp521r1 -genkey -param_enc explicit -out test_ecdsa_privkey.pem
-openssl ec -in test_ecdsa_privkey.pem -pubout -outform pkcs8 -out test_ecdsa_pubkey.pem
-
-```
-
-2. Add the public and private key to the key management and configure your producers to retrieve public keys and consumers clients to retrieve private keys.
-3. Implement CryptoKeyReader::getPublicKey() interface from producer and CryptoKeyReader::getPrivateKey() interface from consumer, which will be invoked by Pulsar client to load the key.
-4. Add encryption key to producer configuration: conf.addEncryptionKey("myapp.key")
-5. Add CryptoKeyReader implementation to producer/consumer config: conf.setCryptoKeyReader(keyReader)
-6. Sample producer application:
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-PulsarClient pulsarClient = PulsarClient.create("http://localhost:8080");
-
-ProducerConfiguration prodConf = new ProducerConfiguration();
-prodConf.setCryptoKeyReader(new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem"));
-prodConf.addEncryptionKey("myappkey");
-
-Producer producer = pulsarClient.createProducer("persistent://my-tenant/my-ns/my-topic", prodConf);
-
-for (int i = 0; i < 10; i++) {
-    producer.send("my-message".getBytes());
-}
-
-pulsarClient.close();
-
-```
-
-7. Sample Consumer Application:
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-
-ConsumerConfiguration consConf = new ConsumerConfiguration();
-consConf.setCryptoKeyReader(new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem"));
-PulsarClient pulsarClient = PulsarClient.create("http://localhost:8080");
-Consumer consumer = pulsarClient.subscribe("persistent://my-tenant/my-ns/my-topic", "my-subscriber-name", consConf);
-Message msg = null;
-
-for (int i = 0; i < 10; i++) {
-    msg = consumer.receive();
-    // do something
-    System.out.println("Received: " + new String(msg.getData()));
-}
-
-// Acknowledge the consumption of all messages at once
-consumer.acknowledgeCumulative(msg);
-pulsarClient.close();
-
-```
-
-## Key rotation
-Pulsar generates new AES data key every 4 hours or after a certain number of messages are published. The asymmetric public key is automatically fetched by producer every 4 hours by calling CryptoKeyReader::getPublicKey() to retrieve the latest version.
-
-## Enabling encryption at the producer application:
-If you produce messages that are consumed across application boundaries, you need to ensure that consumers in other applications have access to one of the private keys that can decrypt the messages.  This can be done in two ways:
-1. The consumer application provides you access to their public key, which you add to your producer keys
-1. You grant access to one of the private keys from the pairs used by producer 
-
-In some cases, the producer may want to encrypt the messages with multiple keys. For this, add all such keys to the config. Consumer will be able to decrypt the message, as long as it has access to at least one of the keys.
-
-E.g: If messages needs to be encrypted using 2 keys myapp.messagekey1 and myapp.messagekey2,
-
-```java
-
-conf.addEncryptionKey("myapp.messagekey1");
-conf.addEncryptionKey("myapp.messagekey2");
-
-```
-
-## Decrypting encrypted messages at the consumer application:
-Consumers require access one of the private keys to decrypt messages produced by the producer. If you would like to receive encrypted messages, create a public/private key and give your public key to the producer application to encrypt messages using your public key.
-
-## Handling Failures:
-* Producer/ Consumer loses access to the key
-  * Producer action will fail indicating the cause of the failure. Application has the option to proceed with sending unencrypted message in such cases. Call conf.setCryptoFailureAction(ProducerCryptoFailureAction) to control the producer behavior. The default behavior is to fail the request.
-  * If consumption failed due to decryption failure or missing keys in consumer, application has the option to consume the encrypted message or discard it. Call conf.setCryptoFailureAction(ConsumerCryptoFailureAction) to control the consumer behavior. The default behavior is to fail the request.
-Application will never be able to decrypt the messages if the private key is permanently lost.
-* Batch messaging
-  * If decryption fails and the message contain batch messages, client will not be able to retrieve individual messages in the batch, hence message consumption fails even if conf.setCryptoFailureAction() is set to CONSUME.
-* If decryption fails, the message consumption stops and application will notice backlog growth in addition to decryption failure messages in the client log. If application does not have access to the private key to decrypt the message, the only option is to skip/discard backlogged messages. 
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-extending.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-extending.md
deleted file mode 100644
index 0c30105616ec9..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-extending.md
+++ /dev/null
@@ -1,217 +0,0 @@
----
-id: security-extending
-title: Extending Authentication and Authorization in Pulsar
-sidebar_label: "Extending"
-original_id: security-extending
----
-
-Pulsar provides a way to use custom authentication and authorization mechanisms
-
-## Authentication
-
-Pulsar support mutual TLS and Athenz authentication plugins, and these can be used as described
-in [Security](security-overview.md).
-
-It is possible to use a custom authentication mechanism by providing the implementation in the
-form of two plugins one for the Client library and the other for the Pulsar Broker to validate
-the credentials.
-
-### Client authentication plugin
-
-For client library, you will need to implement `org.apache.pulsar.client.api.Authentication`. This class can then be passed
-when creating a Pulsar client:
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar://localhost:6650")
-    .authentication(new MyAuthentication())
-    .build();
-
-```
-
-For reference, there are 2 interfaces to implement on the client side:
- * `Authentication` -> http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/Authentication.html
- * `AuthenticationDataProvider` -> http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/AuthenticationDataProvider.html
-
-
-This in turn will need to provide the client credentials in the form of `org.apache.pulsar.client.api.AuthenticationDataProvider`. This will leave
-the chance to return different kinds of authentication token for different
-type of connection or by passing a certificate chain to use for TLS.
-
-
-Examples for client authentication providers can be found at:
-
- * Mutual TLS Auth -- https://github.com/apache/incubator-pulsar/tree/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth
- * Athenz -- https://github.com/apache/incubator-pulsar/tree/master/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth
-
-### Broker authentication plugin
-
-On broker side, we need the corresponding plugin to validate the credentials
-passed by the client. Broker can support multiple authentication providers
-at the same time.
-
-In `conf/broker.conf` it's possible to specify a list of valid providers:
-
-```properties
-
-# Authentication provider name list, which is comma separated list of class names
-authenticationProviders=
-
-```
-
-There is one single interface to implement `org.apache.pulsar.broker.authentication.AuthenticationProvider`:
-
-```java
-
-/**
- * Provider of authentication mechanism
- */
-public interface AuthenticationProvider extends Closeable {
-
-    /**
-     * Perform initialization for the authentication provider
-     *
-     * @param config
-     *            broker config object
-     * @throws IOException
-     *             if the initialization fails
-     */
-    void initialize(ServiceConfiguration config) throws IOException;
-
-    /**
-     * @return the authentication method name supported by this provider
-     */
-    String getAuthMethodName();
-
-    /**
-     * Validate the authentication for the given credentials with the specified authentication data
-     *
-     * @param authData
-     *            provider specific authentication data
-     * @return the "role" string for the authenticated connection, if the authentication was successful
-     * @throws AuthenticationException
-     *             if the credentials are not valid
-     */
-    String authenticate(AuthenticationDataSource authData) throws AuthenticationException;
-
-}
-
-```
-
-Example for Broker authentication plugins:
-
- * Mutual TLS -- https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java
- * Athenz -- https://github.com/apache/incubator-pulsar/blob/master/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java
-
-## Authorization
-
-Authorization is the operation that checks whether a particular "role" or "principal" is
-allowed to perform a certain operation.
-
-By default, Pulsar provides an embedded authorization, though it's possible to
-configure a different one through a plugin.
-
-To provide a custom provider, one needs to implement the
- `org.apache.pulsar.broker.authorization.AuthorizationProvider` interface, have this class in the
- Pulsar broker classpath and configure it in `conf/broker.conf`:
-
- ```properties
- 
- # Authorization provider fully qualified class-name
- authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
- 
- ```
-
-```java
-
-/**
- * Provider of authorization mechanism
- */
-public interface AuthorizationProvider extends Closeable {
-
-    /**
-     * Perform initialization for the authorization provider
-     *
-     * @param config
-     *            broker config object
-     * @param configCache
-     *            pulsar zk configuration cache service
-     * @throws IOException
-     *             if the initialization fails
-     */
-    void initialize(ServiceConfiguration conf, ConfigurationCacheService configCache) throws IOException;
-
-    /**
-     * Check if the specified role has permission to send messages to the specified fully qualified topic name.
-     *
-     * @param topicName
-     *            the fully qualified topic name associated with the topic.
-     * @param role
-     *            the app id used to send messages to the topic.
-     */
-    CompletableFuture canProduceAsync(TopicName topicName, String role,
-            AuthenticationDataSource authenticationData);
-
-    /**
-     * Check if the specified role has permission to receive messages from the specified fully qualified topic name.
-     *
-     * @param topicName
-     *            the fully qualified topic name associated with the topic.
-     * @param role
-     *            the app id used to receive messages from the topic.
-     * @param subscription
-     *            the subscription name defined by the client
-     */
-    CompletableFuture canConsumeAsync(TopicName topicName, String role,
-            AuthenticationDataSource authenticationData, String subscription);
-
-    /**
-     * Check whether the specified role can perform a lookup for the specified topic.
-     *
-     * For that the caller needs to have producer or consumer permission.
-     *
-     * @param topicName
-     * @param role
-     * @return
-     * @throws Exception
-     */
-    CompletableFuture canLookupAsync(TopicName topicName, String role,
-            AuthenticationDataSource authenticationData);
-
-    /**
-     *
-     * Grant authorization-action permission on a namespace to the given client
-     *
-     * @param namespace
-     * @param actions
-     * @param role
-     * @param authDataJson
-     *            additional authdata in json format
-     * @return CompletableFuture
-     * @completesWith 
    
-     *                IllegalArgumentException when namespace not found
    
-     *                IllegalStateException when failed to grant permission
-     */
-    CompletableFuture grantPermissionAsync(NamespaceName namespace, Set actions, String role,
-            String authDataJson);
-
-    /**
-     * Grant authorization-action permission on a topic to the given client
-     *
-     * @param topicName
-     * @param role
-     * @param authDataJson
-     *            additional authdata in json format
-     * @return CompletableFuture
-     * @completesWith 
    
-     *                IllegalArgumentException when namespace not found
    
-     *                IllegalStateException when failed to grant permission
-     */
-    CompletableFuture grantPermissionAsync(TopicName topicName, Set actions, String role,
-            String authDataJson);
-
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-overview.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-overview.md
deleted file mode 100644
index 8ed2d907d7a95..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-overview.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-id: security-overview
-title: Pulsar Security Overview
-sidebar_label: "Overview"
-original_id: security-overview
----
-
-Apache Pulsar is the central message bus for a business. It is frequently used to store mission-critical data, and therefore enabling security features are crucial.
-
-By default, there is no encryption, authentication, or authorization configured. Any client can communicate to Apache Pulsar via plain text service urls.
-It is critical that access via these plain text service urls is restricted to trusted clients only. Network segmentation and/or authorization ACLs can be used
-to restrict access to trusted IPs in such cases. If neither is used, the cluster is wide open and can be accessed by anyone.
-
-Pulsar supports a pluggable authentication mechanism that Pulsar clients can use to authenticate with brokers and proxies. Pulsar
-can also be configured to support multiple authentication sources.
-
-It is strongly recommended to secure the service components in your Apache Pulsar deployment.
-
-## Role Tokens
-
-In Pulsar, a *role* is a string, like `admin` or `app1`, that can represent a single client or multiple clients. Roles are used to control permission for clients
-to produce or consume from certain topics, administer the configuration for tenants, and more.
-
-Apache Pulsar uses an [Authentication Provider](#authentication-providers) to establish the identity of a client and then assign that client a *role token*. This
-role token is then used for [Authorization and ACLs](security-authorization.md) to determine what the client is authorized to do.
-
-## Authentication Providers
-
-Currently Pulsar supports two authentication providers:
-
-- [TLS Authentication](security-tls-authentication.md)
-- [Athenz](security-athenz.md)
-
-## Contents
-
-- [Encryption](security-tls-transport.md) and [Authentication](security-tls-authentication.md) using TLS
-- [Authentication using Athenz](security-athenz.md)
-- [Authorization and ACLs](security-authorization.md)
-- [End-to-End Encryption](security-encryption.md)
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-tls-authentication.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-tls-authentication.md
deleted file mode 100644
index 5d2f8dcf5a419..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-tls-authentication.md
+++ /dev/null
@@ -1,167 +0,0 @@
----
-id: security-tls-authentication
-title: Authentication using TLS
-sidebar_label: "Authentication using TLS"
-original_id: security-tls-authentication
----
-
-## TLS Authentication Overview
-
-TLS authentication is an extension of [TLS transport encryption](security-tls-transport.md), but instead of only servers having keys and certs which the client uses the verify the server's identity, clients also have keys and certs which the server uses to verify the client's identity. You must have TLS transport encryption configured on your cluster before you can use TLS authentication. This guide assumes you already have TLS transport encryption configured.
-
-### Creating client certificates
-
-Client certificates are generated using the same certificate authority as was used to generate the server certificates.
-
-The biggest difference between client certs and server certs is that the **common name** for the client certificate is the **role token** which that client will be authenticated as.
-
-First generate the key.
-
-```bash
-
-$ openssl genrsa -out admin.key.pem 2048
-
-```
-
-Similar to the broker, the client expects the key to be in [PKCS 8](https://en.wikipedia.org/wiki/PKCS_8) format, so convert it.
-
-```bash
-
-$ openssl pkcs8 -topk8 -inform PEM -outform PEM \
-      -in admin.key.pem -out admin.key-pk8.pem -nocrypt
-
-```
-
-Generate the certificate request. When asked for a **common name**, enter the **role token** which you want this key pair to authenticate a client as.
-
-```bash
-
-$ openssl req -config openssl.cnf \
-      -key admin.key.pem -new -sha256 -out admin.csr.pem
-
-```
-
-Sign with request with the certificate authority. Note that that client certs uses the **usr_cert** extension, which allows the cert to be used for client authentication.
-
-```bash
-
-$ openssl ca -config openssl.cnf -extensions usr_cert \
-      -days 1000 -notext -md sha256 \
-      -in admin.csr.pem -out admin.cert.pem
-
-```
-
-This will give you a cert, `admin.cert.pem`, and a key, `admin.key-pk8.pem`, which, with `ca.cert.pem`, can be used by clients to authenticate themselves to brokers and proxies as the role token ``admin``.
-
-## Enabling TLS Authentication ...
-
-### ... on Brokers
-
-To configure brokers to authenticate clients, put the following in `broker.conf`, alongside [the configuration to enable tls transport](security-tls-transport.md#broker-configuration):
-
-```properties
-
-# Configuration to enable authentication
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-# operations and publish/consume from all topics
-superUserRoles=admin
-
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
-brokerClientTlsEnabled=true
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-brokerClientAuthenticationParameters=tlsCertFile:/path/my-ca/admin.cert.pem,tlsKeyFile:/path/my-ca/admin.key-pk8.pem
-brokerClientTrustCertsFilePath=/path/my-ca/certs/ca.cert.pem
-
-```
-
-### ... on Proxies
-
-To configure proxies to authenticate clients, put the following in `proxy.conf`, alongside [the configuration to enable tls transport](security-tls-transport.md#proxy-configuration):
-
-The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the ``proxyRoles`` of the brokers. See the [authorization guide](security-authorization.md) for more details.
-
-```properties
-
-# For clients connecting to the proxy
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-# For the proxy to connect to brokers
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-brokerClientAuthenticationParameters=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
-
-```
-
-## Client configuration
-
-When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use ```https://``` and port 8443 for the web service URL, and ```pulsar+ssl://``` and port 6651 for the broker service URL.
-
-### CLI tools
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-pulsar-admin.md), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:
-
-```properties
-
-webServiceUrl=https://broker.example.com:8443/
-brokerServiceUrl=pulsar+ssl://broker.example.com:6651/
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-authParams=tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem
-
-```
-
-### Java client
-
-```java
-
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar+ssl://broker.example.com:6651/")
-    .enableTls(true)
-    .tlsTrustCertsFilePath("/path/to/ca.cert.pem")
-    .authentication("org.apache.pulsar.client.impl.auth.AuthenticationTls",
-                    "tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem")
-    .build();
-
-```
-
-### Python client
-
-```python
-
-from pulsar import Client, AuthenticationTLS
-
-auth = AuthenticationTLS("/path/to/my-role.cert.pem", "/path/to/my-role.key-pk8.pem")
-client = Client("pulsar+ssl://broker.example.com:6651/",
-                tls_trust_certs_file_path="/path/to/ca.cert.pem",
-                tls_allow_insecure_connection=False,
-				authentication=auth)
-
-```
-
-### C++ client
-
-```c++
-
-#include 
-
-pulsar::ClientConfiguration config;
-config.setUseTls(true);
-config.setTlsTrustCertsFilePath("/path/to/ca.cert.pem");
-config.setTlsAllowInsecureConnection(false);
-
-pulsar::AuthenticationPtr auth = pulsar::AuthTls::create("/path/to/my-role.cert.pem",
-                                                         "/path/to/my-role.key-pk8.pem")
-config.setAuth(auth);
-
-pulsar::Client client("pulsar+ssl://broker.example.com:6651/", config);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/security-tls-transport.md b/site2/website/versioned_docs/version-2.1.0-incubating/security-tls-transport.md
deleted file mode 100644
index e08511981015a..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/security-tls-transport.md
+++ /dev/null
@@ -1,226 +0,0 @@
----
-id: security-tls-transport
-title: Transport Encryption using TLS
-sidebar_label: "Transport Encryption using TLS"
-original_id: security-tls-transport
----
-
-## TLS Overview
-
-By default, Apache Pulsar clients communicate with the Apache Pulsar service in plain text, which means that all data is sent in the clear. TLS can be used to encrypt this traffic so that it cannot be snooped by a man-in-the-middle attacker.
-
-TLS can be configured for both encryption and authentication. You may configure just TLS transport encryption, which is covered in this guide. TLS authentication is covered [elsewhere](security-tls-authentication.md). Alternatively, you can use [another authentication mechanism](security-athenz.md) on top of TLS transport encryption.
-
-> Note that enabling TLS may have a performance impact due to encryption overhead.
-
-## TLS concepts
-
-TLS is a form of [public key cryptography](https://en.wikipedia.org/wiki/Public-key_cryptography). Encryption is performed using key pairs consisting of a public key and a private key. Messages are encrypted with the public key and can be decrypted with the private key.
-
-To use TLS transport encryption, you need two kinds of key pairs, **server key pairs** and a **certificate authority**.
-
-A third kind of key pair, **client key pairs**, are used for [client authentication](security-tls-authentication.md).
-
-The **certificate authority** private key should be stored in a very secure location (a fully encrypted, disconnected, air gapped computer). The certificate authority public key, the **trust cert**, can be freely shared.
-
-For both client and server key pairs, the administrator first generates a private key and a certificate request. Then the certificate authority private key is used to sign the certificate request, generating a certificate. This certificate is the public key for the server/client key pair.
-
-For TLS transport encryption, the clients can use the **trust cert** to verify that the server they are talking to has a key pair that was signed by the certificate authority. A man-in-the-middle attacker would not have access to the certificate authority, so they couldn't create a server with such a key pair.
-
-For TLS authentication, the server uses the **trust cert** to verify that the client has a key pair that was signed by the certificate authority. The Common Name of the **client cert** is then used as the client's role token (see [Overview](security-overview.md)).
-
-## Creating TLS Certificates
-
-Creating TLS certificates for Pulsar involves creating a [certificate authority](#certificate-authority) (CA), [server certificate](#server-certificate), and [client certificate](#client-certificate).
-
-The following guide is an abridged guide to setting up a certificate authority. For a more detailed guide, there are plenty of resource on the internet. We recommend the [this guide](https://jamielinux.com/docs/openssl-certificate-authority/index.html).
-
-### Certificate authority
-
-The first step is to create the certificate for the CA. The CA will be used to sign both the broker and client certificates, in order to ensure that each party will trust the others. The CA should be stored in a very secure location (ideally completely disconnected from networks, air gapped, and fully encrypted).
-
-Create a directory for your CA, and place [this openssl configuration file](https://github.com/apache/incubator-pulsar/tree/master/site2/website/static/examples/openssl.cnf) in the directory. You may want to modify the default answers for company name and department in the configuration file. Export the location of the CA directory to the environment variable, CA_HOME. The configuration file uses this environment variable to find the rest of the files and directories needed for the CA.
-
-```bash
-
-mkdir my-ca
-cd my-ca
-wget https://raw.githubusercontent.com/apache/pulsar-site/main/site2/website/static/examples/openssl.cnf
-export CA_HOME=$(pwd)
-
-```
-
-Create the necessary directories, keys and certs.
-
-```bash
-
-mkdir certs crl newcerts private
-chmod 700 private/
-touch index.txt
-echo 1000 > serial
-openssl genrsa -aes256 -out private/ca.key.pem 4096
-chmod 400 private/ca.key.pem
-openssl req -config openssl.cnf -key private/ca.key.pem \
-    -new -x509 -days 7300 -sha256 -extensions v3_ca \
-    -out certs/ca.cert.pem
-chmod 444 certs/ca.cert.pem
-
-```
-
-After answering the question prompts, this will store CA-related files in the `./my-ca` directory. Within that directory:
-
-* `certs/ca.cert.pem` is the public certificate. It is meant to be distributed to all parties involved.
-* `private/ca.key.pem` is the private key. This is only needed when signing a new certificate for either broker or clients and it must be safely guarded.
-
-### Server certificate
-
-Once a CA certificate has been created, you can create certificate requests and sign them with the CA.
-
-The following commands will ask you a few questions and then create the certificates. When asked for the common name, you should match the hostname of the broker. You could also use a wildcard to match a group of broker hostnames, for example `*.broker.usw.example.com`. This ensures that the same certificate can be reused on multiple machines.
-
-:::tip
-
-Sometimes it is not possible or makes no sense to match the hostname,
-such as when the brokers are created with random hostnames, or you
-plan to connect to the hosts via their IP. In this case, the client
-should be configured to disable TLS hostname verification.
-
-:::
-
-First generate the key.
-
-```bash
-
-openssl genrsa -out broker.key.pem 2048
-
-```
-
-The broker expects the key to be in [PKCS 8](https://en.wikipedia.org/wiki/PKCS_8) format, so convert it.
-
-```bash
-
-openssl pkcs8 -topk8 -inform PEM -outform PEM \
-    -in broker.key.pem -out broker.key-pk8.pem -nocrypt
-
-```
-
-Generate the certificate request...
-
-```bash
-
-openssl req -config openssl.cnf \
-    -key broker.key.pem -new -sha256 -out broker.csr.pem
-
-```
-
-... and sign it with the certificate authority.
-
-```bash
-
-openssl ca -config openssl.cnf -extensions server_cert \
-    -days 1000 -notext -md sha256 \
-    -in broker.csr.pem -out broker.cert.pem
-
-```
-
-At this point, you have a cert, `broker.cert.pem`, and a key, `broker.key-pk8.pem`, which can be used along with `ca.cert.pem` to configure TLS transport encryption for your broker and proxy nodes.
-
-## Broker Configuration
-
-To configure a Pulsar [broker](reference-terminology.md#broker) to use TLS transport encryption, you'll need to make some changes to `broker.conf`, which is located in the `conf` directory of your [Pulsar installation](getting-started-standalone.md).
-
-Add these values to the configuration file (substituting the appropriate certificate paths where necessary):
-
-```properties
-
-tlsEnabled=true
-tlsCertificateFilePath=/path/to/broker.cert.pem
-tlsKeyFilePath=/path/to/broker.key-pk8.pem
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-
-```
-
-> A full list of parameters available in the `conf/broker.conf` file,
-> as well as the default values for those parameters, can be found in [Broker Configuration](reference-configuration.md#broker) 
-
-## Proxy Configuration
-
-Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.
-
-```properties
-
-# For clients connecting to the proxy
-tlsEnabledInProxy=true
-tlsCertificateFilePath=/path/to/broker.cert.pem
-tlsKeyFilePath=/path/to/broker.key-pk8.pem
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-
-# For the proxy to connect to brokers
-tlsEnabledWithBroker=true
-brokerClientTrustCertsFilePath=/path/to/ca.cert.pem
-
-```
-
-## Client configuration
-
-When TLS transport encryption is enabled, you need to configure the client to use ```https://``` and port 8443 for the web service URL, and ```pulsar+ssl://``` and port 6651 for the broker service URL.
-
-As the server certificate you generated above doesn't belong to any of the default trust chains, you also need to either specify the path the **trust cert** (recommended), or tell the client to allow untrusted server certs.
-
-### CLI tools
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-cli-tools#pulsar-admin), [`pulsar-perf`](reference-cli-tools#pulsar-perf), and [`pulsar-client`](reference-cli-tools#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:
-
-```properties
-
-webServiceUrl=https://broker.example.com:8443/
-brokerServiceUrl=pulsar+ssl://broker.example.com:6651/
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-
-```
-
-### Java client
-
-```java
-
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar+ssl://broker.example.com:6651/")
-    .enableTls(true)
-    .tlsTrustCertsFilePath("/path/to/ca.cert.pem")
-    .build();
-
-```
-
-### Python client
-
-```python
-
-from pulsar import Client
-
-client = Client("pulsar+ssl://broker.example.com:6651/",
-                tls_trust_certs_file_path="/path/to/ca.cert.pem",
-                tls_allow_insecure_connection=False)
-
-```
-
-### C++ client
-
-```c++
-
-#include 
-
-pulsar::ClientConfiguration config;
-config.setUseTls(true);
-config.setTlsTrustCertsFilePath("/path/to/ca.cert.pem");
-config.setTlsAllowInsecureConnection(false);
-
-pulsar::Client client("pulsar+ssl://broker.example.com:6651/", config);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/standalone.md b/site2/website/versioned_docs/version-2.1.0-incubating/standalone.md
deleted file mode 100644
index 73e351cf79a75..0000000000000
--- a/site2/website/versioned_docs/version-2.1.0-incubating/standalone.md
+++ /dev/null
@@ -1,205 +0,0 @@
----
-id: standalone
-title: Setting up a local standalone cluster
-sidebar_label: "Run Pulsar locally"
-original_id: standalone
----
-
-For the purposes of local development and testing, you can run Pulsar in standalone mode on your own machine. Standalone mode includes a Pulsar broker as well as the necessary ZooKeeper and BookKeeper components running inside of a single Java Virtual Machine (JVM) process.
-
-> #### Pulsar in production? 
-> If you're looking to run a full production Pulsar installation, see the [Deploying a Pulsar instance](deploy-bare-metal.md) guide.
-
-
-## Run Pulsar Standalone Manually
-
-### System requirements
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-
-### Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:binary_release_url
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-### What your package contains
-
-The Pulsar binary package initially contains the following directories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's command-line tools, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar
-`licenses` | License files, in `.txt` form, for various components of the Pulsar [codebase](https://github.com/apache/pulsar)
-
-These directories will be created once you begin running Pulsar:
-
-Directory | Contains
-:---------|:--------
-`data` | The data storage directory used by ZooKeeper and BookKeeper
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
-`logs` | Logs created by the installation
-
-
-### Installing Builtin Connectors
-
-Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-If you would like to enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz /path/to/apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ cd apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-> #### NOTES
->
-> If you are running Pulsar in a bare metal cluster, you need to make sure `connectors` tarball is unzipped in every broker's pulsar directory
-> (or in every function-worker's pulsar directory if you are running a separate worker cluster for Pulsar functions).
-> 
-> If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DC/OS](https://dcos.io/)),
-> you can use `apachepulsar/pulsar-all` image instead of `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
-
-### Starting the cluster
-
-Once you have an up-to-date local copy of the release, you can start up a local cluster using the [`pulsar`](reference-cli-tools.md#pulsar) command, which is stored in the `bin` directory, and specifying that you want to start up Pulsar in standalone mode:
-
-```bash
-
-$ bin/pulsar standalone
-
-```
-
-If Pulsar has been successfully started, you should see `INFO`-level log messages like this:
-
-```bash
-
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@95] - Configuration Store cache started
-2017-06-01 14:46:29,192 - INFO  - [main:AuthenticationService@61] - Authentication is disabled
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@108] - Pulsar WebSocket Service started
-
-```
-
-> #### Automatically created namespace
-> When you start a local standalone cluster, Pulsar will automatically create a `public/default` [namespace](concepts-messaging.md#namespaces) that you can use for development purposes. All Pulsar topics are managed within namespaces. For more info, see [Topics](concepts-messaging.md#topics).
-
-## Testing your cluster setup
-
-Pulsar provides a CLI tool called [`pulsar-client`](reference-cli-tools.md#pulsar-client) that enables you to do things like send messages to a Pulsar topic in a running cluster. This command will send a simple message saying `hello-pulsar` to the `my-topic` topic:
-
-```bash
-
-$ bin/pulsar-client produce my-topic --messages "hello-pulsar"
-
-```
-
-If the message has been successfully published to the topic, you should see a confirmation like this in the `pulsar-client` logs:
-
-```
-
-13:09:39.356 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 1 messages successfully produced
-
-```
-
-> #### No need to explicitly create new topics
-> You may have noticed that we did not explicitly create the `my-topic` topic to which we sent the `hello-pulsar` message. If you attempt to write a message to a topic that does not yet exist, Pulsar will automatically create that topic for you.
-
-## Using Pulsar clients locally
-
-Pulsar currently offers client libraries for [Java](client-libraries-java.md), [Python](client-libraries-python.md), and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can use one of these root URLs for interacting with your cluster:
-
-* `http://localhost:8080`
-* `pulsar://localhost:6650`
-
-Here's an example producer for a Pulsar topic using the [Java](client-libraries-java.md) client:
-
-```java
-
-String localClusterUrl = "pulsar://localhost:6650";
-
-PulsarClient client = PulsarClient.builder().serviceUrl(localClusterUrl).build();
-Producer producer = client.newProducer().topic("my-topic").create();
-
-```
-
-Here's an example [Python](client-libraries-python.md) producer:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-producer = client.create_producer('my-topic')
-
-```
-
-Finally, here's an example [C++](client-libraries-cpp.md) producer:
-
-```cpp
-
-Client client("pulsar://localhost:6650");
-Producer producer;
-Result result = client.createProducer("my-topic", producer);
-if (result != ResultOk) {
-    LOG_ERROR("Error creating producer: " << result);
-    return -1;
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/about.md b/site2/website/versioned_docs/version-2.1.1-incubating/about.md
deleted file mode 100644
index 6455a7d43ebb0..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/about.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-slug: /
-id: about
-title: Welcome to the doc portal!
-sidebar_label: "About"
----
-
-import BlockLinks from "@site/src/components/BlockLinks";
-import BlockLink from "@site/src/components/BlockLink";
-import { docUrl } from "@site/src/utils/index";
-
-
-# Welcome to the doc portal!
-***
-
-This portal holds a variety of support documents to help you work with Pulsar . If you’re a beginner, there are tutorials and explainers to help you understand Pulsar and how it works.
-
-If you’re an experienced coder, review this page to learn the easiest way to access the specific content you’re looking for.
-
-## Get Started Now
-
-    
-    
-    
-    
-    
-    
-
-
-## Navigation
-***
-
-There are several ways to get around in the doc portal. The index navigation pane is a table of contents for the entire archive. The archive is divided into sections, like chapters in a book. Click the title of the topic to view it.
-
-In-context links provide an easy way to immediately reference related topics. Click the underlined term to view the topic.
-
-Links to related topics can be found at the bottom of each topic page. Click the link to view the topic.
-
-![Page Linking](/assets/page-linking.png)
-
-## Continuous Improvement
-***
-As you probably know, we are working on a new user experience for our documentation portal that will make learning about and building on top of Apache Pulsar a much better experience. Whether you need overview concepts, how-to procedures, curated guides or quick references, we’re building content to support it. This welcome page is just the first step. We will be providing updates every month.
-
-## Help Improve These Documents
-***
-
-You’ll notice an Edit button at the bottom and top of each page. Click it to open a landing page with instructions for requesting changes to posted documents. These are your resources. Participation is not only welcomed – it’s essential!
-
-## Join the Community!
-***
-
-The Pulsar community on github is active, passionate, and knowledgeable.  Join discussions, voice opinions, suggest features, and dive into the code itself. Find your Pulsar family here at [apache/pulsar](https://github.com/apache/pulsar).
-
-An equally passionate community can be found in the [Pulsar Slack channel](https://apache-pulsar.slack.com/). You’ll need an invitation to join, but many Github Pulsar community members are Slack members too.  Join, hang out, learn, and make some new friends.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-kafka.md b/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-kafka.md
deleted file mode 100644
index b4549b47ae181..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-kafka.md
+++ /dev/null
@@ -1,269 +0,0 @@
----
-id: adaptors-kafka
-title: Pulsar adaptor for Apache Kafka
-sidebar_label: "Kafka client wrapper"
-original_id: adaptors-kafka
----
-
-
-Pulsar provides an easy option for applications that are currently written using the [Apache Kafka](http://kafka.apache.org) Java client API.
-
-## Using the Pulsar Kafka compatibility wrapper
-
-In an existing application, change the regular Kafka client dependency and replace it with the Pulsar Kafka wrapper. Remove:
-
-```xml
-
-
-  org.apache.kafka
-  kakfa-clients
-  0.10.2.1
-
-
-```
-
-Then include this dependency for the Pulsar Kafka wrapper:
-
-```xml
-
-
-  org.apache.pulsar
-  pulsar-client-kafka
-  @pulsar:version@
-
-
-```
-
-With the new dependency, the existing code should work without any changes. The only
-thing that needs to be adjusted is the configuration, to make sure to point the
-producers and consumers to Pulsar service rather than Kafka and to use a particular
-Pulsar topic.
-
-## Using the Pulsar Kafka compatibility wrapper together with existing kafka client.
-
-When migrating from Kafka to Pulsar, the application might have to use the original kafka client
-and the pulsar kafka wrapper together during migration. Then you should consider using the
-unshaded pulsar kafka client wrapper.
-
-```xml
-
-
-  org.apache.pulsar
-  pulsar-client-kafka-original
-  @pulsar:version@
-
-
-```
-
-When using this dependency, you need to construct producer using `org.apache.kafka.clients.producer.PulsarKafkaProducer`
-instead of `org.apache.kafka.clients.producer.KafkaProducer` and `org.apache.kafka.clients.producer.PulsarKafkaConsumer` for consumers.
-
-## Producer example
-
-```java
-
-// Topic needs to be a regular Pulsar topic
-String topic = "persistent://public/default/my-topic";
-
-Properties props = new Properties();
-// Point to a Pulsar service
-props.put("bootstrap.servers", "pulsar://localhost:6650");
-
-props.put("key.serializer", IntegerSerializer.class.getName());
-props.put("value.serializer", StringSerializer.class.getName());
-
-Producer producer = new KafkaProducer(props);
-
-for (int i = 0; i < 10; i++) {
-    producer.send(new ProducerRecord(topic, i, "hello-" + i));
-    log.info("Message {} sent successfully", i);
-}
-
-producer.close();
-
-```
-
-## Consumer example
-
-```java
-
-String topic = "persistent://public/default/my-topic";
-
-Properties props = new Properties();
-// Point to a Pulsar service
-props.put("bootstrap.servers", "pulsar://localhost:6650");
-props.put("group.id", "my-subscription-name");
-props.put("enable.auto.commit", "false");
-props.put("key.deserializer", IntegerDeserializer.class.getName());
-props.put("value.deserializer", StringDeserializer.class.getName());
-
-Consumer consumer = new KafkaConsumer(props);
-consumer.subscribe(Arrays.asList(topic));
-
-while (true) {
-    ConsumerRecords records = consumer.poll(100);
-    records.forEach(record -> {
-        log.info("Received record: {}", record);
-    });
-
-    // Commit last offset
-    consumer.commitSync();
-}
-
-```
-
-## Complete Examples
-
-You can find the complete producer and consumer examples [here](https://github.com/apache/incubator-pulsar/tree/master/pulsar-client-kafka-compat/pulsar-client-kafka-tests/src/test/java/org/apache/pulsar/client/kafka/compat/examples).
-
-## Compatibility matrix
-
-Currently the Pulsar Kafka wrapper supports most of the operations offered by the Kafka API.
-
-#### Producer
-
-APIs:
-
-| Producer Method                                                               | Supported | Notes                                                                    |
-|:------------------------------------------------------------------------------|:----------|:-------------------------------------------------------------------------|
-| `Future send(ProducerRecord record)`                    | Yes       | Currently no support for explicitly set the partition id when publishing |
-| `Future send(ProducerRecord record, Callback callback)` | Yes       |                                                                          |
-| `void flush()`                                                                | Yes       |                                                                          |
-| `List partitionsFor(String topic)`                             | No        |                                                                          |
-| `Map metrics()`                                 | No        |                                                                          |
-| `void close()`                                                                | Yes       |                                                                          |
-| `void close(long timeout, TimeUnit unit)`                                     | Yes       |                                                                          |
-
-Properties:
-
-| Config property                         | Supported | Notes                                                                         |
-|:----------------------------------------|:----------|:------------------------------------------------------------------------------|
-| `acks`                                  | Ignored   | Durability and quorum writes are configured at the namespace level            |
-| `batch.size`                            | Ignored   |                                                                               |
-| `block.on.buffer.full`                  | Yes       | If true it will block producer, otherwise give error                          |
-| `bootstrap.servers`                     | Yes       | Needs to point to a single Pulsar service URL                                 |
-| `buffer.memory`                         | Ignored   |                                                                               |
-| `client.id`                             | Ignored   |                                                                               |
-| `compression.type`                      | Yes       | Allows `gzip` and `lz4`. No `snappy`.                                         |
-| `connections.max.idle.ms`               | Ignored   |                                                                               |
-| `interceptor.classes`                   | Ignored   |                                                                               |
-| `key.serializer`                        | Yes       |                                                                               |
-| `linger.ms`                             | Yes       | Controls the group commit time when batching messages                         |
-| `max.block.ms`                          | Ignored   |                                                                               |
-| `max.in.flight.requests.per.connection` | Ignored   | In Pulsar ordering is maintained even with multiple requests in flight        |
-| `max.request.size`                      | Ignored   |                                                                               |
-| `metric.reporters`                      | Ignored   |                                                                               |
-| `metrics.num.samples`                   | Ignored   |                                                                               |
-| `metrics.sample.window.ms`              | Ignored   |                                                                               |
-| `partitioner.class`                     | Ignored   |                                                                               |
-| `receive.buffer.bytes`                  | Ignored   |                                                                               |
-| `reconnect.backoff.ms`                  | Ignored   |                                                                               |
-| `request.timeout.ms`                    | Ignored   |                                                                               |
-| `retries`                               | Ignored   | Pulsar client retries with exponential backoff until the send timeout expires |
-| `send.buffer.bytes`                     | Ignored   |                                                                               |
-| `timeout.ms`                            | Ignored   |                                                                               |
-| `value.serializer`                      | Yes       |                                                                               |
-
-
-#### Consumer
-
-APIs:
-
-| Consumer Method                                                                                         | Supported | Notes |
-|:--------------------------------------------------------------------------------------------------------|:----------|:------|
-| `Set assignment()`                                                                      | No        |       |
-| `Set subscription()`                                                                            | Yes       |       |
-| `void subscribe(Collection topics)`                                                             | Yes       |       |
-| `void subscribe(Collection topics, ConsumerRebalanceListener callback)`                         | No        |       |
-| `void assign(Collection partitions)`                                                    | No        |       |
-| `void subscribe(Pattern pattern, ConsumerRebalanceListener callback)`                                   | No        |       |
-| `void unsubscribe()`                                                                                    | Yes       |       |
-| `ConsumerRecords poll(long timeoutMillis)`                                                        | Yes       |       |
-| `void commitSync()`                                                                                     | Yes       |       |
-| `void commitSync(Map offsets)`                                       | Yes       |       |
-| `void commitAsync()`                                                                                    | Yes       |       |
-| `void commitAsync(OffsetCommitCallback callback)`                                                       | Yes       |       |
-| `void commitAsync(Map offsets, OffsetCommitCallback callback)`       | Yes       |       |
-| `void seek(TopicPartition partition, long offset)`                                                      | Yes       |       |
-| `void seekToBeginning(Collection partitions)`                                           | Yes       |       |
-| `void seekToEnd(Collection partitions)`                                                 | Yes       |       |
-| `long position(TopicPartition partition)`                                                               | Yes       |       |
-| `OffsetAndMetadata committed(TopicPartition partition)`                                                 | Yes       |       |
-| `Map metrics()`                                                           | No        |       |
-| `List partitionsFor(String topic)`                                                       | No        |       |
-| `Map> listTopics()`                                                         | No        |       |
-| `Set paused()`                                                                          | No        |       |
-| `void pause(Collection partitions)`                                                     | No        |       |
-| `void resume(Collection partitions)`                                                    | No        |       |
-| `Map offsetsForTimes(Map timestampsToSearch)` | No        |       |
-| `Map beginningOffsets(Collection partitions)`                     | No        |       |
-| `Map endOffsets(Collection partitions)`                           | No        |       |
-| `void close()`                                                                                          | Yes       |       |
-| `void close(long timeout, TimeUnit unit)`                                                               | Yes       |       |
-| `void wakeup()`                                                                                         | No        |       |
-
-Properties:
-
-| Config property                 | Supported | Notes                                                 |
-|:--------------------------------|:----------|:------------------------------------------------------|
-| `group.id`                      | Yes       | Maps to a Pulsar subscription name                    |
-| `max.poll.records`              | Ignored   |                                                       |
-| `max.poll.interval.ms`          | Ignored   | Messages are "pushed" from broker                     |
-| `session.timeout.ms`            | Ignored   |                                                       |
-| `heartbeat.interval.ms`         | Ignored   |                                                       |
-| `bootstrap.servers`             | Yes       | Needs to point to a single Pulsar service URL         |
-| `enable.auto.commit`            | Yes       |                                                       |
-| `auto.commit.interval.ms`       | Ignored   | With auto-commit, acks are sent immediately to broker |
-| `partition.assignment.strategy` | Ignored   |                                                       |
-| `auto.offset.reset`             | Ignored   |                                                       |
-| `fetch.min.bytes`               | Ignored   |                                                       |
-| `fetch.max.bytes`               | Ignored   |                                                       |
-| `fetch.max.wait.ms`             | Ignored   |                                                       |
-| `metadata.max.age.ms`           | Ignored   |                                                       |
-| `max.partition.fetch.bytes`     | Ignored   |                                                       |
-| `send.buffer.bytes`             | Ignored   |                                                       |
-| `receive.buffer.bytes`          | Ignored   |                                                       |
-| `client.id`                     | Ignored   |                                                       |
-
-
-## Custom Pulsar configurations
-
-You can configure Pulsar authentication provider directly from the Kafka properties.
-
-### Pulsar client properties:
-
-| Config property                        | Default | Notes                                                                                  |
-|:---------------------------------------|:--------|:---------------------------------------------------------------------------------------|
-| [`pulsar.authentication.class`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setAuthentication-org.apache.pulsar.client.api.Authentication-)          |         | Configure to auth provider. Eg. `org.apache.pulsar.client.impl.auth.AuthenticationTls` |
-| [`pulsar.use.tls`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setUseTls-boolean-)                       | `false` | Enable TLS transport encryption                                                        |
-| [`pulsar.tls.trust.certs.file.path`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setTlsTrustCertsFilePath-java.lang.String-)   |         | Path for the TLS trust certificate store                                               |
-| [`pulsar.tls.allow.insecure.connection`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setTlsAllowInsecureConnection-boolean-) | `false` | Accept self-signed certificates from brokers                                           |
-| [`pulsar.operation.timeout.ms`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setOperationTimeout-int-java.util.concurrent.TimeUnit-) | `30000` | General operations timeout |
-| [`pulsar.stats.interval.seconds`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setStatsInterval-long-java.util.concurrent.TimeUnit-) | `60` | Pulsar client lib stats printing interval |
-| [`pulsar.num.io.threads`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setIoThreads-int-) | `1` | Number of Netty IO threads to use |
-| [`pulsar.connections.per.broker`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setConnectionsPerBroker-int-) | `1` | Max number of connection to open to each broker |
-| [`pulsar.use.tcp.nodelay`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setUseTcpNoDelay-boolean-) | `true` | TCP no-delay |
-| [`pulsar.concurrent.lookup.requests`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setConcurrentLookupRequest-int-) | `50000` | Max number of concurrent topic lookups |
-| [`pulsar.max.number.rejected.request.per.connection`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ClientConfiguration.html#setMaxNumberOfRejectedRequestPerConnection-int-) | `50` | Threshold of errors to forcefully close a connection |
-
-
-### Pulsar producer properties
-
-| Config property                        | Default | Notes                                                                                  |
-|:---------------------------------------|:--------|:---------------------------------------------------------------------------------------|
-| [`pulsar.producer.name`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setProducerName-java.lang.String-) | | Specify producer name |
-| [`pulsar.producer.initial.sequence.id`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setInitialSequenceId-long-) |  | Specify baseline for sequence id for this producer |
-| [`pulsar.producer.max.pending.messages`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessages-int-) | `1000` | Set the max size of the queue holding the messages pending to receive an acknowledgment from the broker.  |
-| [`pulsar.producer.max.pending.messages.across.partitions`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessagesAcrossPartitions-int-) | `50000` | Set the number of max pending messages across all the partitions  |
-| [`pulsar.producer.batching.enabled`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingEnabled-boolean-) | `true` | Control whether automatic batching of messages is enabled for the producer |
-| [`pulsar.producer.batching.max.messages`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingMaxMessages-int-) | `1000` | The maximum number of messages permitted in a batch |
-
-
-### Pulsar consumer Properties
-
-| Config property                        | Default | Notes                                                                                  |
-|:---------------------------------------|:--------|:---------------------------------------------------------------------------------------|
-| [`pulsar.consumer.name`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setConsumerName-java.lang.String-) | | Set the consumer name |
-| [`pulsar.consumer.receiver.queue.size`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setReceiverQueueSize-int-) | 1000 | Sets the size of the consumer receive queue |
-| [`pulsar.consumer.total.receiver.queue.size.across.partitions`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setMaxTotalReceiverQueueSizeAcrossPartitions-int-) | 50000 | Set the max total receiver queue size across partitions |
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-spark.md b/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-spark.md
deleted file mode 100644
index afa5a7ef827c8..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-spark.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-id: adaptors-spark
-title: Pulsar adaptor for Apache Spark
-sidebar_label: "Apache Spark"
----
-
-## Spark Streaming receiver
-The Spark Streaming receiver for Pulsar is a custom receiver that enables Apache [Spark Streaming](https://spark.apache.org/streaming/) to receive raw data from Pulsar.
-
-An application can receive data in [Resilient Distributed Dataset](https://spark.apache.org/docs/latest/programming-guide.html#resilient-distributed-datasets-rdds) (RDD) format via the Spark Streaming receiver and can process it in a variety of ways.
-
-### Prerequisites
-
-To use the receiver, include a dependency for the `pulsar-spark` library in your Java configuration.
-
-#### Maven
-
-If you're using Maven, add this to your `pom.xml`:
-
-```xml
-
-
-@pulsar:version@
-
-
-
-  org.apache.pulsar
-  pulsar-spark
-  ${pulsar.version}
-
-
-```
-
-#### Gradle
-
-If you're using Gradle, add this to your `build.gradle` file:
-
-```groovy
-
-def pulsarVersion = "@pulsar:version@"
-
-dependencies {
-    compile group: 'org.apache.pulsar', name: 'pulsar-spark', version: pulsarVersion
-}
-
-```
-
-### Usage
-
-Pass an instance of `SparkStreamingPulsarReceiver` to the `receiverStream` method in `JavaStreamingContext`:
-
-```java
-
-    String serviceUrl = "pulsar://localhost:6650/";
-    String topic = "persistent://public/default/test_src";
-    String subs = "test_sub";
-
-    SparkConf sparkConf = new SparkConf().setMaster("local[*]").setAppName("Pulsar Spark Example");
-
-    JavaStreamingContext jsc = new JavaStreamingContext(sparkConf, Durations.seconds(60));
-
-    ConsumerConfigurationData pulsarConf = new ConsumerConfigurationData();
-
-    Set set = new HashSet();
-    set.add(topic);
-    pulsarConf.setTopicNames(set);
-    pulsarConf.setSubscriptionName(subs);
-
-    SparkStreamingPulsarReceiver pulsarReceiver = new SparkStreamingPulsarReceiver(
-        serviceUrl,
-        pulsarConf,
-        new AuthenticationDisabled());
-
-    JavaReceiverInputDStream lineDStream = jsc.receiverStream(pulsarReceiver);
-
-```
-
-For a complete example, click [here](https://github.com/apache/pulsar-adapters/blob/master/examples/spark/src/main/java/org/apache/spark/streaming/receiver/example/SparkStreamingPulsarReceiverExample.java). In this example, the number of messages that contain the string "Pulsar" in received messages is counted.
-
-Note that if needed, other Pulsar authentication classes can be used. For example, in order to use a token during authentication the following parameters for the `SparkStreamingPulsarReceiver` constructor can be set:
-
-```java
-
-SparkStreamingPulsarReceiver pulsarReceiver = new SparkStreamingPulsarReceiver(
-        serviceUrl,
-        pulsarConf,
-        new AuthenticationToken("token:"));
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-storm.md b/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-storm.md
deleted file mode 100644
index 9df907680ddef..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/adaptors-storm.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-id: adaptors-storm
-title: Pulsar adaptor for Apache Storm
-sidebar_label: "Apache Storm"
----
-
-Pulsar Storm is an adaptor for integrating with [Apache Storm](http://storm.apache.org/) topologies. It provides core Storm implementations for sending and receiving data.
-
-An application can inject data into a Storm topology via a generic Pulsar spout, as well as consume data from a Storm topology via a generic Pulsar bolt.
-
-## Using the Pulsar Storm Adaptor
-
-Include dependency for Pulsar Storm Adaptor:
-
-```xml
-
-
-  org.apache.pulsar
-  pulsar-storm
-  ${pulsar.version}
-
-
-```
-
-## Pulsar Spout
-
-The Pulsar Spout allows for the data published on a topic to be consumed by a Storm topology. It emits a Storm tuple based on the message received and the `MessageToValuesMapper` provided by the client.
-
-The tuples that fail to be processed by the downstream bolts will be re-injected by the spout with an exponential backoff, within a configurable timeout (the default is 60 seconds) or a configurable number of retries, whichever comes first, after which it is acknowledged by the consumer. Here's an example construction of a spout:
-
-```java
-
-MessageToValuesMapper messageToValuesMapper = new MessageToValuesMapper() {
-
-    @Override
-    public Values toValues(Message msg) {
-        return new Values(new String(msg.getData()));
-    }
-
-    @Override
-    public void declareOutputFields(OutputFieldsDeclarer declarer) {
-        // declare the output fields
-        declarer.declare(new Fields("string"));
-    }
-};
-
-// Configure a Pulsar Spout
-PulsarSpoutConfiguration spoutConf = new PulsarSpoutConfiguration();
-spoutConf.setServiceUrl("pulsar://broker.messaging.usw.example.com:6650");
-spoutConf.setTopic("persistent://my-property/usw/my-ns/my-topic1");
-spoutConf.setSubscriptionName("my-subscriber-name1");
-spoutConf.setMessageToValuesMapper(messageToValuesMapper);
-
-// Create a Pulsar Spout
-PulsarSpout spout = new PulsarSpout(spoutConf);
-
-```
-
-For a complete example, click [here](https://github.com/apache/pulsar-adapters/blob/master/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java).
-
-## Pulsar Bolt
-
-The Pulsar bolt allows data in a Storm topology to be published on a topic. It publishes messages based on the Storm tuple received and the `TupleToMessageMapper` provided by the client.
-
-A partitioned topic can also be used to publish messages on different topics. In the implementation of the `TupleToMessageMapper`, a "key" will need to be provided in the message which will send the messages with the same key to the same topic. Here's an example bolt:
-
-```java
-
-TupleToMessageMapper tupleToMessageMapper = new TupleToMessageMapper() {
-
-    @Override
-    public TypedMessageBuilder toMessage(TypedMessageBuilder msgBuilder, Tuple tuple) {
-        String receivedMessage = tuple.getString(0);
-        // message processing
-        String processedMsg = receivedMessage + "-processed";
-        return msgBuilder.value(processedMsg.getBytes());
-    }
-
-    @Override
-    public void declareOutputFields(OutputFieldsDeclarer declarer) {
-        // declare the output fields
-    }
-};
-
-// Configure a Pulsar Bolt
-PulsarBoltConfiguration boltConf = new PulsarBoltConfiguration();
-boltConf.setServiceUrl("pulsar://broker.messaging.usw.example.com:6650");
-boltConf.setTopic("persistent://my-property/usw/my-ns/my-topic2");
-boltConf.setTupleToMessageMapper(tupleToMessageMapper);
-
-// Create a Pulsar Bolt
-PulsarBolt bolt = new PulsarBolt(boltConf);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-brokers.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-brokers.md
deleted file mode 100644
index 5a540145b0c66..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-brokers.md
+++ /dev/null
@@ -1,285 +0,0 @@
----
-id: admin-api-brokers
-title: Managing Brokers
-sidebar_label: "Brokers"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-> **Important**
->
-> This page only shows **some frequently used operations**.
->
-> - For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more information, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/).
-> 
-> - For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
-> 
-> - For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](https://pulsar.apache.org/api/admin/).
-
-Pulsar brokers consist of two components:
-
-1. An HTTP server exposing a {@inject: rest:REST:/} interface administration and [topic](reference-terminology.md#topic) lookup.
-2. A dispatcher that handles all Pulsar [message](reference-terminology.md#message) transfers.
-
-[Brokers](reference-terminology.md#broker) can be managed via:
-
-* The `brokers` command of the [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/) tool
-* The `/admin/v2/brokers` endpoint of the admin {@inject: rest:REST:/} API
-* The `brokers` method of the `PulsarAdmin` object in the [Java API](client-libraries-java.md)
-
-In addition to being configurable when you start them up, brokers can also be [dynamically configured](#dynamic-broker-configuration).
-
-> See the [Configuration](reference-configuration.md#broker) page for a full listing of broker-specific configuration parameters.
-
-## Brokers resources
-
-### List active brokers
-
-Fetch all available active brokers that are serving traffic.
-
-````mdx-code-block
-
-
-
-```shell
-
-$ pulsar-admin brokers list use
-
-```
-
-```
-
-broker1.use.org.com:8080
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/brokers/:cluster|operation/getActiveBrokers?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.brokers().getActiveBrokers(clusterName)
-
-```
-
-
-
-
-````
-
-### Get the information of the leader broker
-
-Fetch the information of the leader broker, for example, the service url.
-
-````mdx-code-block
-
-
-
-```shell
-
-$ pulsar-admin brokers leader-broker
-
-```
-
-```
-
-BrokerInfo(serviceUrl=broker1.use.org.com:8080)
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.brokers().getLeaderBroker()
-
-```
-
-For the detail of the code above, see [here](https://github.com/apache/pulsar/blob/master/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokersImpl.java#L80)
-
-
-
-
-````
-
-#### list of namespaces owned by a given broker
-
-It finds all namespaces which are owned and served by a given broker.
-
-````mdx-code-block
-
-
-
-```shell
-
-$ pulsar-admin brokers namespaces use \
-  --url broker1.use.org.com:8080
-
-```
-
-```json
-
-{
-  "my-property/use/my-ns/0x00000000_0xffffffff": {
-    "broker_assignment": "shared",
-    "is_controlled": false,
-    "is_active": true
-  }
-}
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/brokers/:cluster/:broker/ownedNamespaces|operation/getOwnedNamespaes?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.brokers().getOwnedNamespaces(cluster,brokerUrl);
-
-```
-
-
-
-
-````
-
-### Dynamic broker configuration
-
-One way to configure a Pulsar [broker](reference-terminology.md#broker) is to supply a [configuration](reference-configuration.md#broker) when the broker is [started up](reference-cli-tools.md#pulsar-broker).
-
-But since all broker configuration in Pulsar is stored in ZooKeeper, configuration values can also be dynamically updated *while the broker is running*. When you update broker configuration dynamically, ZooKeeper will notify the broker of the change and the broker will then override any existing configuration values.
-
-* The `brokers` command for the [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/) tool has a variety of subcommands that enable you to manipulate a broker's configuration dynamically, enabling you to [update config values](#update-dynamic-configuration) and more.
-* In the Pulsar admin {@inject: rest:REST:/} API, dynamic configuration is managed through the `/admin/v2/brokers/configuration` endpoint.
-
-### Update dynamic configuration
-
-````mdx-code-block
-
-
-
-The [`update-dynamic-config`](https://pulsar.apache.org/tools/pulsar-admin/) subcommand will update existing configuration. It takes two arguments: the name of the parameter and the new value using the `config` and `value` flag respectively. Here's an example for the [`brokerShutdownTimeoutMs`](reference-configuration.md#broker-brokerShutdownTimeoutMs) parameter:
-
-```shell
-
-$ pulsar-admin brokers update-dynamic-config --config brokerShutdownTimeoutMs --value 100
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/brokers/configuration/:configName/:configValue|operation/updateDynamicConfiguration?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.brokers().updateDynamicConfiguration(configName, configValue);
-
-```
-
-
-
-
-````
-
-### List updated values
-
-Fetch a list of all potentially updatable configuration parameters.
-````mdx-code-block
-
-
-
-```shell
-
-$ pulsar-admin brokers list-dynamic-config
-brokerShutdownTimeoutMs
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/brokers/configuration|operation/getDynamicConfigurationName?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.brokers().getDynamicConfigurationNames();
-
-```
-
-
-
-
-````
-
-### List all
-
-Fetch a list of all parameters that have been dynamically updated.
-
-````mdx-code-block
-
-
-
-```shell
-
-$ pulsar-admin brokers get-all-dynamic-config
-brokerShutdownTimeoutMs:100
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/brokers/configuration/values|operation/getAllDynamicConfigurations?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.brokers().getAllDynamicConfigurations();
-
-```
-
-
-
-
-````
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-clusters.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-clusters.md
deleted file mode 100644
index 1255ad25d7aac..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-clusters.md
+++ /dev/null
@@ -1,317 +0,0 @@
----
-id: admin-api-clusters
-title: Managing Clusters
-sidebar_label: "Clusters"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-> **Important**
->
-> This page only shows **some frequently used operations**.
->
-> - For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/)
-> 
-> - For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
-> 
-> - For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](https://pulsar.apache.org/api/admin/).
-
-Pulsar clusters consist of one or more Pulsar [brokers](reference-terminology.md#broker), one or more [BookKeeper](reference-terminology.md#bookkeeper)
-servers (aka [bookies](reference-terminology.md#bookie)), and a [ZooKeeper](https://zookeeper.apache.org) cluster that provides configuration and coordination management.
-
-Clusters can be managed via:
-
-* The `clusters` command of the [`pulsar-admin`]([reference-pulsar-admin.md](https://pulsar.apache.org/tools/pulsar-admin/)) tool
-* The `/admin/v2/clusters` endpoint of the admin {@inject: rest:REST:/} API
-* The `clusters` method of the `PulsarAdmin` object in the [Java API](client-libraries-java.md)
-
-## Clusters resources
-
-### Provision
-
-New clusters can be provisioned using the admin interface.
-
-> Please note that this operation requires superuser privileges.
-
-````mdx-code-block
-
-
-
-You can provision a new cluster using the [`create`](reference-pulsar-admin.md#clusters-create) subcommand. Here's an example:
-
-```shell
-
-$ pulsar-admin clusters create cluster-1 \
-  --url http://my-cluster.org.com:8080 \
-  --broker-url pulsar://my-cluster.org.com:6650
-
-```
-
-
-
-
-{@inject: endpoint|PUT|/admin/v2/clusters/:cluster|operation/createCluster?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-ClusterData clusterData = new ClusterData(
-        serviceUrl,
-        serviceUrlTls,
-        brokerServiceUrl,
-        brokerServiceUrlTls
-);
-admin.clusters().createCluster(clusterName, clusterData);
-
-```
-
-
-
-
-````
-
-### Initialize cluster metadata
-
-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 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
-
-You must initialize cluster metadata *before* starting up any [brokers](admin-api-brokers.md) that will belong to the cluster.
-
-> **No cluster metadata initialization through the REST API or the Java admin API**
->
-> Unlike most other admin functions in Pulsar, cluster metadata initialization cannot be performed via the admin REST API
-> or the admin Java client, as metadata initialization involves communicating with ZooKeeper directly.
-> Instead, you can use the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool, in particular
-> the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command.
-
-Here's an example cluster metadata initialization command:
-
-```shell
-
-bin/pulsar initialize-cluster-metadata \
-  --cluster us-west \
-  --metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
-  --configuration-metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
-  --web-service-url http://pulsar.us-west.example.com:8080/ \
-  --web-service-url-tls https://pulsar.us-west.example.com:8443/ \
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650/ \
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651/
-
-```
-
-You'll need to use `--*-tls` flags only if you're using [TLS authentication](security-tls-authentication.md) in your instance.
-
-### Get configuration
-
-You can fetch the [configuration](reference-configuration.md) for an existing cluster at any time.
-
-````mdx-code-block
-
-
-
-Use the [`get`](reference-pulsar-admin.md#clusters-get) subcommand and specify the name of the cluster. Here's an example:
-
-```shell
-
-$ pulsar-admin clusters get cluster-1
-{
-    "serviceUrl": "http://my-cluster.org.com:8080/",
-    "serviceUrlTls": null,
-    "brokerServiceUrl": "pulsar://my-cluster.org.com:6650/",
-    "brokerServiceUrlTls": null
-    "peerClusterNames": null
-}
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/clusters/:cluster|operation/getCluster?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.clusters().getCluster(clusterName);
-
-```
-
-
-
-
-````
-
-### Update
-
-You can update the configuration for an existing cluster at any time.
-
-````mdx-code-block
-
-
-
-Use the [`update`](reference-pulsar-admin.md#clusters-update) subcommand and specify new configuration values using flags.
-
-```shell
-
-$ pulsar-admin clusters update cluster-1 \
-  --url http://my-cluster.org.com:4081 \
-  --broker-url pulsar://my-cluster.org.com:3350
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/clusters/:cluster|operation/updateCluster?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-ClusterData clusterData = new ClusterData(
-        serviceUrl,
-        serviceUrlTls,
-        brokerServiceUrl,
-        brokerServiceUrlTls
-);
-admin.clusters().updateCluster(clusterName, clusterData);
-
-```
-
-
-
-
-````
-
-### Delete
-
-Clusters can be deleted from a Pulsar [instance](reference-terminology.md#instance).
-
-````mdx-code-block
-
-
-
-Use the [`delete`](reference-pulsar-admin.md#clusters-delete) subcommand and specify the name of the cluster.
-
-```
-
-$ pulsar-admin clusters delete cluster-1
-
-```
-
-
-
-
-{@inject: endpoint|DELETE|/admin/v2/clusters/:cluster|operation/deleteCluster?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.clusters().deleteCluster(clusterName);
-
-```
-
-
-
-
-````
-
-### List
-
-You can fetch a list of all clusters in a Pulsar [instance](reference-terminology.md#instance).
-
-````mdx-code-block
-
-
-
-Use the [`list`](reference-pulsar-admin.md#clusters-list) subcommand.
-
-```shell
-
-$ pulsar-admin clusters list
-cluster-1
-cluster-2
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/clusters|operation/getClusters?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.clusters().getClusters();
-
-```
-
-
-
-
-````
-
-### Update peer-cluster data
-
-Peer clusters can be configured for a given cluster in a Pulsar [instance](reference-terminology.md#instance).
-
-````mdx-code-block
-
-
-
-Use the [`update-peer-clusters`](reference-pulsar-admin.md#clusters-update-peer-clusters) subcommand and specify the list of peer-cluster names.
-
-```
-
-$ pulsar-admin update-peer-clusters cluster-1 --peer-clusters cluster-2
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/clusters/:cluster/peers|operation/setPeerClusterNames?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.clusters().updatePeerClusterNames(clusterName, peerClusterList);
-
-```
-
-
-
-
-````
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-namespaces.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-namespaces.md
deleted file mode 100644
index 989802f34be71..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-namespaces.md
+++ /dev/null
@@ -1,1400 +0,0 @@
----
-id: admin-api-namespaces
-title: Managing Namespaces
-sidebar_label: "Namespaces"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-> **Important**
->
-> This page only shows **some frequently used operations**.
->
-> - For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more information, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/).
-> 
-> - For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
-> 
-> - For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](https://pulsar.apache.org/api/admin/).
-
-Pulsar [namespaces](reference-terminology.md#namespace) are logical groupings of [topics](reference-terminology.md#topic).
-
-Namespaces can be managed via:
-
-* The `namespaces` command of the [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/) tool
-* The `/admin/v2/namespaces` endpoint of the admin {@inject: rest:REST:/} API
-* The `namespaces` method of the `PulsarAdmin` object in the [Java API](client-libraries-java.md)
-
-## Namespaces resources
-
-### Create namespaces
-
-You can create new namespaces under a given [tenant](reference-terminology.md#tenant).
-
-````mdx-code-block
-
-
-
-Use the [`create`](reference-pulsar-admin.md#namespaces-create) subcommand and specify the namespace by name:
-
-```shell
-
-$ pulsar-admin namespaces create test-tenant/test-namespace
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().createNamespace(namespace);
-
-```
-
-
-
-
-````
-
-### Get policies
-
-You can fetch the current policies associated with a namespace at any time.
-
-````mdx-code-block
-
-
-
-Use the [`policies`](reference-pulsar-admin.md#namespaces-policies) subcommand and specify the namespace:
-
-```shell
-
-$ pulsar-admin namespaces policies test-tenant/test-namespace
-{
-  "auth_policies": {
-    "namespace_auth": {},
-    "destination_auth": {}
-  },
-  "replication_clusters": [],
-  "bundles_activated": true,
-  "bundles": {
-    "boundaries": [
-      "0x00000000",
-      "0xffffffff"
-    ],
-    "numBundles": 1
-  },
-  "backlog_quota_map": {},
-  "persistence": null,
-  "latency_stats_sample_rate": {},
-  "message_ttl_in_seconds": 0,
-  "retention_policies": null,
-  "deleted": false
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getPolicies(namespace);
-
-```
-
-
-
-
-````
-
-### List namespaces
-
-You can list all namespaces within a given Pulsar [tenant](reference-terminology.md#tenant).
-
-````mdx-code-block
-
-
-
-Use the [`list`](reference-pulsar-admin.md#namespaces-list) subcommand and specify the tenant:
-
-```shell
-
-$ pulsar-admin namespaces list test-tenant
-test-tenant/ns1
-test-tenant/ns2
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getNamespaces(tenant);
-
-```
-
-
-
-
-````
-
-### Delete namespaces
-
-You can delete existing namespaces from a tenant.
-
-````mdx-code-block
-
-
-
-Use the [`delete`](reference-pulsar-admin.md#namespaces-delete) subcommand and specify the namespace:
-
-```shell
-
-$ pulsar-admin namespaces delete test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().deleteNamespace(namespace);
-
-```
-
-
-
-
-````
-
-### Configure replication clusters
-
-#### Set replication cluster
-
-You can set replication clusters for a namespace to enable Pulsar to internally replicate the published messages from one colocation facility to another.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-clusters test-tenant/ns1 \
-  --clusters cl1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setNamespaceReplicationClusters(namespace, clusters);
-
-```
-
-
-
-
-````
-
-#### Get replication cluster
-
-You can get the list of replication clusters for a given namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-clusters test-tenant/cl1/ns1
-
-```
-
-```
-
-cl2
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getNamespaceReplicationClusters(namespace)
-
-```
-
-
-
-
-````
-
-### Configure backlog quota policies
-
-#### Set backlog quota policies
-
-Backlog quota helps the broker to restrict bandwidth/storage of a namespace once it reaches a certain threshold limit. Admin can set the limit and take corresponding action after the limit is reached.
-
-  1.  producer_request_hold: broker holds but not persists produce request payload
-
-  2.  producer_exception: broker disconnects with the client by giving an exception
-
-  3.  consumer_backlog_eviction: broker starts discarding backlog messages
-
-Backlog quota restriction can be taken care by defining restriction of backlog-quota-type: destination_storage.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --policy producer_request_hold test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setBacklogQuota(namespace, new BacklogQuota(limit, limitTime, policy))
-
-```
-
-
-
-
-````
-
-#### Get backlog quota policies
-
-You can get a configured backlog quota for a given namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
-
-```
-
-```json
-
-{
-  "destination_storage": {
-    "limit": 10,
-    "policy": "producer_request_hold"
-  }
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getBacklogQuotaMap(namespace);
-
-```
-
-
-
-
-````
-
-#### Remove backlog quota policies
-
-You can remove backlog quota policies for a given namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().removeBacklogQuota(namespace, backlogQuotaType)
-
-```
-
-
-
-
-````
-
-### Configure persistence policies
-
-#### Set persistence policies
-
-Persistence policies allow users to configure persistency-level for all topic messages under a given namespace.
-
-  -   Bookkeeper-ack-quorum: Number of acks (guaranteed copies) to wait for each entry, default: 0
-
-  -   Bookkeeper-ensemble: Number of bookies to use for a topic, default: 0
-
-  -   Bookkeeper-write-quorum: How many writes to make of each entry, default: 0
-
-  -   Ml-mark-delete-max-rate: Throttling rate of mark-delete operation (0 means no throttle), default: 0.0
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper-ensemble 3 --bookkeeper-write-quorum 2 --ml-mark-delete-max-rate 0 test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setPersistence(namespace,new PersistencePolicies(bookkeeperEnsemble, bookkeeperWriteQuorum,bookkeeperAckQuorum,managedLedgerMaxMarkDeleteRate))
-
-```
-
-
-
-
-````
-
-#### Get persistence policies
-
-You can get the configured persistence policies of a given namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-persistence test-tenant/ns1
-
-```
-
-```json
-
-{
-  "bookkeeperEnsemble": 3,
-  "bookkeeperWriteQuorum": 2,
-  "bookkeeperAckQuorum": 2,
-  "managedLedgerMaxMarkDeleteRate": 0
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getPersistence(namespace)
-
-```
-
-
-
-
-````
-
-### Configure namespace bundles
-
-#### Unload namespace bundles
-
-The namespace bundle is a virtual group of topics which belong to the same namespace. If the broker gets overloaded with the number of bundles, this command can help unload a bundle from that broker, so it can be served by some other less-loaded brokers. The namespace bundle ID ranges from 0x00000000 to 0xffffffff.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().unloadNamespaceBundle(namespace, bundle)
-
-```
-
-
-
-
-````
-
-#### Split namespace bundles
-
-One namespace bundle can contain multiple topics but can be served by only one broker. If a single bundle is creating an excessive load on a broker, an admin can split the bundle using the command below, permitting one or more of the new bundles to be unloaded, thus balancing the load across the brokers.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().splitNamespaceBundle(namespace, bundle)
-
-```
-
-
-
-
-````
-
-### Configure message TTL
-
-#### Set message-ttl
-
-You can configure the time to live (in seconds) duration for messages. In the example below, the message-ttl is set as 100s.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setNamespaceMessageTTL(namespace, messageTTL)
-
-```
-
-
-
-
-````
-
-#### Get message-ttl
-
-When the message-ttl for a namespace is set, you can use the command below to get the configured value. This example comtinues the example of the command `set message-ttl`, so the returned value is 100(s).
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-message-ttl test-tenant/ns1
-
-```
-
-```
-
-100
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
-
-```
-
-```
-
-100
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getNamespaceMessageTTL(namespace)
-
-```
-
-```
-
-100
-
-```
-
-
-
-
-````
-
-#### Remove message-ttl
-
-Remove a message TTL of the configured namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().removeNamespaceMessageTTL(namespace)
-
-```
-
-
-
-
-````
-
-
-### Clear backlog
-
-#### Clear namespace backlog
-
-It clears all message backlog for all the topics that belong to a specific namespace. You can also clear backlog for a specific subscription as well.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().clearNamespaceBacklogForSubscription(namespace, subscription)
-
-```
-
-
-
-
-````
-
-#### Clear bundle backlog
-
-It clears all message backlog for all the topics that belong to a specific NamespaceBundle. You can also clear backlog for a specific subscription as well.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub my-subscription test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().clearNamespaceBundleBacklogForSubscription(namespace, bundle, subscription)
-
-```
-
-
-
-
-````
-
-### Configure retention
-
-#### Set retention
-
-Each namespace contains multiple topics and the retention size (storage size) of each topic should not exceed a specific threshold or it should be stored for a certain period. This command helps configure the retention size and time of topics in a given namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setRetention(namespace, new RetentionPolicies(retentionTimeInMin, retentionSizeInMB))
-
-```
-
-
-
-
-````
-
-#### Get retention
-
-It shows retention information of a given namespace.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-retention test-tenant/ns1
-
-```
-
-```json
-
-{
-  "retentionTimeInMinutes": 10,
-  "retentionSizeInMB": 100
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getRetention(namespace)
-
-```
-
-
-
-
-````
-
-### Configure dispatch throttling for topics
-
-#### Set dispatch throttling for topics
-
-It sets message dispatch rate for all the topics under a given namespace. 
-The dispatch rate can be restricted by the number of messages per X seconds (`msg-dispatch-rate`) or by the number of message-bytes per X second (`byte-dispatch-rate`).
-dispatch rate is in second and it can be configured with `dispatch-rate-period`. Default value of `msg-dispatch-rate` and `byte-dispatch-rate` is -1 which
-disables the throttling.
-
-:::note
-
-- If neither `clusterDispatchRate` nor `topicDispatchRate` is configured, dispatch throttling is disabled.
-- If `topicDispatchRate` is not configured, `clusterDispatchRate` takes effect.
-- If `topicDispatchRate` is configured, `topicDispatchRate` takes effect.
-
-:::
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
-  --msg-dispatch-rate 1000 \
-  --byte-dispatch-rate 1048576 \
-  --dispatch-rate-period 1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setDispatchRate(namespace, new DispatchRate(1000, 1048576, 1))
-
-```
-
-
-
-
-````
-
-#### Get configured message-rate for topics
-
-It shows configured message-rate for the namespace (topics under this namespace can dispatch this many messages per second)
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
-
-```
-
-```json
-
-{
-  "dispatchThrottlingRatePerTopicInMsg" : 1000,
-  "dispatchThrottlingRatePerTopicInByte" : 1048576,
-  "ratePeriodInSecond" : 1
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getDispatchRate(namespace)
-
-```
-
-
-
-
-````
-
-### Configure dispatch throttling for subscription
-
-#### Set dispatch throttling for subscription
-
-It sets message dispatch rate for all the subscription of topics under a given namespace.
-The dispatch rate can be restricted by the number of messages per X seconds (`msg-dispatch-rate`) or by the number of message-bytes per X second (`byte-dispatch-rate`).
-dispatch rate is in second and it can be configured with `dispatch-rate-period`. Default value of `msg-dispatch-rate` and `byte-dispatch-rate` is -1 which
-disables the throttling.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
-  --msg-dispatch-rate 1000 \
-  --byte-dispatch-rate 1048576 \
-  --dispatch-rate-period 1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setSubscriptionDispatchRate(namespace, new DispatchRate(1000, 1048576, 1))
-
-```
-
-
-
-
-````
-
-#### Get configured message-rate for subscription
-
-It shows configured message-rate for the namespace (topics under this namespace can dispatch this many messages per second)
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
-
-```
-
-```json
-
-{
-  "dispatchThrottlingRatePerTopicInMsg" : 1000,
-  "dispatchThrottlingRatePerTopicInByte" : 1048576,
-  "ratePeriodInSecond" : 1
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getSubscriptionDispatchRate(namespace)
-
-```
-
-
-
-
-````
-
-### Configure dispatch throttling for replicator
-
-#### Set dispatch throttling for replicator
-
-It sets message dispatch rate for all the replicator between replication clusters under a given namespace.
-The dispatch rate can be restricted by the number of messages per X seconds (`msg-dispatch-rate`) or by the number of message-bytes per X second (`byte-dispatch-rate`).
-dispatch rate is in second and it can be configured with `dispatch-rate-period`. Default value of `msg-dispatch-rate` and `byte-dispatch-rate` is -1 which
-disables the throttling.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
-  --msg-dispatch-rate 1000 \
-  --byte-dispatch-rate 1048576 \
-  --dispatch-rate-period 1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setReplicatorDispatchRate(namespace, new DispatchRate(1000, 1048576, 1))
-
-```
-
-
-
-
-````
-
-#### Get configured message-rate for replicator
-
-It shows configured message-rate for the namespace (topics under this namespace can dispatch this many messages per second)
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
-
-```
-
-```json
-
-{
-  "dispatchThrottlingRatePerTopicInMsg" : 1000,
-  "dispatchThrottlingRatePerTopicInByte" : 1048576,
-  "ratePeriodInSecond" : 1
-}
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getReplicatorDispatchRate(namespace)
-
-```
-
-
-
-
-````
-
-### Configure deduplication snapshot interval
-
-#### Get deduplication snapshot interval
-
-It shows configured `deduplicationSnapshotInterval` for a namespace (Each topic under the namespace will take a deduplication snapshot according to this interval)
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().getDeduplicationSnapshotInterval(namespace)
-
-```
-
-
-
-
-````
-
-#### Set deduplication snapshot interval
-
-Set configured `deduplicationSnapshotInterval` for a namespace. Each topic under the namespace will take a deduplication snapshot according to this interval.
-`brokerDeduplicationEnabled` must be set to `true` for this property to take effect.
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --interval 1000
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().setDeduplicationSnapshotInterval(namespace, 1000)
-
-```
-
-
-
-
-````
-
-#### Remove deduplication snapshot interval
-
-Remove configured `deduplicationSnapshotInterval` of a namespace (Each topic under the namespace will take a deduplication snapshot according to this interval)
-
-````mdx-code-block
-
-
-
-```
-
-$ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().removeDeduplicationSnapshotInterval(namespace)
-
-```
-
-
-
-
-````
-
-### Namespace isolation
-
-You can use the [Pulsar isolation policy](administration-isolation.md) to allocate resources (broker and bookie) for a namespace. 
-
-### Unload namespaces from a broker
-
-You can unload a namespace, or a [namespace bundle](reference-terminology.md#namespace-bundle), from the Pulsar [broker](reference-terminology.md#broker) that is currently responsible for it.
-
-#### pulsar-admin
-
-Use the [`unload`](reference-pulsar-admin.md#unload) subcommand of the [`namespaces`](reference-pulsar-admin.md#namespaces) command.
-
-````mdx-code-block
-
-
-
-```shell
-
-$ pulsar-admin namespaces unload my-tenant/my-ns
-
-```
-
-
-
-
-```
-
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
-
-```
-
-
-
-
-```java
-
-admin.namespaces().unload(namespace)
-
-```
-
-
-
-
-````
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-non-persistent-topics.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-non-persistent-topics.md
deleted file mode 100644
index 2c645e507cae6..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-non-persistent-topics.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-id: admin-api-non-persistent-topics
-title: Managing non-persistent topics
-sidebar_label: "Non-Persistent topics"
----
-
-For details of the content, refer to [manage topics](admin-api-topics.md).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-overview.md
deleted file mode 100644
index 5b245ec4f5134..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-overview.md
+++ /dev/null
@@ -1,143 +0,0 @@
----
-id: admin-api-overview
-title: Pulsar admin interface
-sidebar_label: "Overview"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-The Pulsar admin interface enables you to manage all important entities in a Pulsar instance, such as tenants, topics, and namespaces.
-
-You can interact with the admin interface via:
-
-- The `pulsar-admin` CLI tool, which is available in the `bin` folder of your Pulsar installation:
-
-  ```shell
-  
-  bin/pulsar-admin
-  
-  ```
-
-  > **Important**
-  > 
-  > For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more information, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/).
-
-- HTTP calls, which are made against the admin {@inject: rest:REST:/} API provided by Pulsar brokers. For some RESTful APIs, they might be redirected to the owner brokers for serving with [`307 Temporary Redirect`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/307), hence the HTTP callers should handle `307 Temporary Redirect`. If you use `curl` commands, you should specify `-L` to handle redirections.
-  
-  > **Important**
-  >
-  > For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
-
-- A Java client interface.
-  
-  > **Important**
-  > 
-  > For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](https://pulsar.apache.org/api/admin/).
-
-> **The REST API is the admin interface**. Both the `pulsar-admin` CLI tool and the Java client use the REST API. If you implement your own admin interface client, you should use the REST API. 
-
-## Admin setup
-
-Each of the three admin interfaces (the `pulsar-admin` CLI tool, the {@inject: rest:REST:/} API, and the [Java admin API](/api/admin)) requires some special setup if you have enabled authentication in your Pulsar instance.
-
-````mdx-code-block
-
-
-
-If you have enabled authentication, you need to provide an auth configuration to use the `pulsar-admin` tool. By default, the configuration for the `pulsar-admin` tool is in the [`conf/client.conf`](reference-configuration.md#client) file. The following are the available parameters:
-
-|Name|Description|Default|
-|----|-----------|-------|
-|webServiceUrl|The web URL for the cluster.|http://localhost:8080/|
-|brokerServiceUrl|The Pulsar protocol URL for the cluster.|pulsar://localhost:6650/|
-|authPlugin|The authentication plugin.| |
-|authParams|The authentication parameters for the cluster, as a comma-separated string.| |
-|useTls|Whether or not TLS authentication will be enforced in the cluster.|false|
-|tlsAllowInsecureConnection|Accept untrusted TLS certificate from client.|false|
-|tlsTrustCertsFilePath|Path for the trusted TLS certificate file.| |
-
-
-
-
-You can find details for the REST API exposed by Pulsar brokers in this {@inject: rest:document:/}.
-
-
-
-
-To use the Java admin API, instantiate a {@inject: javadoc:PulsarAdmin:/admin/org/apache/pulsar/client/admin/PulsarAdmin} object, and specify a URL for a Pulsar broker and a {@inject: javadoc:PulsarAdminBuilder:/admin/org/apache/pulsar/client/admin/PulsarAdminBuilder}. The following is a minimal example using `localhost`:
-
-```java
-
-String url = "http://localhost:8080";
-// Pass auth-plugin class fully-qualified name if Pulsar-security enabled
-String authPluginClassName = "com.org.MyAuthPluginClass";
-// Pass auth-param if auth-plugin class requires it
-String authParams = "param1=value1";
-boolean useTls = false;
-boolean tlsAllowInsecureConnection = false;
-String tlsTrustCertsFilePath = null;
-PulsarAdmin admin = PulsarAdmin.builder()
-.authentication(authPluginClassName,authParams)
-.serviceHttpUrl(url)
-.tlsTrustCertsFilePath(tlsTrustCertsFilePath)
-.allowTlsInsecureConnection(tlsAllowInsecureConnection)
-.build();
-
-```
-
-If you use multiple brokers, you can use multi-host like Pulsar service. For example,
-
-```java
-
-String url = "http://localhost:8080,localhost:8081,localhost:8082";
-// Pass auth-plugin class fully-qualified name if Pulsar-security enabled
-String authPluginClassName = "com.org.MyAuthPluginClass";
-// Pass auth-param if auth-plugin class requires it
-String authParams = "param1=value1";
-boolean useTls = false;
-boolean tlsAllowInsecureConnection = false;
-String tlsTrustCertsFilePath = null;
-PulsarAdmin admin = PulsarAdmin.builder()
-.authentication(authPluginClassName,authParams)
-.serviceHttpUrl(url)
-.tlsTrustCertsFilePath(tlsTrustCertsFilePath)
-.allowTlsInsecureConnection(tlsAllowInsecureConnection)
-.build();
-
-```
-
-
-
-
-````
-
-## How to define Pulsar resource names when running Pulsar in Kubernetes
-If you run Pulsar Functions or connectors on Kubernetes, you need to follow Kubernetes naming convention to define the names of your Pulsar resources, whichever admin interface you use.
-
-Kubernetes requires a name that can be used as a DNS subdomain name as defined in [RFC 1123](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names). Pulsar supports more legal characters than Kubernetes naming convention. If you create a Pulsar resource name with special characters that are not supported by Kubernetes (for example, including colons in a Pulsar namespace name), Kubernetes runtime translates the Pulsar object names into Kubernetes resource labels which are in RFC 1123-compliant forms. Consequently, you can run functions or connectors using Kubernetes runtime. The rules for translating Pulsar object names into Kubernetes resource labels are as below:
-
-- Truncate to 63 characters
-  
-- Replace the following characters with dashes (-):
-  
-  - Non-alphanumeric characters
-  
-  - Underscores (_)
-  
-  - Dots (.) 
-  
-- Replace beginning and ending non-alphanumeric characters with 0
-  
-:::tip
-
-- If you get an error in translating Pulsar object names into Kubernetes resource labels (for example, you may have a naming collision if your Pulsar object name is too long) or want to customize the translating rules, see [customize Kubernetes runtime](https://pulsar.apache.org/docs/en/next/functions-runtime/#customize-kubernetes-runtime).
-- For how to configure Kubernetes runtime, see [here](https://pulsar.apache.org/docs/en/next/functions-runtime/#configure-kubernetes-runtime).
-
-:::
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-partitioned-topics.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-partitioned-topics.md
deleted file mode 100644
index da99c44030221..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-partitioned-topics.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-id: admin-api-partitioned-topics
-title: Managing partitioned topics
-sidebar_label: "Partitioned topics"
----
-
-For details of the content, refer to [manage topics](admin-api-topics.md).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-permissions.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-permissions.md
deleted file mode 100644
index 8432b5b82cdbc..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-permissions.md
+++ /dev/null
@@ -1,188 +0,0 @@
----
-id: admin-api-permissions
-title: Managing permissions
-sidebar_label: "Permissions"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-> **Important**
->
-> This page only shows **some frequently used operations**.
->
-> - For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/)
-> 
-> - For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
-> 
-> - For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](https://pulsar.apache.org/api/admin/).
-
-Pulsar allows you to grant namespace-level or topic-level permission to users.
-
-- If you grant a namespace-level permission to a user, then the user can access all the topics under the namespace.
-
-- If you grant a topic-level permission to a user, then the user can access only the topic.
-
-The chapters below demonstrate how to grant namespace-level permissions to users. For how to grant topic-level permissions to users, see [manage topics](admin-api-topics.md/#grant-permission).
-
-## Grant permissions
-
-You can grant permissions to specific roles for lists of operations such as `produce` and `consume`.
-
-````mdx-code-block
-
-
-
-Use the [`grant-permission`](reference-pulsar-admin.md#grant-permission) subcommand and specify a namespace, actions using the `--actions` flag, and a role using the `--role` flag:
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-  --actions produce,consume \
-  --role admin10
-
-```
-
-Wildcard authorization can be performed when `authorizationAllowWildcardsMatching` is set to `true` in `broker.conf`.
-
-e.g.
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                        --actions produce,consume \
-                        --role 'my.role.*'
-
-```
-
-Then, roles `my.role.1`, `my.role.2`, `my.role.foo`, `my.role.bar`, etc. can produce and consume.  
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                        --actions produce,consume \
-                        --role '*.role.my'
-
-```
-
-Then, roles `1.role.my`, `2.role.my`, `foo.role.my`, `bar.role.my`, etc. can produce and consume.
-
-**Note**: A wildcard matching works at **the beginning or end of the role name only**.
-
-e.g.
-
-```shell
-
-$ pulsar-admin namespaces grant-permission test-tenant/ns1 \
-                        --actions produce,consume \
-                        --role 'my.*.role'
-
-```
-
-In this case, only the role `my.*.role` has permissions.  
-Roles `my.1.role`, `my.2.role`, `my.foo.role`, `my.bar.role`, etc. **cannot** produce and consume.
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/permissions/:role|operation/grantPermissionOnNamespace?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().grantPermissionOnNamespace(namespace, role, getAuthActions(actions));
-
-```
-
-
-
-
-````
-
-## Get permissions
-
-You can see which permissions have been granted to which roles in a namespace.
-
-````mdx-code-block
-
-
-
-Use the [`permissions`](reference-pulsar-admin#permissions) subcommand and specify a namespace:
-
-```shell
-
-$ pulsar-admin namespaces permissions test-tenant/ns1
-{
-  "admin10": [
-    "produce",
-    "consume"
-  ]
-}
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/permissions|operation/getPermissions?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().getPermissions(namespace);
-
-```
-
-
-
-
-````
-
-## Revoke permissions
-
-You can revoke permissions from specific roles, which means that those roles will no longer have access to the specified namespace.
-
-````mdx-code-block
-
-
-
-Use the [`revoke-permission`](reference-pulsar-admin.md#revoke-permission) subcommand and specify a namespace and a role using the `--role` flag:
-
-```shell
-
-$ pulsar-admin namespaces revoke-permission test-tenant/ns1 \
-  --role admin10
-
-```
-
-
-
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/permissions/:role|operation/revokePermissionsOnNamespace?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().revokePermissionsOnNamespace(namespace, role);
-
-```
-
-
-
-
-````
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-persistent-topics.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-persistent-topics.md
deleted file mode 100644
index 206304005daeb..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-persistent-topics.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-id: admin-api-persistent-topics
-title: Managing persistent topics
-sidebar_label: "Persistent topics"
----
-
-For details of the content, refer to [manage topics](admin-api-topics.md).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-schemas.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-schemas.md
deleted file mode 100644
index 8399a03b8723f..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-schemas.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-id: admin-api-schemas
-title: Managing Schemas
-sidebar_label: "Schemas"
----
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-tenants.md b/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-tenants.md
deleted file mode 100644
index fd2ccd0fe0021..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/admin-api-tenants.md
+++ /dev/null
@@ -1,241 +0,0 @@
----
-id: admin-api-tenants
-title: Managing Tenants
-sidebar_label: "Tenants"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-> **Important**
->
-> This page only shows **some frequently used operations**.
->
-> - For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/)
-> 
-> - For the latest and complete information about `REST API`, including parameters, responses, samples, and more, see {@inject: rest:REST:/} API doc.
-> 
-> - For the latest and complete information about `Java admin API`, including classes, methods, descriptions, and more, see [Java admin API doc](https://pulsar.apache.org/api/admin/).
-
-Tenants, like namespaces, can be managed using the [admin API](admin-api-overview.md). There are currently two configurable aspects of tenants:
-
-* Admin roles
-* Allowed clusters
-
-## Tenant resources
-
-### List
-
-You can list all of the tenants associated with an [instance](reference-terminology.md#instance).
-
-````mdx-code-block
-
-
-
-Use the [`list`](reference-pulsar-admin.md#tenants-list) subcommand.
-
-```shell
-
-$ pulsar-admin tenants list
-my-tenant-1
-my-tenant-2
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/tenants|operation/getTenants?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.tenants().getTenants();
-
-```
-
-
-
-
-````
-
-### Create
-
-You can create a new tenant.
-
-````mdx-code-block
-
-
-
-Use the [`create`](reference-pulsar-admin.md#tenants-create) subcommand:
-
-```shell
-
-$ pulsar-admin tenants create my-tenant
-
-```
-
-When creating a tenant, you can optionally assign admin roles using the `-r`/`--admin-roles`
-flag, and clusters using the `-c`/`--allowed-clusters` flag. You can specify multiple values
-as a comma-separated list. Here are some examples:
-
-```shell
-
-$ pulsar-admin tenants create my-tenant \
-  --admin-roles role1,role2,role3 \
-  --allowed-clusters cluster1
-
-$ pulsar-admin tenants create my-tenant \
-  -r role1
-  -c cluster1
-
-```
-
-
-
-
-{@inject: endpoint|PUT|/admin/v2/tenants/:tenant|operation/createTenant?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.tenants().createTenant(tenantName, tenantInfo);
-
-```
-
-
-
-
-````
-
-### Get configuration
-
-You can fetch the [configuration](reference-configuration.md) for an existing tenant at any time.
-
-````mdx-code-block
-
-
-
-Use the [`get`](reference-pulsar-admin.md#tenants-get) subcommand and specify the name of the tenant. Here's an example:
-
-```shell
-
-$ pulsar-admin tenants get my-tenant
-{
-  "adminRoles": [
-    "admin1",
-    "admin2"
-  ],
-  "allowedClusters": [
-    "cl1",
-    "cl2"
-  ]
-}
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/tenants/:tenant|operation/getTenant?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.tenants().getTenantInfo(tenantName);
-
-```
-
-
-
-
-````
-
-### Delete
-
-Tenants can be deleted from a Pulsar [instance](reference-terminology.md#instance).
-
-````mdx-code-block
-
-
-
-Use the [`delete`](reference-pulsar-admin.md#tenants-delete) subcommand and specify the name of the tenant.
-
-```shell
-
-$ pulsar-admin tenants delete my-tenant
-
-```
-
-
-
-
-{@inject: endpoint|DELETE|/admin/v2/tenants/:tenant|operation/deleteTenant?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.Tenants().deleteTenant(tenantName);
-
-```
-
-
-
-
-````
-
-### Update
-
-You can update a tenant's configuration.
-
-````mdx-code-block
-
-
-
-Use the [`update`](reference-pulsar-admin.md#tenants-update) subcommand.
-
-```shell
-
-$ pulsar-admin tenants update my-tenant
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/tenants/:tenant|operation/updateTenant?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.tenants().updateTenant(tenantName, tenantInfo);
-
-```
-
-
-
-
-````
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/administration-dashboard.md b/site2/website/versioned_docs/version-2.1.1-incubating/administration-dashboard.md
deleted file mode 100644
index 92bd7e17869d7..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/administration-dashboard.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-id: administration-dashboard
-title: Pulsar dashboard
-sidebar_label: "Dashboard"
-original_id: administration-dashboard
----
-
-:::note
-
-Pulsar dashboard is deprecated. We recommend you use [Pulsar Manager](administration-pulsar-manager.md) to manage and monitor the stats of your topics. 
-
-:::
-
-Pulsar dashboard is a web application that enables users to monitor current stats for all [topics](reference-terminology.md#topic) in tabular form.
-
-The dashboard is a data collector that polls stats from all the brokers in a Pulsar instance (across multiple clusters) and stores all the information in a [PostgreSQL](https://www.postgresql.org/) database.
-
-You can use the [Django](https://www.djangoproject.com) web app to render the collected data.
-
-## Install
-
-The easiest way to use the dashboard is to run it inside a [Docker](https://www.docker.com/products/docker) container.
-
-```shell
-
-$ SERVICE_URL=http://broker.example.com:8080/
-$ docker run -p 80:80 \
-  -e SERVICE_URL=$SERVICE_URL \
-  apachepulsar/pulsar-dashboard:@pulsar:version@
-
-```
-
-You can find the {@inject: github:Dockerfile:/dashboard/Dockerfile} in the `dashboard` directory and build an image from scratch as well:
-
-```shell
-
-$ docker build -t apachepulsar/pulsar-dashboard dashboard
-
-```
-
-If token authentication is enabled:
-> Provided token should have super-user access. 
-
-```shell
-
-$ SERVICE_URL=http://broker.example.com:8080/
-$ JWT_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
-$ docker run -p 80:80 \
-  -e SERVICE_URL=$SERVICE_URL \
-  -e JWT_TOKEN=$JWT_TOKEN \
-  apachepulsar/pulsar-dashboard
-
-```
-
- 
-You need to specify only one service URL for a Pulsar cluster. Internally, the collector figures out all the existing clusters and the brokers from where it needs to pull the metrics. If you connect the dashboard to Pulsar running in standalone mode, the URL is `http://:8080` by default. `` is the IP address or hostname of the machine that runs Pulsar standalone. The IP address or hostname should be accessible from the running dashboard in the docker instance.
-
-Once the Docker container starts, the web dashboard is accessible via `localhost` or whichever host that Docker uses.
-
-> The `SERVICE_URL` that the dashboard uses needs to be reachable from inside the Docker container.
-
-If the Pulsar service runs in standalone mode in `localhost`, the `SERVICE_URL` has to
-be the IP address of the machine.
-
-Similarly, given the Pulsar standalone advertises itself with localhost by default, you need to
-explicitly set the advertise address to the host IP address. For example:
-
-```shell
-
-$ bin/pulsar standalone --advertised-address 1.2.3.4
-
-```
-
-### Known issues
-
-Currently, only Pulsar Token [authentication](security-overview.md#authentication-providers) is supported.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/administration-geo.md b/site2/website/versioned_docs/version-2.1.1-incubating/administration-geo.md
deleted file mode 100644
index 766840cf73ffd..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/administration-geo.md
+++ /dev/null
@@ -1,280 +0,0 @@
----
-id: administration-geo
-title: Pulsar geo-replication
-sidebar_label: "Geo-replication"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-## Enable geo-replication for a namespace
-
-You must enable geo-replication on a [per-tenant basis](#concepts-multi-tenancy) in Pulsar. For example, you can enable geo-replication between two specific clusters only when a tenant has access to both clusters.
-
-Geo-replication is managed at the namespace level, which means you only need to create and configure a namespace to replicate messages between two or more provisioned clusters that a tenant can access.
-
-Complete the following tasks to enable geo-replication for a namespace:
-
-* [Enable a geo-replication namespace](#enable-geo-replication-at-namespace-level)
-* [Configure that namespace to replicate across two or more provisioned clusters](admin-api-namespaces.md/#configure-replication-clusters)
-
-Any message published on *any* topic in that namespace is replicated to all clusters in the specified set.
-
-## Local persistence and forwarding
-
-When messages are produced on a Pulsar topic, messages are first persisted in the local cluster, and then forwarded asynchronously to the remote clusters.
-
-In normal cases, when connectivity issues are none, messages are replicated immediately, at the same time as they are dispatched to local consumers. Typically, the network [round-trip time](https://en.wikipedia.org/wiki/Round-trip_delay_time) (RTT) between the remote regions defines end-to-end delivery latency.
-
-Applications can create producers and consumers in any of the clusters, even when the remote clusters are not reachable (like during a network partition).
-
-Producers and consumers can publish messages to and consume messages from any cluster in a Pulsar instance. However, subscriptions cannot only be local to the cluster where the subscriptions are created but also can be transferred between clusters after replicated subscription is enabled. Once replicated subscription is enabled, you can keep subscription state in synchronization. Therefore, a topic can be asynchronously replicated across multiple geographical regions. In case of failover, a consumer can restart consuming messages from the failure point in a different cluster.
-
-![A typical geo-replication example with full-mesh pattern](/assets/geo-replication.png)
-
-In the aforementioned example, the **T1** topic is replicated among three clusters, **Cluster-A**, **Cluster-B**, and **Cluster-C**.
-
-All messages produced in any of the three clusters are delivered to all subscriptions in other clusters. In this case, **C1** and **C2** consumers receive all messages that **P1**, **P2**, and **P3** producers publish. Ordering is still guaranteed on a per-producer basis.
-
-## Configure replication
-
-This section guides you through the steps to configure geo-replicated clusters.
-1. [Connect replication clusters](#connect-replication-clusters)
-2. [Grant permissions to properties](#grant-permissions-to-properties)
-3. [Enable geo-replication](#enable-geo-replication)
-4. [Use topics with geo-replication](#use-topics-with-geo-replication)
-
-### Connect replication clusters
-
-To replicate data among clusters, you need to configure each cluster to connect to the other. You can use the [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/) tool to create a connection.
-
-**Example**
-
-Suppose that you have 3 replication clusters: `us-west`, `us-cent`, and `us-east`.
-
-1. Configure the connection from `us-west` to `us-east`.
-
-   Run the following command on `us-west`.
-
-```shell
-
-$ bin/pulsar-admin clusters create \
-  --broker-url pulsar://:	\
-  --url http://: \
-  us-east
-
-```
-
-   :::tip
-
-   - If you want to use a secure connection for a cluster, you can use the flags `--broker-url-secure` and `--url-secure`. For more information, see [pulsar-admin clusters create](https://pulsar.apache.org/tools/pulsar-admin/).
-   - Different clusters may have different authentications. You can use the authentication flag `--auth-plugin` and `--auth-parameters` together to set cluster authentication, which overrides `brokerClientAuthenticationPlugin` and `brokerClientAuthenticationParameters` if `authenticationEnabled` sets to `true` in `broker.conf` and `standalone.conf`. For more information, see [authentication and authorization](concepts-authentication.md).
-
-   :::
-
-2. Configure the connection from `us-west` to `us-cent`.
-
-   Run the following command on `us-west`.
-
-```shell
-
-$ bin/pulsar-admin clusters create \
-  --broker-url pulsar://:	\
-  --url http://: \
-  us-cent
-
-```
-
-3. Run similar commands on `us-east` and `us-cent` to create connections among clusters.
-
-### Grant permissions to properties
-
-To replicate to a cluster, the tenant needs permission to use that cluster. You can grant permission to the tenant when you create the tenant or grant later.
-
-Specify all the intended clusters when you create a tenant:
-
-```shell
-
-$ bin/pulsar-admin tenants create my-tenant \
-  --admin-roles my-admin-role \
-  --allowed-clusters us-west,us-east,us-cent
-
-```
-
-To update permissions of an existing tenant, use `update` instead of `create`.
-
-### Enable geo-replication 
-
-You can enable geo-replication at **namespace** or **topic** level.
-
-#### Enable geo-replication at namespace level
-
-You can create a namespace with the following command sample.
-
-```shell
-
-$ bin/pulsar-admin namespaces create my-tenant/my-namespace
-
-```
-
-Initially, the namespace is not assigned to any cluster. You can assign the namespace to clusters using the `set-clusters` subcommand:
-
-```shell
-
-$ bin/pulsar-admin namespaces set-clusters my-tenant/my-namespace \
-  --clusters us-west,us-east,us-cent
-
-```
-
-### Use topics with geo-replication
-
-#### Selective replication
-
-By default, messages are replicated to all clusters configured for the namespace. You can restrict replication selectively by specifying a replication list for a message, and then that message is replicated only to the subset in the replication list.
-
-The following is an example for the [Java API](client-libraries-java.md). Note the use of the `setReplicationClusters` method when you construct the {@inject: javadoc:Message:/client/org/apache/pulsar/client/api/Message} object:
-
-```java
-
-List restrictReplicationTo = Arrays.asList(
-        "us-west",
-        "us-east"
-);
-
-Producer producer = client.newProducer()
-        .topic("some-topic")
-        .create();
-
-producer.newMessage()
-        .value("my-payload".getBytes())
-        .setReplicationClusters(restrictReplicationTo)
-        .send();
-
-```
-
-#### Topic stats
-
-You can check topic-specific statistics for geo-replication topics using one of the following methods.
-
-````mdx-code-block
-
-
-
-Use the [`pulsar-admin topics stats`](https://pulsar.apache.org/tools/pulsar-admin/) command.
-
-```shell
-
-$ bin/pulsar-admin topics stats persistent://my-tenant/my-namespace/my-topic
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/stats|operation/getStats?version=@pulsar:version_number@}
-
-
-
-
-````
-
-Each cluster reports its own local stats, including the incoming and outgoing replication rates and backlogs.
-
-#### Delete a geo-replication topic
-
-Given that geo-replication topics exist in multiple regions, directly deleting a geo-replication topic is not possible. Instead, you should rely on automatic topic garbage collection.
-
-In Pulsar, a topic is automatically deleted when the topic meets the following three conditions:
-- no producers or consumers are connected to it;
-- no subscriptions to it;
-- no more messages are kept for retention. 
-For geo-replication topics, each region uses a fault-tolerant mechanism to decide when deleting the topic locally is safe.
-
-You can explicitly disable topic garbage collection by setting `brokerDeleteInactiveTopicsEnabled` to `false` in your [broker configuration](reference-configuration.md#broker).
-
-To delete a geo-replication topic, close all producers and consumers on the topic, and delete all of its local subscriptions in every replication cluster. When Pulsar determines that no valid subscription for the topic remains across the system, it will garbage collect the topic.
-
-## Replicated subscriptions
-
-Pulsar supports replicated subscriptions, so you can keep subscription state in sync, within a sub-second timeframe, in the context of a topic that is being asynchronously replicated across multiple geographical regions.
-
-In case of failover, a consumer can restart consuming from the failure point in a different cluster. 
-
-### Enable replicated subscription
-
-Replicated subscription is disabled by default. You can enable replicated subscription when creating a consumer. 
-
-```java
-
-Consumer consumer = client.newConsumer(Schema.STRING)
-            .topic("my-topic")
-            .subscriptionName("my-subscription")
-            .replicateSubscriptionState(true)
-            .subscribe();
-
-```
-
-### Advantages
-
- * It is easy to implement the logic. 
- * You can choose to enable or disable replicated subscription.
- * When you enable it, the overhead is low, and it is easy to configure. 
- * When you disable it, the overhead is zero.
-
-### Limitations
-
-* When you enable replicated subscription, you're creating a consistent distributed snapshot to establish an association between message ids from different clusters. The snapshots are taken periodically. The default value is `1 second`. It means that a consumer failing over to a different cluster can potentially receive 1 second of duplicates. You can also configure the frequency of the snapshot in the `broker.conf` file.
-* Only the base line cursor position is synced in replicated subscriptions while the individual acknowledgments are not synced. This means the messages acknowledged out-of-order could end up getting delivered again, in the case of a cluster failover.
-
-## Migrate data between clusters using geo-replication
-
-Using geo-replication to migrate data between clusters is a special use case of the [active-active replication pattern](concepts-replication.md/#active-active-replication) when you don't have a large amount of data.
-
-1. Create your new cluster.
-2. Add the new cluster to your old cluster.
-
-```shell
-
-  bin/pulsar-admin cluster create new-cluster
-
-```
-
-3. Add the new cluster to your tenant.
-
-```shell
-
-  bin/pulsar-admin tenants update my-tenant --cluster old-cluster,new-cluster
-
-```
-
-4. Set the clusters on your namespace.
-
-```shell
-
-  bin/pulsar-admin namespaces set-clusters my-tenant/my-ns --cluster old-cluster,new-cluster
-
-```
-
-5. Update your applications using [replicated subscriptions](#replicated-subscriptions).
-6. Validate subscription replication is active.
-
-```shell
-
-  bin/pulsar-admin topics stats-internal public/default/t1
-
-```
-
-7. Move your consumers and producers to the new cluster by modifying the values of `serviceURL`.
-
-:::note
-
-* The replication starts from step 4, which means existing messages in your old cluster are not replicated. 
-* If you have some older messages to migrate, you can pre-create the replication subscriptions for each topic and set it at the earliest position by using `pulsar-admin topics create-subscription -s pulsar.repl.new-cluster -m earliest `.
-
-:::
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/administration-load-distribution.md b/site2/website/versioned_docs/version-2.1.1-incubating/administration-load-distribution.md
deleted file mode 100644
index 07f7e7033b3b6..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/administration-load-distribution.md
+++ /dev/null
@@ -1,235 +0,0 @@
----
-id: administration-load-distribution
-title: Pulsar load distribution
-sidebar_label: "Load distribution"
-original_id: administration-load-distribution
----
-
-## Load distribution across Pulsar brokers
-
-Pulsar is an horizontally scalable messaging system, so it is a core requirement that the traffic
-in a logical cluster must be spread across all the available Pulsar brokers, as evenly as possible.
-
-In most cases, this is true out of the box and one shouldn't worry about it. There are, though,
-multiple settings and tools to control the traffic distribution and they require a bit of
-context to understand how the traffic is managed in Pulsar.
-
-## Pulsar load manager architecture
-
-### Dynamic assignment of topics to brokers
-
-Topics are dynamically assigned to brokers based on the load conditions of all brokers in the
-cluster.
-
-When a clients starts using new topics that are not assigned to any broker, it will trigger a
-process that, given the load conditions, it will choose the best suited broker to acquire ownership
-of such topic.
-
-In case of partitioned topics, different partitions might be assigned to different brokers. We talk
-about "topic" in this context to mean either a non-partitioned topic or one partition of a topic.
-
-The assignment is "dynamic" because it can change very quickly. For example, if the broker owning
-the topic crashes, the topic will be reassigned immediately to another broker. Another scenario is
-that the broker owning the topic becomes overloaded. In this case too, the topic will be
-reassigned to a less loaded broker.
-
-The dynamic assignment is made possible by the stateless nature of brokers. This also ensure that
-we can quickly expand or shrink the cluster based on usage.
-
-### Assignment granularity
-
-The assignment of topics/partitions to brokers is not done at the individual level. The reason for
-it is to amortize the amount of information that we need to keep track (eg. which topics are
-assigned to a particular broker, what's the load on topics for a broker and similar).
-
-Instead of individual topic/partition assignment, each broker takes ownership of a subset of the
-topics for a namespace. This subset is called a "*bundle*" and effectively it's a sharding
-mechanism.
-
-The namespace is the "administrative" unit: many config knobs or operations are done at the
-namespace level.
-
-For assignment, a namespaces is sharded into a list of "bundles", with each bundle comprising
-a portion of overall hash range of the namespace.
-
-Topics are assigned to a particular bundle by taking the hash of the topic name and seeing in which
-bundle the hash falls into.
-
-Each bundle is independent of the others and thus is independently assigned to different brokers.
-
-### Creating namespaces and bundles
-
-When creating a new namespace, it will set to use the default number of bundles. This is set in
-`conf/broker.conf`:
-
-```properties
-
-# When a namespace is created without specifying the number of bundle, this
-# value will be used as the default
-defaultNumberOfNamespaceBundles=4
-
-```
-
-One can either change the system default, or override it when creating a new namespace:
-
-```shell
-
-$ bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16
-
-```
-
-With this command, we're creating a namespace with 16 initial bundles. Therefore the topics for
-this namespaces can immediately be spread across up to 16 brokers.
-
-In general, if the expected traffic and number of topics is known in advance, it's a good idea to
-start with a reasonable number of bundles instead of waiting for the system to auto-correct the
-distribution.
-
-On a same note, it is normally beneficial to start with more bundles than number of brokers,
-primarily because of the hashing nature of the distribution of topics into bundles. For example,
-for a namespace with 1000 topics, using something like 64 bundles will achieve a good distribution
-of traffic across 16 brokers.
-
-### Unloading topics and bundles
-
-In Pulsar there is an admin operation of "unloading" a topic. Unloading means to close the topics,
-release ownership and reassign the topics to a new broker, based on current load.
-
-When unload happens, the client will experience a small latency blip, typically in the order of
-tens of milliseconds, while the topic is reassigned.
-
-Unloading is the mechanism used by the load-manager to perform the load shedding, but it can
-also be triggered manually, for example to correct the assignments and redistribute traffic
-even before having any broker overloaded.
-
-Unloading a topic has no effect on the assignment, but it will just close and reopen the
-particular topic:
-
-```shell
-
-pulsar-admin topics unload persistent://tenant/namespace/topic
-
-```
-
-To unload all topics for a namespace and trigger reassignments:
-
-```shell
-
-pulsar-admin namespaces unload tenant/namespace
-
-```
-
-### Namespace bundles splitting
-
-Since the load for the topics in a bundle might change over time, or could just be hard to predict
-upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned
-to different brokers.
-
-The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any
-of the threshold is a candidate to be split. By default the newly split bundles are also
-immediately offloaded to other brokers, to facilitate the traffic distribution.
-
-```properties
-
-# enable/disable namespace bundle auto split
-loadBalancerAutoBundleSplitEnabled=true
-
-# enable/disable automatic unloading of split bundles
-loadBalancerAutoUnloadSplitBundlesEnabled=true
-
-# maximum topics in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxTopics=1000
-
-# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxSessions=1000
-
-# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxMsgRate=30000
-
-# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered
-loadBalancerNamespaceBundleMaxBandwidthMbytes=100
-
-# maximum number of bundles in a namespace (for auto-split)
-loadBalancerNamespaceMaximumBundles=128
-
-```
-
-### Automatic load shedding
-
-In Pulsar's load manager there is support for automatic load shedding. This means that whenever
-the system recognized a particular broker is overloaded, it will force some traffic to be
-reassigned to less loaded brokers.
-
-When a broker is identifies as overloaded, it will force to "unload" a subset of the bundles, the
-ones with higher traffic, that make up for the overload percentage.
-
-For example, the default threshold is 85% and if a broker is over quota at 95% CPU usage, then
-it will unload the percent difference plus a 5% margin: `(95% - 85%) + 5% = 15%`.
-
-Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network
-and memory), broker will unload bundles for at least 15% of traffic.
-
-The automatic load shedding is enabled by default and can be disabled with this setting:
-
-```properties
-
-# Enable/disable automatic bundle unloading for load-shedding
-loadBalancerSheddingEnabled=true
-
-```
-
-There are additional settings that apply to shedding:
-
-```properties
-
-# Load shedding interval. Broker periodically checks whether some traffic should be offload from
-# some over-loaded broker to other under-loaded brokers
-loadBalancerSheddingIntervalMinutes=1
-
-# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe
-loadBalancerSheddingGracePeriodMinutes=30
-
-```
-
-#### Broker overload thresholds
-
-The determinations of when a broker is overloaded is based on threshold of CPU, network and
-memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding
-(if enabled).
-
-By default, overload threshold is set at 85%:
-
-```properties
-
-# Usage threshold to determine a broker as over-loaded
-loadBalancerBrokerOverloadedThresholdPercentage=85
-
-```
-
-The usage stats are gathered by Pulsar from the system metrics.
-
-In case of network utilization, in some cases the network interface speed reported by Linux is
-not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps
-NIC speed for which the OS report 10Gbps speed.
-
-Because of the incorrect max speed, the Pulsar load manager might think the broker has not
-reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
-being slowed down.
-
-There is a setting to correct the max NIC speed:
-
-```properties
-
-# Override the auto-detection of the network interfaces max speed.
-# This option is useful in some environments (eg: EC2 VMs) where the max speed
-# reported by Linux is not reflecting the real bandwidth available to the broker.
-# Since the network usage is employed by the load manager to decide when a broker
-# is overloaded, it is important to make sure the info is correct or override it
-# with the right value here. The configured value can be a double (eg: 0.8) and that
-# can be used to trigger load-shedding even before hitting on NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
-
-```
-
-When the value is empty, Pulsar will use the value reported by the OS.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/administration-proxy.md b/site2/website/versioned_docs/version-2.1.1-incubating/administration-proxy.md
deleted file mode 100644
index 78ffb3ff6c13d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/administration-proxy.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-id: administration-proxy
-title: The Pulsar proxy
-sidebar_label: "Pulsar proxy"
-original_id: administration-proxy
----
-
-The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) is an optional gateway that you can run over the brokers in a Pulsar cluster. We recommend running a Pulsar proxy in cases when direction connections between clients and Pulsar brokers are either infeasible, undesirable, or both, for example when running Pulsar in a cloud environment or on [Kubernetes](https://kubernetes.io) or an analogous platform.
-
-## Running the proxy
-
-In order to run the Pulsar proxy, you need to have both a local [ZooKeeper](https://zookeeper.apache.org) and configuration store quorum set up for use by your Pulsar cluster. For instructions, see [this document](deploy-bare-metal.md). Once you have ZooKeeper set up and have connection strings for both ZooKeeper quorums, you can use the [`proxy`](reference-cli-tools.md#pulsar-proxy) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool to start up the proxy (preferably on its own machine or in its own VM):
-
-To start the proxy:
-
-```bash
-
-$ cd /path/to/pulsar/directory
-$ bin/pulsar proxy \
-  --zookeeper-servers zk-0,zk-1,zk-2 \
-  --configuration-store-servers zk-0,zk-1,zk-2
-
-```
-
-> You can run as many instances of the Pulsar proxy in a cluster as you would like.
-
-
-## Stopping the proxy
-
-The Pulsar proxy runs by default in the foreground. To stop the proxy, simply stop the process in which it's running.
-
-## Proxy frontends
-
-We recommend running the Pulsar proxy behind some kind of load-distributing frontend, such as an [HAProxy](https://www.digitalocean.com/community/tutorials/an-introduction-to-haproxy-and-load-balancing-concepts) load balancer.
-
-## Using Pulsar clients with the proxy
-
-Once your Pulsar proxy is up and running, preferably behind a load-distributing [frontend](#proxy-frontends), clients can connect to the proxy via whichever address is used by the frontend. If the address were the DNS address `pulsar.cluster.default`, for example, then the connection URL for clients would be `pulsar://pulsar.cluster.default:6650`.
-
-## Proxy configuration
-
-The Pulsar proxy can be configured using the [`proxy.conf`](reference-configuration.md#proxy) configuration file. The following parameters are available in that file:
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  The ZooKeeper quorum connection string (as a comma-separated list)  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|zookeeperSessionTimeoutMs| ZooKeeper session timeout (in milliseconds) |30000|
-|servicePort| The port to use for server binary Protobuf requests |6650|
-|servicePortTls|  The port to use to server binary Protobuf TLS requests  |6651|
-|statusFilePath | Path for the file used to determine the rotation status for the proxy instance when responding to service discovery health checks ||
-|authenticationEnabled| Whether authentication is enabled for the Pulsar proxy  |false|
-|authenticationProviders| Authentication provider name list (a comma-separated list of class names) ||
-|authorizationEnabled|  Whether authorization is enforced by the Pulsar proxy |false|
-|authorizationProvider| Authorization provider as a fully qualified class name  |org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider|
-|brokerClientAuthenticationPlugin|  The authentication plugin used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientAuthenticationParameters|  The authentication parameters used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientTrustCertsFilePath|  The path to trusted certificates used by the Pulsar proxy to authenticate with Pulsar brokers ||
-|superUserRoles|  Role names that are treated as "super-users," meaning that they will be able to perform all admin ||
-|forwardAuthorizationCredentials| Whether client authorization credentials are forwarded to the broker for re-authorization. Authentication must be enabled via authenticationEnabled=true for this to take effect.  |false|
-|maxConcurrentInboundConnections| Max concurrent inbound connections. The proxy will reject requests beyond that. |10000|
-|maxConcurrentLookupRequests| Max concurrent outbound connections. The proxy will error out requests beyond that. |50000|
-|tlsEnabledInProxy| Whether TLS is enabled for the proxy  |false|
-|tlsEnabledWithBroker|  Whether TLS is enabled when communicating with Pulsar brokers |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-|tlsTrustCertsFilePath| Path for the trusted TLS certificate pem file ||
-|tlsHostnameVerificationEnabled|  Whether the hostname is validated when the proxy creates a TLS connection with brokers  |false|
-|tlsRequireTrustedClientCertOnConnect|  Whether client certificates are required for TLS. Connections are rejected if the client certificate isn’t trusted. |false|
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/administration-stats.md b/site2/website/versioned_docs/version-2.1.1-incubating/administration-stats.md
deleted file mode 100644
index 2ccd73c67f9c4..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/administration-stats.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-id: administration-stats
-title: Pulsar stats
-sidebar_label: "Pulsar statistics"
----
-
-## Partitioned topics
-
-|Stat|Description|
-|---|---|
-|msgRateIn| The sum of publish rates of all local and replication publishers in messages per second.|
-|msgThroughputIn| Same as msgRateIn but in bytes per second instead of messages per second.|
-|msgRateOut| The sum of dispatch rates of all local and replication consumers in messages per second.|
-|msgThroughputOut| Same as msgRateOut but in bytes per second instead of messages per second.|
-|averageMsgSize| Average message size, in bytes, from this publisher within the last interval.|
-|storageSize| The sum of storage size of the ledgers for this topic.|
-|publishers| The list of all local publishers into the topic. Publishers can be anywhere from zero to thousands.|
-|producerId| Internal identifier for this producer on this topic.|
-|producerName|  Internal identifier for this producer, generated by the client library.|
-|address| IP address and source port for the connection of this producer.|
-|connectedSince| Timestamp this producer is created or last reconnected.|
-|subscriptions| The list of all local subscriptions to the topic.|
-|my-subscription| The name of this subscription (client defined).|
-|msgBacklog| The count of messages in backlog for this subscription.|
-|type| This subscription type.|
-|msgRateExpired| The rate at which messages are discarded instead of dispatched from this subscription due to TTL.|
-|consumers| The list of connected consumers for this subscription.|
-|consumerName| Internal identifier for this consumer, generated by the client library.|
-|availablePermits| The number of messages this consumer has space for in the listen queue of client library. A value of 0 means the queue of client library is full and receive() is not being called. A nonzero value means this consumer is ready to be dispatched messages.|
-|replication| This section gives the stats for cross-colo replication of this topic.|
-|replicationBacklog| The outbound replication backlog in messages.|
-|connected| Whether the outbound replicator is connected.|
-|replicationDelayInSeconds| How long the oldest message has been waiting to be sent through the connection, if connected is true.|
-|inboundConnection| The IP and port of the broker in the publisher connection of remote cluster to this broker. |
-|inboundConnectedSince| The TCP connection being used to publish messages to the remote cluster. If no local publishers are connected, this connection is automatically closed after a minute.|
-
-
-## Topics
-
-|Stat|Description|
-|---|---|
-|entriesAddedCounter| Messages published since this broker loads this topic.|
-|numberOfEntries| Total number of messages being tracked.|
-|totalSize| Total storage size in bytes of all messages.|
-|currentLedgerEntries| Count of messages written to the ledger currently open for writing.|
-|currentLedgerSize| Size in bytes of messages written to ledger currently open for writing.|
-|lastLedgerCreatedTimestamp| Time when last ledger is created.|
-|lastLedgerCreationFailureTimestamp| Time when last ledger is failed.|
-|waitingCursorsCount| How many cursors are caught up and waiting for a new message to be published.|
-|pendingAddEntriesCount| How many messages have (asynchronous) write requests you are waiting on completion.|
-|lastConfirmedEntry| The ledgerid:entryid of the last message successfully written. If the entryid is -1, then the ledger is opened or is being currently opened but has no entries written yet.|
-|state| The state of the cursor ledger. Open means you have a cursor ledger for saving updates of the markDeletePosition.|
-|ledgers| The ordered list of all ledgers for this topic holding its messages.|
-|cursors| The list of all cursors on this topic. Every subscription you saw in the topic stats has one.|
-|markDeletePosition| The ack position: the last message the subscriber acknowledges receiving.|
-|readPosition| The latest position of subscriber for reading message.|
-|waitingReadOp| This is true when the subscription reads the latest message that is published to the topic and waits on new messages to be published.|
-|pendingReadOps| The counter for how many outstanding read requests to the BookKeepers you have in progress.|
-|messagesConsumedCounter| Number of messages this cursor acks since this broker loads this topic.|
-|cursorLedger| The ledger used to persistently store the current markDeletePosition.|
-|cursorLedgerLastEntry| The last entryid used to persistently store the current markDeletePosition.|
-|individuallyDeletedMessages| If Acks are done out of order, shows the ranges of messages Acked between the markDeletePosition and the read-position.|
-|lastLedgerSwitchTimestamp| The last time the cursor ledger is rolled over.|
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/administration-zk-bk.md b/site2/website/versioned_docs/version-2.1.1-incubating/administration-zk-bk.md
deleted file mode 100644
index 505a3b5b51657..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/administration-zk-bk.md
+++ /dev/null
@@ -1,377 +0,0 @@
----
-id: administration-zk-bk
-title: ZooKeeper and BookKeeper administration
-sidebar_label: "ZooKeeper and BookKeeper"
----
-
-Pulsar relies on two external systems for essential tasks:
-
-* [ZooKeeper](https://zookeeper.apache.org/) is responsible for a wide variety of configuration-related and coordination-related tasks.
-* [BookKeeper](http://bookkeeper.apache.org/) is responsible for [persistent storage](concepts-architecture-overview.md#persistent-storage) of message data.
-
-ZooKeeper and BookKeeper are both open-source [Apache](https://www.apache.org/) projects.
-
-> Skip to the [How Pulsar uses ZooKeeper and BookKeeper](#how-pulsar-uses-zookeeper-and-bookkeeper) section below for a more schematic explanation of the role of these two systems in Pulsar.
-
-
-## ZooKeeper
-
-Each Pulsar instance relies on two separate ZooKeeper quorums.
-
-* [Local ZooKeeper](#deploy-local-zookeeper) operates at the cluster level and provides cluster-specific configuration management and coordination. Each Pulsar cluster needs to have a dedicated ZooKeeper cluster.
-* [Configuration Store](#deploy-configuration-store) operates at the instance level and provides configuration management for the entire system (and thus across clusters). An independent cluster of machines or the same machines that local ZooKeeper uses can provide the configuration store quorum. 
-
-### Deploy local ZooKeeper
-
-ZooKeeper manages a variety of essential coordination-related and configuration-related tasks for Pulsar.
-
-To deploy a Pulsar instance, you need to stand up one local ZooKeeper cluster *per Pulsar cluster*.
-
-To begin, add all ZooKeeper servers to the quorum configuration specified in the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. Add a `server.N` line for each node in the cluster to the configuration, where `N` is the number of the ZooKeeper node. The following is an example for a three-node cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-On each host, you need to specify the node ID in `myid` file of each node, which is in `data/zookeeper` folder of each server by default (you can change the file location via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
-
-> See the [Multi-server setup guide](https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup) in the ZooKeeper documentation for detailed information on `myid` and more.
-
-
-On a ZooKeeper server at `zk1.us-west.example.com`, for example, you can set the `myid` value like this:
-
-```shell
-
-$ mkdir -p data/zookeeper
-$ echo 1 > data/zookeeper/myid
-
-```
-
-On `zk2.us-west.example.com` the command is `echo 2 > data/zookeeper/myid` and so on.
-
-Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```shell
-
-$ bin/pulsar-daemon start zookeeper
-
-```
-
-### Deploy configuration store
-
-The ZooKeeper cluster configured and started up in the section above is a *local* ZooKeeper cluster that you can use to manage a single Pulsar cluster. In addition to a local cluster, however, a full Pulsar instance also requires a configuration store for handling some instance-level configuration and coordination tasks.
-
-If you deploy a [single-cluster](#single-cluster-pulsar-instance) instance, you do not need a separate cluster for the configuration store. If, however, you deploy a [multi-cluster](#multi-cluster-pulsar-instance) instance, you need to stand up a separate ZooKeeper cluster for configuration tasks.
-
-#### Single-cluster Pulsar instance
-
-If your Pulsar instance consists of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but run on different TCP ports.
-
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorum uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-
-```
-
-As before, create the `myid` files for each server on `data/global-zookeeper/myid`.
-
-#### Multi-cluster Pulsar instance
-
-When you deploy a global Pulsar instance, with clusters distributed across different geographical regions, the configuration store serves as a highly available and strongly consistent metadata store that can tolerate failures and partitions spanning whole regions.
-
-The key here is to make sure the ZK quorum members are spread across at least 3 regions and that other regions run as observers.
-
-Again, given the very low expected load on the configuration store servers, you can share the same hosts used for the local ZooKeeper quorum.
-
-For example, you can assume a Pulsar instance with the following clusters `us-west`, `us-east`, `us-central`, `eu-central`, `ap-south`. Also you can assume, each cluster has its own local ZK servers named such as
-
-```
-
-zk[1-3].${CLUSTER}.example.com
-
-```
-
-In this scenario you want to pick the quorum participants from few clusters and let all the others be ZK observers. For example, to form a 7 servers quorum, you can pick 3 servers from `us-west`, 2 from `us-central` and 2 from `us-east`.
-
-This guarantees that writes to configuration store is possible even if one of these regions is unreachable.
-
-The ZK configuration in all the servers looks like:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-server.4=zk1.us-central.example.com:2185:2186
-server.5=zk2.us-central.example.com:2185:2186
-server.6=zk3.us-central.example.com:2185:2186:observer
-server.7=zk1.us-east.example.com:2185:2186
-server.8=zk2.us-east.example.com:2185:2186
-server.9=zk3.us-east.example.com:2185:2186:observer
-server.10=zk1.eu-central.example.com:2185:2186:observer
-server.11=zk2.eu-central.example.com:2185:2186:observer
-server.12=zk3.eu-central.example.com:2185:2186:observer
-server.13=zk1.ap-south.example.com:2185:2186:observer
-server.14=zk2.ap-south.example.com:2185:2186:observer
-server.15=zk3.ap-south.example.com:2185:2186:observer
-
-```
-
-Additionally, ZK observers need to have:
-
-```properties
-
-peerType=observer
-
-```
-
-##### Start the service
-
-Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
-
-```shell
-
-$ bin/pulsar-daemon start configuration-store
-
-```
-
-### ZooKeeper configuration
-
-In Pulsar, ZooKeeper configuration is handled by two separate configuration files in the `conf` directory of your Pulsar installation:
-* The `conf/zookeeper.conf` file handles the configuration for local ZooKeeper.
-* The `conf/global-zookeeper.conf` file handles the configuration for configuration store.
-See [parameters](reference-configuration.md#zookeeper) for more details.
-
-#### Configure batching operations
-Using the batching operations reduces the remote procedure call (RPC) traffic between ZooKeeper client and servers. It also reduces the number of write transactions, because each batching operation corresponds to a single ZooKeeper transaction, containing multiple read and write operations.
-
-The following figure demonstrates a basic benchmark of batching read/write operations that can be requested to ZooKeeper in one second:
-
-![Zookeeper batching benchmark](/assets/zookeeper-batching.png)
-
-To enable batching operations, set the [`metadataStoreBatchingEnabled`](reference-configuration.md#broker) parameter to `true` on the broker side.
-
-
-## BookKeeper
-
-BookKeeper stores all durable messages in Pulsar. BookKeeper is a distributed [write-ahead log](https://en.wikipedia.org/wiki/Write-ahead_logging) WAL system that guarantees read consistency of independent message logs calls ledgers. Individual BookKeeper servers are also called *bookies*.
-
-> To manage message persistence, retention, and expiry in Pulsar, refer to [cookbook](cookbooks-retention-expiry.md).
-
-### Hardware requirements
-
-Bookie hosts store message data on disk. To provide optimal performance, ensure that the bookies have a suitable hardware configuration. The following are two key dimensions of bookie hardware capacity:
-
-- Disk I/O capacity read/write
-- Storage capacity
-
-Message entries written to bookies are always synced to disk before returning an acknowledgement to the Pulsar broker by default. To ensure low write latency, BookKeeper is designed to use multiple devices:
-
-- A **journal** to ensure durability. For sequential writes, it is critical to have fast [fsync](https://linux.die.net/man/2/fsync) operations on bookie hosts. Typically, small and fast [solid-state drives](https://en.wikipedia.org/wiki/Solid-state_drive) (SSDs) should suffice, or [hard disk drives](https://en.wikipedia.org/wiki/Hard_disk_drive) (HDDs) with a [RAID](https://en.wikipedia.org/wiki/RAID) controller and a battery-backed write cache. Both solutions can reach fsync latency of ~0.4 ms.
-- A **ledger storage device** stores data. Writes happen in the background, so write I/O is not a big concern. Reads happen sequentially most of the time and the backlog is drained only in case of consumer drain. To store large amounts of data, a typical configuration involves multiple HDDs with a RAID controller.
-
-### Configure BookKeeper
-
-You can configure BookKeeper bookies using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. When you configure each bookie, ensure that the [`zkServers`](reference-configuration.md#bookkeeper-zkServers) parameter is set to the connection string for local ZooKeeper of the Pulsar cluster.
-
-The minimum configuration changes required in `conf/bookkeeper.conf` are as follows:
-
-:::note
-
-Set `journalDirectory` and `ledgerDirectories` carefully. It is difficilt to change them later.
-
-:::
-
-```properties
-
-# Change to point to journal disk mount point
-journalDirectory=data/bookkeeper/journal
-
-# Point to ledger storage disk mount point
-ledgerDirectories=data/bookkeeper/ledgers
-
-# Point to local ZK quorum
-zkServers=zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181
-
-#It is recommended to set this parameter. Otherwise, BookKeeper can't start normally in certain environments (for example, Huawei Cloud).
-advertisedAddress=
-
-```
-
-To change the ZooKeeper root path that BookKeeper uses, use `zkLedgersRootPath=/MY-PREFIX/ledgers` instead of `zkServers=localhost:2181/MY-PREFIX`.
-
-> For more information about BookKeeper, refer to the official [BookKeeper docs](http://bookkeeper.apache.org).
-
-### Deploy BookKeeper
-
-BookKeeper provides [persistent message storage](concepts-architecture-overview.md#persistent-storage) for Pulsar. Each Pulsar broker has its own cluster of bookies. The BookKeeper cluster shares a local ZooKeeper quorum with the Pulsar cluster.
-
-### Start bookies manually
-
-You can start a bookie in the foreground or as a background daemon.
-
-To start a bookie in the foreground, use the [`bookkeeper`](reference-cli-tools.md#bookkeeper) CLI tool:
-
-```bash
-
-$ bin/bookkeeper bookie
-
-```
-
-To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start bookie
-
-```
-
-You can verify whether the bookie works properly with the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
-
-```shell
-
-$ bin/bookkeeper shell bookiesanity
-
-```
-
-When you use this command, you create a new ledger on the local bookie, write a few entries, read them back and finally delete the ledger.
-
-### Decommission bookies cleanly
-
-Before you decommission a bookie, you need to check your environment and meet the following requirements.
-
-1. Ensure the state of your cluster supports decommissioning the target bookie. Check if `EnsembleSize >= Write Quorum >= Ack Quorum` is `true` with one less bookie.
-
-2. Ensure the target bookie is listed after using the `listbookies` command.
-
-3. Ensure that no other process is ongoing (upgrade etc).
-
-And then you can decommission bookies safely. To decommission bookies, complete the following steps.
-
-1. Log in to the bookie node, check if there are underreplicated ledgers. The decommission command force to replicate the underreplicated ledgers.
-`$ bin/bookkeeper shell listunderreplicated`
-
-2. Stop the bookie by killing the bookie process. Make sure that no liveness/readiness probes setup for the bookies to spin them back up if you deploy it in a Kubernetes environment.
-
-3. Run the decommission command.
-   - If you have logged in to the node to be decommissioned, you do not need to provide `-bookieid`.
-   - If you are running the decommission command for the target bookie node from another bookie node, you should mention the target bookie ID in the arguments for `-bookieid`
-   `$ bin/bookkeeper shell decommissionbookie`
-   or
-   `$ bin/bookkeeper shell decommissionbookie -bookieid `
-
-4. Validate that no ledgers are on the decommissioned bookie.   
-`$ bin/bookkeeper shell listledgers -bookieid `
-
-You can run the following command to check if the bookie you have decommissioned is listed in the bookies list:
-
-```bash
-
-./bookkeeper shell listbookies -rw -h
-./bookkeeper shell listbookies -ro -h
-
-```
-
-## BookKeeper persistence policies
-
-In Pulsar, you can set *persistence policies* at the namespace level, which determines how BookKeeper handles persistent storage of messages. Policies determine four things:
-
-* The number of acks (guaranteed copies) to wait for each ledger entry.
-* The number of bookies to use for a topic.
-* The number of writes to make for each ledger entry.
-* The throttling rate for mark-delete operations.
-
-### Set persistence policies
-
-You can set persistence policies for BookKeeper at the [namespace](reference-terminology.md#namespace) level.
-
-#### Pulsar-admin
-
-Use the [`set-persistence`](reference-pulsar-admin.md#namespaces-set-persistence) subcommand and specify a namespace as well as any policies that you want to apply. The available flags are:
-
-Flag | Description | Default
-:----|:------------|:-------
-`-a`, `--bookkeeper-ack-quorum` | The number of acks (guaranteed copies) to wait on for each entry | 0
-`-e`, `--bookkeeper-ensemble` | The number of [bookies](reference-terminology.md#bookie) to use for topics in the namespace | 0
-`-w`, `--bookkeeper-write-quorum` | The number of writes to make for each entry | 0
-`-r`, `--ml-mark-delete-max-rate` | Throttling rate for mark-delete operations (0 means no throttle) | 0
-
-The following is an example:
-
-```shell
-
-$ pulsar-admin namespaces set-persistence my-tenant/my-ns \
-  --bookkeeper-ack-quorum 3 \
-  --bookkeeper-ensemble 2
-
-```
-
-#### REST API
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
-
-#### Java
-
-```java
-
-int bkEnsemble = 2;
-int bkQuorum = 3;
-int bkAckQuorum = 2;
-double markDeleteRate = 0.7;
-PersistencePolicies policies =
-  new PersistencePolicies(ensemble, quorum, ackQuorum, markDeleteRate);
-admin.namespaces().setPersistence(namespace, policies);
-
-```
-
-### List persistence policies
-
-You can see which persistence policy currently applies to a namespace.
-
-#### Pulsar-admin
-
-Use the [`get-persistence`](reference-pulsar-admin.md#namespaces-get-persistence) subcommand and specify the namespace.
-
-The following is an example:
-
-```shell
-
-$ pulsar-admin namespaces get-persistence my-tenant/my-ns
-{
-  "bookkeeperEnsemble": 1,
-  "bookkeeperWriteQuorum": 1,
-  "bookkeeperAckQuorum", 1,
-  "managedLedgerMaxMarkDeleteRate": 0
-}
-
-```
-
-#### REST API
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
-
-#### Java
-
-```java
-
-PersistencePolicies policies = admin.namespaces().getPersistence(namespace);
-
-```
-
-## How Pulsar uses ZooKeeper and BookKeeper
-
-This diagram illustrates the role of ZooKeeper and BookKeeper in a Pulsar cluster:
-
-![ZooKeeper and BookKeeper](/assets/pulsar-system-architecture.png)
-
-Each Pulsar cluster consists of one or more message brokers. Each broker relies on an ensemble of bookies.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-cpp.md
deleted file mode 100644
index ddb12551440fe..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-cpp.md
+++ /dev/null
@@ -1,210 +0,0 @@
----
-id: client-libraries-cpp
-title: The Pulsar C++ client
-sidebar_label: "C++"
-original_id: client-libraries-cpp
----
-
-## Supported platforms
-
-The Pulsar C++ client has been successfully tested on **MacOS** and **Linux**.
-
-## Linux
-
-### Install
-
-> Since the 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can choose to download
-> and install those packages instead of building them yourself.
-
-#### RPM
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:rpm:client@) | [asc](@pulsar:rpm:client@.asc), [sha512](@pulsar:rpm:client@.sha512) |
-| [client-debuginfo](@pulsar:rpm:client-debuginfo@) | [asc](@pulsar:rpm:client-debuginfo@.asc),  [sha512](@pulsar:rpm:client-debuginfo@.sha512) |
-| [client-devel](@pulsar:rpm:client-devel@) | [asc](@pulsar:rpm:client-devel@.asc),  [sha512](@pulsar:rpm:client-devel@.sha512) |
-
-To install a RPM package, download the RPM packages and install them using the following command:
-
-```bash
-
-$ rpm -ivh apache-pulsar-client*.rpm
-
-```
-
-#### DEB
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:deb:client@) | [asc](@pulsar:deb:client@.asc), [sha512](@pulsar:deb:client@.sha512) |
-| [client-devel](@pulsar:deb:client-devel@) | [asc](@pulsar:deb:client-devel@.asc),  [sha512](@pulsar:deb:client-devel@.sha512) |
-
-To install a DEB package, download the DEB packages and install them using the following command:
-
-```bash
-
-$ apt-install apache-pulsar-client*.deb
-
-```
-
-### Build
-
-> If you want to build RPM and Debian packages off latest master, you can follow the instructions
-> below to do so. All the instructions are run at the root directory of your cloned Pulsar
-> repo.
-
-There are recipes that build RPM and Debian packages containing a
-statically linked `libpulsar.so` / `libpulsar.a` with all the required
-dependencies.
-
-To build the C++ library packages, first build the Java packages:
-
-```shell
-
-mvn install -DskipTests
-
-```
-
-#### RPM
-
-```shell
-
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
-
-```
-
-This will build the RPM inside a Docker container and it will leave the RPMs
-in `pulsar-client-cpp/pkg/rpm/RPMS/x86_64/`.
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` |
-| pulsar-client-devel | Static library `libpulsar.a` and C++ and C headers |
-| pulsar-client-debuginfo | Debug symbols for `libpulsar.so` |
-
-#### Deb
-
-To build Debian packages:
-
-```shell
-
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
-
-```
-
-Debian packages will be created at `pulsar-client-cpp/pkg/deb/BUILD/DEB/`
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` |
-| pulsar-client-dev | Static library `libpulsar.a` and C++ and C headers |
-
-## MacOS
-
-Use the [Homebrew](https://brew.sh/) supplied recipe to build the Pulsar
-client lib on MacOS.
-
-```shell
-
-brew install https://raw.githubusercontent.com/apache/incubator-pulsar/master/pulsar-client-cpp/homebrew/libpulsar.rb
-
-```
-
-If using Python 3 on MacOS, add the flag `--with-python3` to the above command.
-
-This will install the package with the library and headers.
-
-## Connection URLs
-
-
-To connect to Pulsar using client libraries, you need to specify a Pulsar protocol URL.
-
-Pulsar protocol URLs are assigned to specific clusters, use the pulsar URI scheme and have a default port of 6650. Here’s an example for localhost:
-
-```http
-
-pulsar://localhost:6650
-
-```
-
-A URL for a production Pulsar cluster may look something like this:
-
-```http
-
-pulsar://pulsar.us-west.example.com:6650
-
-```
-
-If you’re using TLS authentication, the URL will look like something like this:
-
-```http
-
-pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-## Consumer
-
-```c++
-
-Client client("pulsar://localhost:6650");
-
-Consumer consumer;
-Result result = client.subscribe("my-topic", "my-subscribtion-name", consumer);
-if (result != ResultOk) {
-    LOG_ERROR("Failed to subscribe: " << result);
-    return -1;
-}
-
-Message msg;
-
-while (true) {
-    consumer.receive(msg);
-    LOG_INFO("Received: " << msg
-            << "  with payload '" << msg.getDataAsString() << "'");
-
-    consumer.acknowledge(msg);
-}
-
-client.close();
-
-```
-
-## Producer
-
-```c++
-
-Client client("pulsar://localhost:6650");
-
-Producer producer;
-Result result = client.createProducer("my-topic", producer);
-if (result != ResultOk) {
-    LOG_ERROR("Error creating producer: " << result);
-    return -1;
-}
-
-// Publish 10 messages to the topic
-for (int i = 0; i < 10; i++){
-    Message msg = MessageBuilder().setContent("my-message").build();
-    Result res = producer.send(msg);
-    LOG_INFO("Message sent: " << res);
-}
-client.close();
-
-```
-
-## Authentication
-
-```cpp
-
-ClientConfiguration config = ClientConfiguration();
-config.setUseTls(true);
-config.setTlsTrustCertsFilePath("/path/to/cacert.pem");
-config.setTlsAllowInsecureConnection(false);
-config.setAuth(pulsar::AuthTls::create(
-            "/path/to/client-cert.pem", "/path/to/client-key.pem"););
-
-Client client("pulsar+ssl://my-broker.com:6651", config);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-go.md b/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-go.md
deleted file mode 100644
index d3c2fa5d2fc85..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-go.md
+++ /dev/null
@@ -1,1063 +0,0 @@
----
-id: client-libraries-go
-title: Pulsar Go client
-sidebar_label: "Go"
----
-
-> Tips: The CGo client has been deprecated since version 2.7.0.
-
-You can use Pulsar [Go client](https://github.com/apache/pulsar-client-go) to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Go (aka Golang).
-
-> **API docs available as well**  
-> For standard API docs, consult the [Godoc](https://godoc.org/github.com/apache/pulsar-client-go/pulsar).
-
-
-## Installation
-
-### Install go package
-
-You can get the `pulsar` library by using `go get` or use it with `go module`.  
-
-Download the library of Go client to local environment:
-
-```bash
-
-$ go get -u "github.com/apache/pulsar-client-go/pulsar"
-
-```
-
-Once installed locally, you can import it into your project:
-
-```go
-
-import "github.com/apache/pulsar-client-go/pulsar"
-
-```
-
-Use with go module:
-
-```bash
-
-$ mkdir test_dir && cd test_dir
-
-```
-
-Write a sample script in the `test_dir` directory (such as `test_example.go`) and write `package main` at the beginning of the file.
-
-```bash
-
-$ go mod init test_dir 
-$ go mod tidy && go mod download
-$ go build test_example.go
-$ ./test_example
-
-```
-
-## Connection URLs
-
-To connect to Pulsar using client libraries, you need to specify a [Pulsar protocol](developing-binary-protocol.md) URL.
-
-Pulsar protocol URLs are assigned to specific clusters, use the `pulsar` scheme and have a default port of 6650. Here's an example for `localhost`:
-
-```http
-
-pulsar://localhost:6650
-
-```
-
-If you have multiple brokers, you can set the URL as below.
-
-```
-
-pulsar://localhost:6550,localhost:6651,localhost:6652
-
-```
-
-A URL for a production Pulsar cluster may look something like this:
-
-```http
-
-pulsar://pulsar.us-west.example.com:6650
-
-```
-
-If you're using [TLS](security-tls-authentication.md) authentication, the URL will look like something like this:
-
-```http
-
-pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-## Create a client
-
-In order to interact with Pulsar, you'll first need a `Client` object. You can create a client object using the `NewClient` function, passing in a `ClientOptions` object (more on configuration [below](#client-configuration)). Here's an example:
-
-```go
-
-import (
-	"log"
-	"time"
-
-	"github.com/apache/pulsar-client-go/pulsar"
-)
-
-func main() {
-	client, err := pulsar.NewClient(pulsar.ClientOptions{
-		URL:               "pulsar://localhost:6650",
-		OperationTimeout:  30 * time.Second,
-		ConnectionTimeout: 30 * time.Second,
-	})
-	if err != nil {
-		log.Fatalf("Could not instantiate Pulsar client: %v", err)
-	}
-
-	defer client.Close()
-}
-
-```
-
-If you have multiple brokers, you can initiate a client object as below.
-
-```go
-
-import (
-    "log"
-    "time"
-    "github.com/apache/pulsar-client-go/pulsar"
-)
-
-func main() {
-    client, err := pulsar.NewClient(pulsar.ClientOptions{
-        URL: "pulsar://localhost:6650,localhost:6651,localhost:6652",
-        OperationTimeout:  30 * time.Second,
-        ConnectionTimeout: 30 * time.Second,
-    })
-    if err != nil {
-        log.Fatalf("Could not instantiate Pulsar client: %v", err)
-    }
-
-    defer client.Close()
-}
-
-```
-
-The following configurable parameters are available for Pulsar clients:
-
- Name | Description | Default
-| :-------- | :---------- |:---------- |
-| URL | Configure the service URL for the Pulsar service.

    If you have multiple brokers, you can set multiple Pulsar cluster addresses for a client. 

    This parameter is **required**. |None |
-| ConnectionTimeout | Timeout for the establishment of a TCP connection | 30s |
-| OperationTimeout| Set the operation timeout. Producer-create, subscribe and unsubscribe operations will be retried until this interval, after which the operation will be marked as failed| 30s|
-| Authentication | Configure the authentication provider. Example: `Authentication: NewAuthenticationTLS("my-cert.pem", "my-key.pem")` | no authentication |
-| TLSTrustCertsFilePath | Set the path to the trusted TLS certificate file | |
-| TLSAllowInsecureConnection | Configure whether the Pulsar client accept untrusted TLS certificate from broker | false |
-| TLSValidateHostname | Configure whether the Pulsar client verify the validity of the host name from broker | false |
-| ListenerName | Configure the net model for VPC users to connect to the Pulsar broker |  |
-| MaxConnectionsPerBroker | Max number of connections to a single broker that is kept in the pool | 1 |
-| CustomMetricsLabels | Add custom labels to all the metrics reported by this client instance |  |
-| Logger | Configure the logger used by the client | logrus.StandardLogger |
-
-## Producers
-
-Pulsar producers publish messages to Pulsar topics. You can [configure](#producer-configuration) Go producers using a `ProducerOptions` object. Here's an example:
-
-```go
-
-producer, err := client.CreateProducer(pulsar.ProducerOptions{
-	Topic: "my-topic",
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-
-_, err = producer.Send(context.Background(), &pulsar.ProducerMessage{
-	Payload: []byte("hello"),
-})
-
-defer producer.Close()
-
-if err != nil {
-	fmt.Println("Failed to publish message", err)
-}
-fmt.Println("Published message")
-
-```
-
-### Producer operations
-
-Pulsar Go producers have the following methods available:
-
-Method | Description | Return type
-:------|:------------|:-----------
-`Topic()` | Fetches the producer's [topic](reference-terminology.md#topic)| `string`
-`Name()` | Fetches the producer's name | `string`
-`Send(context.Context, *ProducerMessage)` | Publishes a [message](#messages) to the producer's topic. This call will block until the message is successfully acknowledged by the Pulsar broker, or an error will be thrown if the timeout set using the `SendTimeout` in the producer's [configuration](#producer-configuration) is exceeded. | (MessageID, error)
-`SendAsync(context.Context, *ProducerMessage, func(MessageID, *ProducerMessage, error))`| Send a message, this call will be blocking until is successfully acknowledged by the Pulsar broker. | 
-`LastSequenceID()` | Get the last sequence id that was published by this producer. his represent either the automatically assigned or custom sequence id (set on the ProducerMessage) that was published and acknowledged by the broker. | int64
-`Flush()`| Flush all the messages buffered in the client and wait until all messages have been successfully persisted. | error
-`Close()` | Closes the producer and releases all resources allocated to it. If `Close()` is called then no more messages will be accepted from the publisher. This method will block until all pending publish requests have been persisted by Pulsar. If an error is thrown, no pending writes will be retried. | 
-
-### Producer Example
-
-#### How to use message router in producer
-
-```go
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: serviceURL,
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-defer client.Close()
-
-// Only subscribe on the specific partition
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-	Topic:            "my-partitioned-topic-partition-2",
-	SubscriptionName: "my-sub",
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-defer consumer.Close()
-
-producer, err := client.CreateProducer(pulsar.ProducerOptions{
-	Topic: "my-partitioned-topic",
-	MessageRouter: func(msg *ProducerMessage, tm TopicMetadata) int {
-		fmt.Println("Routing message ", msg, " -- Partitions: ", tm.NumPartitions())
-		return 2
-	},
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-defer producer.Close()
-
-```
-
-#### How to use schema interface in producer
-
-```go
-
-type testJSON struct {
-	ID   int    `json:"id"`
-	Name string `json:"name"`
-}
-
-```
-
-```go
-
-var (
-	exampleSchemaDef = "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\"," +
-		"\"fields\":[{\"name\":\"ID\",\"type\":\"int\"},{\"name\":\"Name\",\"type\":\"string\"}]}"
-)
-
-```
-
-```go
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: "pulsar://localhost:6650",
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer client.Close()
-
-properties := make(map[string]string)
-properties["pulsar"] = "hello"
-jsonSchemaWithProperties := NewJSONSchema(exampleSchemaDef, properties)
-producer, err := client.CreateProducer(ProducerOptions{
-	Topic:  "jsonTopic",
-	Schema: jsonSchemaWithProperties,
-})
-assert.Nil(t, err)
-
-_, err = producer.Send(context.Background(), &ProducerMessage{
-	Value: &testJSON{
-		ID:   100,
-		Name: "pulsar",
-	},
-})
-if err != nil {
-	log.Fatal(err)
-}
-producer.Close()
-
-```
-
-#### How to use delay relative in producer
-
-```go
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: "pulsar://localhost:6650",
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer client.Close()
-
-topicName := newTopicName()
-producer, err := client.CreateProducer(pulsar.ProducerOptions{
-    Topic:           topicName,
-    DisableBatching: true,
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer producer.Close()
-
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-	Topic:            topicName,
-	SubscriptionName: "subName",
-	Type:             Shared,
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer consumer.Close()
-
-ID, err := producer.Send(context.Background(), &pulsar.ProducerMessage{
-	Payload:      []byte(fmt.Sprintf("test")),
-	DeliverAfter: 3 * time.Second,
-})
-if err != nil {
-	log.Fatal(err)
-}
-fmt.Println(ID)
-
-ctx, canc := context.WithTimeout(context.Background(), 1*time.Second)
-msg, err := consumer.Receive(ctx)
-if err != nil {
-	log.Fatal(err)
-}
-fmt.Println(msg.Payload())
-canc()
-
-ctx, canc = context.WithTimeout(context.Background(), 5*time.Second)
-msg, err = consumer.Receive(ctx)
-if err != nil {
-	log.Fatal(err)
-}
-fmt.Println(msg.Payload())
-canc()
-
-```
-
-#### How to use Prometheus metrics in producer
-
-Pulsar Go client registers client metrics using Prometheus. This section demonstrates how to create a simple Pulsar producer application that exposes Prometheus metrics via HTTP.
-
-1. Write a simple producer application.
-
-```go
-
-// Create a Pulsar client
-client, err := pulsar.NewClient(pulsar.ClientOptions{
-	URL: "pulsar://localhost:6650",
-})
-if err != nil {
-    log.Fatal(err)
-}
-
-defer client.Close()
-
-// Start a separate goroutine for Prometheus metrics
-// In this case, Prometheus metrics can be accessed via http://localhost:2112/metrics
-go func() {
-    prometheusPort := 2112
-    log.Printf("Starting Prometheus metrics at http://localhost:%v/metrics\n", prometheusPort)
-    http.Handle("/metrics", promhttp.Handler())
-    err = http.ListenAndServe(":"+strconv.Itoa(prometheusPort), nil)
-    if err != nil {
-        log.Fatal(err)
-    }
-}()
-
-// Create a producer
-producer, err := client.CreateProducer(pulsar.ProducerOptions{
-    Topic: "topic-1",
-})
-if err != nil {
-    log.Fatal(err)
-}
-
-defer producer.Close()
-
-ctx := context.Background()
-
-// Write your business logic here
-// In this case, you build a simple Web server. You can produce messages by requesting http://localhost:8082/produce
-webPort := 8082
-http.HandleFunc("/produce", func(w http.ResponseWriter, r *http.Request) {
-    msgId, err := producer.Send(ctx, &pulsar.ProducerMessage{
-        Payload: []byte(fmt.Sprintf("hello world")),
-    })
-    if err != nil {
-        log.Fatal(err)
-    } else {
-        log.Printf("Published message: %v", msgId)
-        fmt.Fprintf(w, "Published message: %v", msgId)
-    }
-})
-
-err = http.ListenAndServe(":"+strconv.Itoa(webPort), nil)
-if err != nil {
-    log.Fatal(err)
-}
-
-```
-
-2. To scrape metrics from applications, configure a local running Prometheus instance using a configuration file (`prometheus.yml`).
-
-```yaml
-
-scrape_configs:
-- job_name: pulsar-client-go-metrics
-  scrape_interval: 10s
-  static_configs:
-  - targets:
-  - localhost:2112
-
-```
-
-Now you can query Pulsar client metrics on Prometheus.
-
-### Producer configuration
-
- Name | Description | Default
-| :-------- | :---------- |:---------- |
-| Topic | Topic specify the topic this consumer will subscribe to. This argument is required when constructing the reader. | |
-| Name | Name specify a name for the producer. If not assigned, the system will generate a globally unique name which can be access with Producer.ProducerName(). | | 
-| Properties | Properties attach a set of application defined properties to the producer This properties will be visible in the topic stats | |
-| SendTimeout | SendTimeout set the timeout for a message that is not acknowledged by the server | 30s |
-| DisableBlockIfQueueFull | DisableBlockIfQueueFull control whether Send and SendAsync block if producer's message queue is full | false |
-| MaxPendingMessages| MaxPendingMessages set the max size of the queue holding the messages pending to receive an acknowledgment from the broker. | |
-| HashingScheme | HashingScheme change the `HashingScheme` used to chose the partition on where to publish a particular message. | JavaStringHash |
-| CompressionType | CompressionType set the compression type for the producer. | not compressed | 
-| CompressionLevel | Define the desired compression level. Options: Default, Faster and Better | Default  | 
-| MessageRouter | MessageRouter set a custom message routing policy by passing an implementation of MessageRouter | |
-| DisableBatching | DisableBatching control whether automatic batching of messages is enabled for the producer. | false |
-| BatchingMaxPublishDelay | BatchingMaxPublishDelay set the time period within which the messages sent will be batched | 1ms |
-| BatchingMaxMessages | BatchingMaxMessages set the maximum number of messages permitted in a batch. | 1000 | 
-| BatchingMaxSize | BatchingMaxSize sets the maximum number of bytes permitted in a batch. | 128KB | 
-| Schema |  Schema set a custom schema type by passing an implementation of `Schema` | bytes[] | 
-| Interceptors | A chain of interceptors. These interceptors are called at some points defined in the `ProducerInterceptor` interface. | None | 
-| MaxReconnectToBroker | MaxReconnectToBroker set the maximum retry number of reconnectToBroker | ultimate | 
-| BatcherBuilderType | BatcherBuilderType sets the batch builder type. This is used to create a batch container when batching is enabled. Options: DefaultBatchBuilder and KeyBasedBatchBuilder | DefaultBatchBuilder | 
-
-## Consumers
-
-Pulsar consumers subscribe to one or more Pulsar topics and listen for incoming messages produced on that topic/those topics. You can [configure](#consumer-configuration) Go consumers using a `ConsumerOptions` object. Here's a basic example that uses channels:
-
-```go
-
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-	Topic:            "topic-1",
-	SubscriptionName: "my-sub",
-	Type:             pulsar.Shared,
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer consumer.Close()
-
-for i := 0; i < 10; i++ {
-	msg, err := consumer.Receive(context.Background())
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Printf("Received message msgId: %#v -- content: '%s'\n",
-		msg.ID(), string(msg.Payload()))
-
-	consumer.Ack(msg)
-}
-
-if err := consumer.Unsubscribe(); err != nil {
-	log.Fatal(err)
-}
-
-```
-
-### Consumer operations
-
-Pulsar Go consumers have the following methods available:
-
-Method | Description | Return type
-:------|:------------|:-----------
-`Subscription()` | Returns the consumer's subscription name | `string`
-`Unsubcribe()` | Unsubscribes the consumer from the assigned topic. Throws an error if the unsubscribe operation is somehow unsuccessful. | `error`
-`Receive(context.Context)` | Receives a single message from the topic. This method blocks until a message is available. | `(Message, error)`
-`Chan()` | Chan returns a channel from which to consume messages. | `<-chan ConsumerMessage`
-`Ack(Message)` | [Acknowledges](reference-terminology.md#acknowledgment-ack) a message to the Pulsar [broker](reference-terminology.md#broker) | 
-`AckID(MessageID)` | [Acknowledges](reference-terminology.md#acknowledgment-ack) a message to the Pulsar [broker](reference-terminology.md#broker) by message ID | 
-`ReconsumeLater(msg Message, delay time.Duration)` | ReconsumeLater mark a message for redelivery after custom delay | 
-`Nack(Message)` | Acknowledge the failure to process a single message. | 
-`NackID(MessageID)` | Acknowledge the failure to process a single message. | 
-`Seek(msgID MessageID)` | Reset the subscription associated with this consumer to a specific message id. The message id can either be a specific message or represent the first or last messages in the topic. | `error`
-`SeekByTime(time time.Time)` | Reset the subscription associated with this consumer to a specific message publish time. | `error`
-`Close()` | Closes the consumer, disabling its ability to receive messages from the broker | 
-`Name()` | Name returns the name of consumer | `string`
-
-### Receive example
-
-#### How to use regex consumer
-
-```go
-
-client, err := pulsar.NewClient(pulsar.ClientOptions{
-    URL: "pulsar://localhost:6650",
-})
-
-defer client.Close()
-
-p, err := client.CreateProducer(pulsar.ProducerOptions{
-	Topic:           topicInRegex,
-	DisableBatching: true,
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer p.Close()
-
-topicsPattern := fmt.Sprintf("persistent://%s/foo.*", namespace)
-opts := pulsar.ConsumerOptions{
-	TopicsPattern:    topicsPattern,
-	SubscriptionName: "regex-sub",
-}
-consumer, err := client.Subscribe(opts)
-if err != nil {
-	log.Fatal(err)
-}
-defer consumer.Close()
-
-```
-
-#### How to use multi topics Consumer
-
-```go
-
-func newTopicName() string {
-	return fmt.Sprintf("my-topic-%v", time.Now().Nanosecond())
-}
-
-
-topic1 := "topic-1"
-topic2 := "topic-2"
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: "pulsar://localhost:6650",
-})
-if err != nil {
-	log.Fatal(err)
-}
-topics := []string{topic1, topic2}
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-	Topics:           topics,
-	SubscriptionName: "multi-topic-sub",
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer consumer.Close()
-
-```
-
-#### How to use consumer listener
-
-```go
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/apache/pulsar-client-go/pulsar"
-)
-
-func main() {
-	client, err := pulsar.NewClient(pulsar.ClientOptions{URL: "pulsar://localhost:6650"})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer client.Close()
-
-	channel := make(chan pulsar.ConsumerMessage, 100)
-
-	options := pulsar.ConsumerOptions{
-		Topic:            "topic-1",
-		SubscriptionName: "my-subscription",
-		Type:             pulsar.Shared,
-	}
-
-	options.MessageChannel = channel
-
-	consumer, err := client.Subscribe(options)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer consumer.Close()
-
-	// Receive messages from channel. The channel returns a struct which contains message and the consumer from where
-	// the message was received. It's not necessary here since we have 1 single consumer, but the channel could be
-	// shared across multiple consumers as well
-	for cm := range channel {
-		msg := cm.Message
-		fmt.Printf("Received message  msgId: %v -- content: '%s'\n",
-			msg.ID(), string(msg.Payload()))
-
-		consumer.Ack(msg)
-	}
-}
-
-```
-
-#### How to use consumer receive timeout
-
-```go
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: "pulsar://localhost:6650",
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer client.Close()
-
-topic := "test-topic-with-no-messages"
-ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
-defer cancel()
-
-// create consumer
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-	Topic:            topic,
-	SubscriptionName: "my-sub1",
-	Type:             Shared,
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer consumer.Close()
-
-msg, err := consumer.Receive(ctx)
-fmt.Println(msg.Payload())
-if err != nil {
-	log.Fatal(err)
-}
-
-```
-
-#### How to use schema in consumer
-
-```go
-
-type testJSON struct {
-	ID   int    `json:"id"`
-	Name string `json:"name"`
-}
-
-```
-
-```go
-
-var (
-	exampleSchemaDef = "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\"," +
-		"\"fields\":[{\"name\":\"ID\",\"type\":\"int\"},{\"name\":\"Name\",\"type\":\"string\"}]}"
-)
-
-```
-
-```go
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: "pulsar://localhost:6650",
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer client.Close()
-
-var s testJSON
-
-consumerJS := NewJSONSchema(exampleSchemaDef, nil)
-consumer, err := client.Subscribe(ConsumerOptions{
-	Topic:                       "jsonTopic",
-	SubscriptionName:            "sub-1",
-	Schema:                      consumerJS,
-	SubscriptionInitialPosition: SubscriptionPositionEarliest,
-})
-assert.Nil(t, err)
-msg, err := consumer.Receive(context.Background())
-assert.Nil(t, err)
-err = msg.GetSchemaValue(&s)
-if err != nil {
-	log.Fatal(err)
-}
-
-defer consumer.Close()
-
-```
-
-#### How to use Prometheus metrics in consumer
-
-In this guide, This section demonstrates how to create a simple Pulsar consumer application that exposes Prometheus metrics via HTTP.
-1. Write a simple consumer application.
-
-```go
-
-// Create a Pulsar client
-client, err := pulsar.NewClient(pulsar.ClientOptions{
-    URL: "pulsar://localhost:6650",
-})
-if err != nil {
-    log.Fatal(err)
-}
-
-defer client.Close()
-
-// Start a separate goroutine for Prometheus metrics
-// In this case, Prometheus metrics can be accessed via http://localhost:2112/metrics
-go func() {
-    prometheusPort := 2112
-    log.Printf("Starting Prometheus metrics at http://localhost:%v/metrics\n", prometheusPort)
-    http.Handle("/metrics", promhttp.Handler())
-    err = http.ListenAndServe(":"+strconv.Itoa(prometheusPort), nil)
-    if err != nil {
-        log.Fatal(err)
-    }
-}()
-
-// Create a consumer
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-    Topic:            "topic-1",
-    SubscriptionName: "sub-1",
-    Type:             pulsar.Shared,
-})
-if err != nil {
-    log.Fatal(err)
-}
-
-defer consumer.Close()
-
-ctx := context.Background()
-
-// Write your business logic here
-// In this case, you build a simple Web server. You can consume messages by requesting http://localhost:8083/consume
-webPort := 8083
-http.HandleFunc("/consume", func(w http.ResponseWriter, r *http.Request) {
-    msg, err := consumer.Receive(ctx)
-    if err != nil {
-        log.Fatal(err)
-    } else {
-        log.Printf("Received message msgId: %v -- content: '%s'\n", msg.ID(), string(msg.Payload()))
-        fmt.Fprintf(w, "Received message msgId: %v -- content: '%s'\n", msg.ID(), string(msg.Payload()))
-        consumer.Ack(msg)
-    }
-})
-
-err = http.ListenAndServe(":"+strconv.Itoa(webPort), nil)
-if err != nil {
-    log.Fatal(err)
-}
-
-```
-
-2. To scrape metrics from applications, configure a local running Prometheus instance using a configuration file (`prometheus.yml`).
-
-```yaml
-
-scrape_configs:
-- job_name: pulsar-client-go-metrics
-  scrape_interval: 10s
-  static_configs:
-  - targets:
-  - localhost:2112
-
-```
-
-Now you can query Pulsar client metrics on Prometheus.
-
-### Consumer configuration
-
- Name | Description | Default
-| :-------- | :---------- |:---------- |
-| Topic | Topic specify the topic this consumer will subscribe to. This argument is required when constructing the reader. | |
-| Topics | Specify a list of topics this consumer will subscribe on. Either a topic, a list of topics or a topics pattern are required when subscribing| |
-| TopicsPattern | Specify a regular expression to subscribe to multiple topics under the same namespace. Either a topic, a list of topics or a topics pattern are required when subscribing | |
-| AutoDiscoveryPeriod | Specify the interval in which to poll for new partitions or new topics if using a TopicsPattern. | |
-| SubscriptionName | Specify the subscription name for this consumer. This argument is required when subscribing | |
-| Name | Set the consumer name | | 
-| Properties | Properties attach a set of application defined properties to the producer This properties will be visible in the topic stats | |
-| Type | Select the subscription type to be used when subscribing to the topic. | Exclusive |
-| SubscriptionInitialPosition | InitialPosition at which the cursor will be set when subscribe | Latest |
-| DLQ | Configuration for Dead Letter Queue consumer policy. | no DLQ | 
-| MessageChannel | Sets a `MessageChannel` for the consumer. When a message is received, it will be pushed to the channel for consumption | | 
-| ReceiverQueueSize | Sets the size of the consumer receive queue. | 1000| 
-| NackRedeliveryDelay | The delay after which to redeliver the messages that failed to be processed | 1min |
-| ReadCompacted | If enabled, the consumer will read messages from the compacted topic rather than reading the full message backlog of the topic | false |
-| ReplicateSubscriptionState | Mark the subscription as replicated to keep it in sync across clusters | false |
-| KeySharedPolicy | Configuration for Key Shared consumer policy. |  |
-| RetryEnable | Auto retry send messages to default filled DLQPolicy topics | false |
-| Interceptors | A chain of interceptors. These interceptors are called at some points defined in the `ConsumerInterceptor` interface. |  |
-| MaxReconnectToBroker | MaxReconnectToBroker set the maximum retry number of reconnectToBroker. | ultimate |
-| Schema | Schema set a custom schema type by passing an implementation of `Schema` | bytes[] |
-
-## Readers
-
-Pulsar readers process messages from Pulsar topics. Readers are different from consumers because with readers you need to explicitly specify which message in the stream you want to begin with (consumers, on the other hand, automatically begin with the most recent unacked message). You can [configure](#reader-configuration) Go readers using a `ReaderOptions` object. Here's an example:
-
-```go
-
-reader, err := client.CreateReader(pulsar.ReaderOptions{
-	Topic:          "topic-1",
-	StartMessageID: pulsar.EarliestMessageID(),
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer reader.Close()
-
-```
-
-### Reader operations
-
-Pulsar Go readers have the following methods available:
-
-Method | Description | Return type
-:------|:------------|:-----------
-`Topic()` | Returns the reader's [topic](reference-terminology.md#topic) | `string`
-`Next(context.Context)` | Receives the next message on the topic (analogous to the `Receive` method for [consumers](#consumer-operations)). This method blocks until a message is available. | `(Message, error)`
-`HasNext()` | Check if there is any message available to read from the current position| (bool, error)
-`Close()` | Closes the reader, disabling its ability to receive messages from the broker | `error`
-`Seek(MessageID)` | Reset the subscription associated with this reader to a specific message ID | `error`
-`SeekByTime(time time.Time)` | Reset the subscription associated with this reader to a specific message publish time | `error`
-
-### Reader example
-
-#### How to use reader to read 'next' message
-
-Here's an example usage of a Go reader that uses the `Next()` method to process incoming messages:
-
-```go
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/apache/pulsar-client-go/pulsar"
-)
-
-func main() {
-	client, err := pulsar.NewClient(pulsar.ClientOptions{URL: "pulsar://localhost:6650"})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer client.Close()
-
-	reader, err := client.CreateReader(pulsar.ReaderOptions{
-		Topic:          "topic-1",
-		StartMessageID: pulsar.EarliestMessageID(),
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer reader.Close()
-
-	for reader.HasNext() {
-		msg, err := reader.Next(context.Background())
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		fmt.Printf("Received message msgId: %#v -- content: '%s'\n",
-			msg.ID(), string(msg.Payload()))
-	}
-}
-
-```
-
-In the example above, the reader begins reading from the earliest available message (specified by `pulsar.EarliestMessage`). The reader can also begin reading from the latest message (`pulsar.LatestMessage`) or some other message ID specified by bytes using the `DeserializeMessageID` function, which takes a byte array and returns a `MessageID` object. Here's an example:
-
-```go
-
-lastSavedId := // Read last saved message id from external store as byte[]
-
-reader, err := client.CreateReader(pulsar.ReaderOptions{
-    Topic:          "my-golang-topic",
-    StartMessageID: pulsar.DeserializeMessageID(lastSavedId),
-})
-
-```
-
-#### How to use reader to read specific message
-
-```go
-
-client, err := NewClient(pulsar.ClientOptions{
-	URL: lookupURL,
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-defer client.Close()
-
-topic := "topic-1"
-ctx := context.Background()
-
-// create producer
-producer, err := client.CreateProducer(pulsar.ProducerOptions{
-	Topic:           topic,
-	DisableBatching: true,
-})
-if err != nil {
-	log.Fatal(err)
-}
-defer producer.Close()
-
-// send 10 messages
-msgIDs := [10]MessageID{}
-for i := 0; i < 10; i++ {
-	msgID, err := producer.Send(ctx, &pulsar.ProducerMessage{
-		Payload: []byte(fmt.Sprintf("hello-%d", i)),
-	})
-	assert.NoError(t, err)
-	assert.NotNil(t, msgID)
-	msgIDs[i] = msgID
-}
-
-// create reader on 5th message (not included)
-reader, err := client.CreateReader(pulsar.ReaderOptions{
-	Topic:          topic,
-	StartMessageID: msgIDs[4],
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-defer reader.Close()
-
-// receive the remaining 5 messages
-for i := 5; i < 10; i++ {
-	msg, err := reader.Next(context.Background())
-	if err != nil {
-	log.Fatal(err)
-}
-
-// create reader on 5th message (included)
-readerInclusive, err := client.CreateReader(pulsar.ReaderOptions{
-	Topic:                   topic,
-	StartMessageID:          msgIDs[4],
-	StartMessageIDInclusive: true,
-})
-
-if err != nil {
-	log.Fatal(err)
-}
-defer readerInclusive.Close()
-
-```
-
-### Reader configuration
-
- Name | Description | Default
-| :-------- | :---------- |:---------- |
-| Topic | Topic specify the topic this consumer will subscribe to. This argument is required when constructing the reader. | |
-| Name | Name set the reader name. | | 
-| Properties | Attach a set of application defined properties to the reader. This properties will be visible in the topic stats | |
-| StartMessageID | StartMessageID initial reader positioning is done by specifying a message id. | |
-| StartMessageIDInclusive | If true, the reader will start at the `StartMessageID`, included. Default is `false` and the reader will start from the "next" message | false |
-| MessageChannel | MessageChannel sets a `MessageChannel` for the consumer When a message is received, it will be pushed to the channel for consumption| |
-| ReceiverQueueSize | ReceiverQueueSize sets the size of the consumer receive queue. | 1000 |
-| SubscriptionRolePrefix| SubscriptionRolePrefix set the subscription role prefix. | "reader" | 
-| ReadCompacted | If enabled, the reader will read messages from the compacted topic rather than reading the full message backlog of the topic.  ReadCompacted can only be enabled when reading from a persistent topic. | false|
-
-## Messages
-
-The Pulsar Go client provides a `ProducerMessage` interface that you can use to construct messages to producer on Pulsar topics. Here's an example message:
-
-```go
-
-msg := pulsar.ProducerMessage{
-    Payload: []byte("Here is some message data"),
-    Key: "message-key",
-    Properties: map[string]string{
-        "foo": "bar",
-    },
-    EventTime: time.Now(),
-    ReplicationClusters: []string{"cluster1", "cluster3"},
-}
-
-if _, err := producer.send(msg); err != nil {
-    log.Fatalf("Could not publish message due to: %v", err)
-}
-
-```
-
-The following methods parameters are available for `ProducerMessage` objects:
-
-Parameter | Description
-:---------|:-----------
-`Payload` | The actual data payload of the message
-`Value` | Value and payload is mutually exclusive, `Value interface{}` for schema message.
-`Key` | The optional key associated with the message (particularly useful for things like topic compaction)
-`OrderingKey` | OrderingKey sets the ordering key of the message.
-`Properties` | A key-value map (both keys and values must be strings) for any application-specific metadata attached to the message
-`EventTime` | The timestamp associated with the message
-`ReplicationClusters` | The clusters to which this message will be replicated. Pulsar brokers handle message replication automatically; you should only change this setting if you want to override the broker default.
-`SequenceID` | Set the sequence id to assign to the current message
-`DeliverAfter` | Request to deliver the message only after the specified relative delay
-`DeliverAt` | Deliver the message only at or after the specified absolute timestamp
-
-## TLS encryption and authentication
-
-In order to use [TLS encryption](security-tls-transport.md), you'll need to configure your client to do so:
-
- * Use `pulsar+ssl` URL type
- * Set `TLSTrustCertsFilePath` to the path to the TLS certs used by your client and the Pulsar broker
- * Configure `Authentication` option
-
-Here's an example:
-
-```go
-
-opts := pulsar.ClientOptions{
-    URL: "pulsar+ssl://my-cluster.com:6651",
-    TLSTrustCertsFilePath: "/path/to/certs/my-cert.csr",
-    Authentication: NewAuthenticationTLS("my-cert.pem", "my-key.pem"),
-}
-
-```
-
-## OAuth2 authentication
-
-To use [OAuth2 authentication](security-oauth2.md), you'll need to configure your client to perform the following operations.
-This example shows how to configure OAuth2 authentication.
-
-```go
-
-oauth := pulsar.NewAuthenticationOAuth2(map[string]string{
-		"type":       "client_credentials",
-		"issuerUrl":  "https://dev-kt-aa9ne.us.auth0.com",
-		"audience":   "https://dev-kt-aa9ne.us.auth0.com/api/v2/",
-		"privateKey": "/path/to/privateKey",
-		"clientId":   "0Xx...Yyxeny",
-	})
-client, err := pulsar.NewClient(pulsar.ClientOptions{
-		URL:              "pulsar://my-cluster:6650",
-		Authentication:   oauth,
-})
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-java.md b/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-java.md
deleted file mode 100644
index 1058b0896fa78..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-java.md
+++ /dev/null
@@ -1,1581 +0,0 @@
----
-id: client-libraries-java
-title: Pulsar Java client
-sidebar_label: "Java"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-You can use a Pulsar Java client to create the Java [producer](#producer), [consumer](#consumer), [reader](#reader) and [TableView](#tableview) of messages and to perform [administrative tasks](admin-api-overview.md). The current Java client version is **@pulsar:version@**.
-
-All the methods in [producer](#producer), [consumer](#consumer), [reader](#reader) and [TableView](#tableview) of a Java client are thread-safe.
-
-Javadoc for the Pulsar client is divided into two domains by package as follows.
-
-Package | Description | Maven Artifact
-:-------|:------------|:--------------
-[`org.apache.pulsar.client.api`](/api/client) | [The producer and consumer API](https://pulsar.apache.org/api/client/) | [org.apache.pulsar:pulsar-client:@pulsar:version@](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client%7C@pulsar:version@%7Cjar)
-[`org.apache.pulsar.client.admin`](/api/admin) | The Java [admin API](admin-api-overview.md) | [org.apache.pulsar:pulsar-client-admin:@pulsar:version@](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client-admin%7C@pulsar:version@%7Cjar)
-`org.apache.pulsar.client.all` |Include both `pulsar-client` and `pulsar-client-admin`
     Both `pulsar-client` and `pulsar-client-admin` are shaded packages and they shade dependencies independently. Consequently, the applications using both `pulsar-client` and `pulsar-client-admin` have redundant shaded classes. It would be troublesome if you introduce new dependencies but forget to update shading rules. 
     In this case, you can use `pulsar-client-all`, which shades dependencies only one time and reduces the size of dependencies.  |[org.apache.pulsar:pulsar-client-all:@pulsar:version@](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client-all%7C@pulsar:version@%7Cjar)
-
-This document focuses only on the client API for producing and consuming messages on Pulsar topics. For how to use the Java admin client, see [Pulsar admin interface](admin-api-overview.md).
-
-## Installation
-
-The latest version of the Pulsar Java client library is available via [Maven Central](http://search.maven.org/#artifactdetails%7Corg.apache.pulsar%7Cpulsar-client%7C@pulsar:version@%7Cjar). To use the latest version, add the `pulsar-client` library to your build configuration.
-
-:::tip
-
-- [`pulsar-client`](https://search.maven.org/artifact/org.apache.pulsar/pulsar-client) and [`pulsar-client-admin`](https://search.maven.org/artifact/org.apache.pulsar/pulsar-client-admin) shade dependencies via [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/) to avoid conflicts of the underlying dependency packages (such as Netty). If you do not want to manage dependency conflicts manually, you can use them.
-- [`pulsar-client-original`](https://search.maven.org/artifact/org.apache.pulsar/pulsar-client-original) and [`pulsar-client-admin-original`](https://search.maven.org/artifact/org.apache.pulsar/pulsar-client-admin-original) **does not** shade dependencies. If you want to manage dependencies manually, you can use them.
-
-:::
-
-### Maven
-
-If you use Maven, add the following information to the `pom.xml` file.
-
-```xml
-
-
-@pulsar:version@
-
-
-
-  org.apache.pulsar
-  pulsar-client
-  ${pulsar.version}
-
-
-```
-
-### Gradle
-
-If you use Gradle, add the following information to the `build.gradle` file.
-
-```groovy
-
-def pulsarVersion = '@pulsar:version@'
-
-dependencies {
-    compile group: 'org.apache.pulsar', name: 'pulsar-client', version: pulsarVersion
-}
-
-```
-
-## Connection URLs
-
-To connect to Pulsar using client libraries, you need to specify a [Pulsar protocol](developing-binary-protocol.md) URL.
-
-You can assign Pulsar protocol URLs to specific clusters and use the `pulsar` scheme. The default port is `6650`. The following is an example of `localhost`.
-
-```http
-
-pulsar://localhost:6650
-
-```
-
-If you have multiple brokers, the URL is as follows.
-
-```http
-
-pulsar://localhost:6550,localhost:6651,localhost:6652
-
-```
-
-A URL for a production Pulsar cluster is as follows.
-
-```http
-
-pulsar://pulsar.us-west.example.com:6650
-
-```
-
-If you use [TLS](security-tls-authentication.md) authentication, the URL is as follows. 
-
-```http
-
-pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-## Client 
-
-You can instantiate a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object using just a URL for the target Pulsar [cluster](reference-terminology.md#cluster) like this:
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-
-```
-
-If you have multiple brokers, you can initiate a PulsarClient like this:
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650,localhost:6651,localhost:6652")
-        .build();
-
-```
-
-> ### Default broker URLs for standalone clusters
-> If you run a cluster in [standalone mode](getting-started-standalone.md), the broker is available at the `pulsar://localhost:6650` URL by default.
-
-If you create a client, you can use the `loadConf` configuration. The following parameters are available in `loadConf`.
-
-| Name | Type |  
    Description
     | Default
-|---|---|---|---
-`serviceUrl` | String | Service URL provider for Pulsar service | None
-`authPluginClassName` | String | Name of the authentication plugin | None
- `authParams` | String | Parameters for the authentication plugin 

    **Example**
     key1:val1,key2:val2|None
-`operationTimeoutMs`|long|`operationTimeoutMs`|Operation timeout |30000
-`statsIntervalSeconds`|long|Interval between each stats information

    Stats is activated with positive `statsInterval`

    Set `statsIntervalSeconds` to 1 second at least. |60
-`numIoThreads`| int| The number of threads used for handling connections to brokers | 1 
-`numListenerThreads`|int|The number of threads used for handling message listeners. The listener thread pool is shared across all the consumers and readers using the "listener" model to get messages. For a given consumer, the listener is always invoked from the same thread to ensure ordering. If you want multiple threads to process a single topic, you need to create a [`shared`](https://pulsar.apache.org/docs/en/next/concepts-messaging/#shared) subscription and multiple consumers for this subscription. This does not ensure ordering.| 1 
-`useTcpNoDelay`| boolean| Whether to use TCP no-delay flag on the connection to disable Nagle algorithm |true
-`enableTls` |boolean | Whether to use TLS encryption on the connection. Note that this parameter is **deprecated**. If you want to enable TLS, use `pulsar+ssl://` in `serviceUrl` instead. | false
- `tlsTrustCertsFilePath` |string |Path to the trusted TLS certificate file|None
-`tlsAllowInsecureConnection`|boolean|Whether the Pulsar client accepts untrusted TLS certificate from broker | false
-`tlsHostnameVerificationEnable` |boolean |  Whether to enable TLS hostname verification|false
-`concurrentLookupRequest`|int|The number of concurrent lookup requests allowed to send on each broker connection to prevent overload on broker|5000
-`maxLookupRequest`|int|The maximum number of lookup requests allowed on each broker connection to prevent overload on broker | 50000
-`maxNumberOfRejectedRequestPerConnection`|int|The maximum number of rejected requests of a broker in a certain time frame (30 seconds) after the current connection is closed and the client creates a new connection to connect to a different broker|50
-`keepAliveIntervalSeconds`|int|Seconds of keeping alive interval for each client broker connection|30
-`connectionTimeoutMs`|int|Duration of waiting for a connection to a broker to be established 

    If the duration passes without a response from a broker, the connection attempt is dropped|10000
-`requestTimeoutMs`|int|Maximum duration for completing a request |60000
-`defaultBackoffIntervalNanos`|int| Default duration for a backoff interval | TimeUnit.MILLISECONDS.toNanos(100);
-`maxBackoffIntervalNanos`|long|Maximum duration for a backoff interval|TimeUnit.SECONDS.toNanos(30)
-`socks5ProxyAddress`|SocketAddress|SOCKS5 proxy address | None
-`socks5ProxyUsername`|string|SOCKS5 proxy username | None
-`socks5ProxyPassword`|string|SOCKS5 proxy password | None
-
-Check out the Javadoc for the {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} class for a full list of configurable parameters.
-
-> In addition to client-level configuration, you can also apply [producer](#configure-producer) and [consumer](#configure-consumer) specific configuration as described in sections below.
-
-### Cluster-level failover
-
-This chapter describes the concept, benefits, use cases, constraints, usage, working principles, and more information about the cluster-level failover. It contains the following sections:
-
-- [What is cluster-level failover?](#what-is-cluster-level-failover)
-
-  * [Concept of cluster-level failover](#concept-of-cluster-level-failover)
-   
-  * [Why use cluster-level failover?](#why-use-cluster-level-failover)
-
-  * [When to use cluster-level failover?](#when-to-use-cluster-level-failover)
-
-  * [When cluster-level failover is triggered?](#when-cluster-level-failover-is-triggered)
-
-  * [Why does cluster-level failover fail?](#why-does-cluster-level-failover-fail)
-
-  * [What are the limitations of cluster-level failover?](#what-are-the-limitations-of-cluster-level-failover)
-
-  * [What are the relationships between cluster-level failover and geo-replication?](#what-are-the-relationships-between-cluster-level-failover-and-geo-replication)
-  
-- [How to use cluster-level failover?](#how-to-use-cluster-level-failover)
-
-- [How does cluster-level failover work?](#how-does-cluster-level-failover-work)
-  
-> #### What is cluster-level failover
-
-This chapter helps you better understand the concept of cluster-level failover.
-> ##### Concept of cluster-level failover
-
-````mdx-code-block
-
-
-
-Automatic cluster-level failover supports Pulsar clients switching from a primary cluster to one or several backup clusters automatically and seamlessly when it detects a failover event based on the configured detecting policy set by **users**. 
-
-![Automatic cluster-level failover](/assets/cluster-level-failover-1.png)
-
-
-
-
-Controlled cluster-level failover supports Pulsar clients switching from a primary cluster to one or several backup clusters. The switchover is manually set by **administrators**.
-
-![Controlled cluster-level failover](/assets/cluster-level-failover-2.png)
-
-
-
-
-````
-
-Once the primary cluster functions again, Pulsar clients can switch back to the primary cluster. Most of the time users won’t even notice a thing. Users can keep using applications and services without interruptions or timeouts.
-
-> ##### Why use cluster-level failover?
-
-The cluster-level failover provides fault tolerance, continuous availability, and high availability together. It brings a number of benefits, including but not limited to:
-
-* Reduced cost: services can be switched and recovered automatically with no data loss.
-
-* Simplified management: businesses can operate on an "always-on" basis since no immediate user intervention is required.
-
-* Improved stability and robustness: it ensures continuous performance and minimizes service downtime. 
-
-> ##### When to use cluster-level failover?
-
-The cluster-level failover protects your environment in a number of ways, including but not limited to:
-
-* Disaster recovery: cluster-level failover can automatically and seamlessly transfer the production workload on a primary cluster to one or several backup clusters, which ensures minimum data loss and reduced recovery time.
-
-* Planned migration: if you want to migrate production workloads from an old cluster to a new cluster, you can improve the migration efficiency with cluster-level failover. For example, you can test whether the data migration goes smoothly in case of a failover event, identify possible issues and risks before the migration.
-
-> ##### When cluster-level failover is triggered?
-
-````mdx-code-block
-
-
-
-Automatic cluster-level failover is triggered when Pulsar clients cannot connect to the primary cluster for a prolonged period of time. This can be caused by any number of reasons including, but not limited to: 
-
-* Network failure: internet connection is lost.
-
-* Power failure: shutdown time of a primary cluster exceeds time limits.
-
-* Service error: errors occur on a primary cluster (for example, the primary cluster does not function because of time limits).
-
-* Crashed storage space: the primary cluster does not have enough storage space, but the corresponding storage space on the backup server functions normally.
-
-
-
-
-Controlled cluster-level failover is triggered when administrators set the switchover manually.
-
-
-
-
-````
-
-> ##### Why does cluster-level failover fail?
-
-Obviously, the cluster-level failover does not succeed if the backup cluster is unreachable by active Pulsar clients. This can happen for many reasons, including but not limited to:
-
-* Power failure: the backup cluster is shut down or does not function normally. 
-
-* Crashed storage space: primary and backup clusters do not have enough storage space. 
-
-* If the failover is initiated, but no cluster can assume the role of an available cluster due to errors, and the primary cluster is not able to provide service normally.
-
-* If you manually initiate a switchover, but services cannot be switched to the backup cluster server, then the system will attempt to switch services back to the primary cluster.
-
-* Fail to authenticate or authorize between 1) primary and backup clusters, or 2) between two backup clusters.
-
-> ##### What are the limitations of cluster-level failover?
-
-Currently, cluster-level failover can perform probes to prevent data loss, but it can not check the status of backup clusters. If backup clusters are not healthy, you cannot produce or consume data.
-
-> #### What are the relationships between cluster-level failover and geo-replication?
-
-The cluster-level failover is an extension of [geo-replication](concepts-replication.md) to improve stability and robustness. The cluster-level failover depends on geo-replication, and they have some **differences** as below.
-
-Influence |Cluster-level failover|Geo-replication
-|---|---|---
-Do administrators have heavy workloads?|No or maybe.

    - For the **automatic** cluster-level failover, the cluster switchover is triggered automatically based on the policies set by **users**.

    - For the **controlled** cluster-level failover, the switchover is triggered manually by **administrators**.|Yes.

    If a cluster fails, immediate administration intervention is required.|
-Result in data loss?|No.

    For both **automatic** and **controlled** cluster-level failover, if the failed primary cluster doesn't replicate messages immediately to the backup cluster, the Pulsar client can't consume the non-replicated messages. After the primary cluster is restored and the Pulsar client switches back, the non-replicated data can still be consumed by the Pulsar client. Consequently, the data is not lost.

    - For the **automatic** cluster-level failover, services can be switched and recovered automatically with no data loss.

    - For the **controlled** cluster-level failover, services can be switched and recovered manually and data loss may happen.|Yes.

    Pulsar clients and DNS systems have caches. When administrators switch the DNS from a primary cluster to a backup cluster, it takes some time for cache trigger timeout, which delays client recovery time and fails to produce or consume messages.
-Result in Pulsar client failure? |No or maybe.

    - For **automatic** cluster-level failover, services can be switched and recovered automatically and the Pulsar client does not fail. 

    - For **controlled** cluster-level failover, services can be switched and recovered manually, but the Pulsar client fails before administrators can take action. |Same as above.
-
-> #### How to use cluster-level failover
-
-This section guides you through every step on how to configure cluster-level failover.
-
-**Tip**
-
-- You should configure cluster-level failover only when the cluster contains sufficient resources to handle all possible consequences. Workload intensity on the backup cluster may increase significantly.
-
-- Connect clusters to an uninterruptible power supply (UPS) unit to reduce the risk of unexpected power loss.
-
-**Requirements**
-
-* Pulsar client 2.10 or later versions.
-
-* For backup clusters:
-
-  * The number of BookKeeper nodes should be equal to or greater than the ensemble quorum.
-
-  * The number of ZooKeeper nodes should be equal to or greater than 3.
-
-* **Turn on geo-replication** between the primary cluster and any dependent cluster (primary to backup or backup to backup) to prevent data loss.
-
-* Set `replicateSubscriptionState` to `true` when creating consumers.
-
-````mdx-code-block
-
-
-
-This is an example of how to construct a Java Pulsar client to use automatic cluster-level failover. The switchover is triggered automatically.
-
-```
-
-  private PulsarClient getAutoFailoverClient() throws PulsarClientException {
-
-        ServiceUrlProvider failover = AutoClusterFailover.builder()
-                .primary("pulsar://localhost:6650")
-                .secondary(Collections.singletonList("pulsar://other1:6650","pulsar://other2:6650"))
-                .failoverDelay(30, TimeUnit.SECONDS)
-                .switchBackDelay(60, TimeUnit.SECONDS)
-                .checkInterval(1000, TimeUnit.MILLISECONDS)
-	    	    .secondaryTlsTrustCertsFilePath("/path/to/ca.cert.pem")
-    .secondaryAuthentication("org.apache.pulsar.client.impl.auth.AuthenticationTls",
-"tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem")
-
-                .build();
-
-        PulsarClient pulsarClient = PulsarClient.builder()
-                .build();
-
-        failover.initialize(pulsarClient);
-        return pulsarClient;
-    }
-
-```
-
-Configure the following parameters:
-
-Parameter|Default value|Required?|Description
-|---|---|---|---
-`primary`|N/A|Yes|Service URL of the primary cluster.
-`secondary`|N/A|Yes|Service URL(s) of one or several backup clusters.

    You can specify several backup clusters using a comma-separated list.

     Note that:
    - The backup cluster is chosen in the sequence shown in the list. 
    - If all backup clusters are available, the Pulsar client chooses the first backup cluster.
-`failoverDelay`|N/A|Yes|The delay before the Pulsar client switches from the primary cluster to the backup cluster.

    Automatic failover is controlled by a probe task: 
    1) The probe task first checks the health status of the primary cluster. 
     2) If the probe task finds the continuous failure time of the primary cluster exceeds `failoverDelayMs`, it switches the Pulsar client to the backup cluster. 
-`switchBackDelay`|N/A|Yes|The delay before the Pulsar client switches from the backup cluster to the primary cluster.

    Automatic failover switchover is controlled by a probe task: 
     1) After the Pulsar client switches from the primary cluster to the backup cluster, the probe task continues to check the status of the primary cluster. 
     2) If the primary cluster functions well and continuously remains active longer than `switchBackDelay`, the Pulsar client switches back to the primary cluster.
-`checkInterval`|30s|No|Frequency of performing a probe task (in seconds).
-`secondaryTlsTrustCertsFilePath`|N/A|No|Path to the trusted TLS certificate file of the backup cluster.
-`secondaryAuthentication`|N/A|No|Authentication of the backup cluster.
-
-    
-
-
-This is an example of how to construct a Java Pulsar client to use controlled cluster-level failover. The switchover is triggered by administrators manually.
-
-**Note**: you can have one or several backup clusters but can only specify one.
-
-```
-
- public PulsarClient getControlledFailoverClient() throws IOException {
-Map header = new HashMap(); 
-  header.put("service_user_id", "my-user");
-  header.put("service_password", "tiger");
-  header.put("clusterA", "tokenA");
-  header.put("clusterB", "tokenB");
-
-  ServiceUrlProvider provider = 
-      ControlledClusterFailover.builder()
-        .defaultServiceUrl("pulsar://localhost:6650")
-        .checkInterval(1, TimeUnit.MINUTES)
-        .urlProvider("http://localhost:8080/test")
-        .urlProviderHeader(header)
-        .build();
-
-  PulsarClient pulsarClient = 
-     PulsarClient.builder()
-      .build();
-
-  provider.initialize(pulsarClient);
-  return pulsarClient;
-}
-
-```
-
-Parameter|Default value|Required?|Description
-|---|---|---|---
-`defaultServiceUrl`|N/A|Yes|Pulsar service URL.
-`checkInterval`|30s|No|Frequency of performing a probe task (in seconds).
-`urlProvider`|N/A|Yes|URL provider service.
-`urlProviderHeader`|N/A|No|`urlProviderHeader` is a map containing tokens and credentials. 

    If you enable authentication or authorization between Pulsar clients and primary and backup clusters, you need to provide `urlProviderHeader`.
-
-Here is an example of how `urlProviderHeader` works.
-
-![How urlProviderHeader works](/assets/cluster-level-failover-3.png)
-
-Assume that you want to connect Pulsar client 1 to cluster A.
-
-1. Pulsar client 1 sends the token *t1* to the URL provider service.
-
-2. The URL provider service returns the credential *c1* and the cluster A URL to the Pulsar client.
-   
-   The URL provider service manages all tokens and credentials. It returns different credentials based on different tokens and different target cluster URLs to different Pulsar clients.
-
-   **Note**: **the credential must be in a JSON file and contain parameters as shown**.
-
-   ```
-   
-   {
-   "serviceUrl": "pulsar+ssl://target:6651", 
-   "tlsTrustCertsFilePath": "/security/ca.cert.pem",
-   "authPluginClassName":"org.apache.pulsar.client.impl.auth.AuthenticationTls",
-   "authParamsString": " \"tlsCertFile\": \"/security/client.cert.pem\" 
-       \"tlsKeyFile\": \"/security/client-pk8.pem\" "
-   }
-   
-   ```
-
-3. Pulsar client 1 connects to cluster A using credential *c1*.
-
-    
-
-    
-````
-
->#### How does cluster-level failover work?
-
-This chapter explains the working process of cluster-level failover. For more implementation details, see [PIP-121](https://github.com/apache/pulsar/issues/13315).
-
-````mdx-code-block
-
-
-
-In an automatic failover cluster, the primary cluster and backup cluster are aware of each other's availability. The automatic failover cluster performs the following actions without administrator intervention:
-
-1. The Pulsar client runs a probe task at intervals defined in `checkInterval`.
-   
-2. If the probe task finds the failure time of the primary cluster exceeds the time set in the `failoverDelay` parameter, it searches backup clusters for an available healthy cluster.
-
-   2a) If there are healthy backup clusters, the Pulsar client switches to a backup cluster in the order defined in `secondary`.
-
-   2b) If there is no healthy backup cluster, the Pulsar client does not perform the switchover, and the probe task continues to look for an available backup cluster.
-
-3. The probe task checks whether the primary cluster functions well or not. 
-
-   3a) If the primary cluster comes back and the continuous healthy time exceeds the time set in `switchBackDelay`, the Pulsar client switches back to the primary cluster.
-
-   3b) If the primary cluster does not come back, the Pulsar client does not perform the switchover. 
-
-![Workflow of automatic failover cluster](/assets/cluster-level-failover-4.png)
-
-
-
-
-1. The Pulsar client runs a probe task at intervals defined in `checkInterval`.
-
-2. The probe task fetches the service URL configuration from the URL provider service, which is configured by `urlProvider`.
-
-   2a) If the service URL configuration is changed, the probe task switches to the target cluster without checking the health status of the target cluster.
-
-   2b) If the service URL configuration is not changed, the Pulsar client does not perform the switchover.
-
-3. If the Pulsar client switches to the target cluster, the probe task continues to fetch service URL configuration from the URL provider service at intervals defined in `checkInterval`. 
-
-   3a) If the service URL configuration is changed, the probe task switches to the target cluster without checking the health status of the target cluster.
-
-   3b) If the service URL configuration is not changed, it does not perform the switchover.
-
-![Workflow of controlled failover cluster](/assets/cluster-level-failover-5.png)
-
-
-
-
-````
-
-## Producer
-
-In Pulsar, producers write messages to topics. Once you've instantiated a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object (as in the section [above](#client-configuration)), you can create a {@inject: javadoc:Producer:/client/org/apache/pulsar/client/api/Producer} for a specific Pulsar [topic](reference-terminology.md#topic).
-
-```java
-
-Producer producer = client.newProducer()
-        .topic("my-topic")
-        .create();
-
-// You can then send messages to the broker and topic you specified:
-producer.send("My message".getBytes());
-
-```
-
-By default, producers produce messages that consist of byte arrays. You can produce different types by specifying a message [schema](#schema).
-
-```java
-
-Producer stringProducer = client.newProducer(Schema.STRING)
-        .topic("my-topic")
-        .create();
-stringProducer.send("My message");
-
-```
-
-> Make sure that you close your producers, consumers, and clients when you do not need them.
-
-> ```java
-> 
-> producer.close();
-> consumer.close();
-> client.close();
->
-> 
-> ```
-
->
-> Close operations can also be asynchronous:
-
-> ```java
-> 
-> producer.closeAsync()
->    .thenRun(() -> System.out.println("Producer closed"))
->    .exceptionally((ex) -> {
->        System.err.println("Failed to close producer: " + ex);
->        return null;
->    });
->
-> 
-> ```
-
-
-### Configure producer
-
-If you instantiate a `Producer` object by specifying only a topic name as the example above, the default configuration of producer is used.
-
-If you create a producer, you can use the `loadConf` configuration. The following parameters are available in `loadConf`.
-
-Name| Type |  
    Description
    |  Default
-|---|---|---|---
-`topicName`| string|		Topic name| null|
-`producerName`| string|Producer name| null
-`sendTimeoutMs`| long|Message send timeout in ms.
    If a message is not acknowledged by a server before the `sendTimeout` expires, an error occurs.|30000
-`blockIfQueueFull`|boolean|If it is set to `true`, when the outgoing message queue is full, the `Send` and `SendAsync` methods of producer block, rather than failing and throwing errors. 
    If it is set to `false`, when the outgoing message queue is full, the `Send` and `SendAsync` methods of producer fail and `ProducerQueueIsFullError` exceptions occur.

    The `MaxPendingMessages` parameter determines the size of the outgoing message queue.|false
-`maxPendingMessages`| int|The maximum size of a queue holding pending messages.

    For example, a message waiting to receive an acknowledgment from a [broker](reference-terminology.md#broker). 

    By default, when the queue is full, all calls to the `Send` and `SendAsync` methods fail **unless** you set `BlockIfQueueFull` to `true`.|1000
-`maxPendingMessagesAcrossPartitions`|int|The maximum number of pending messages across partitions. 

    Use the setting to lower the max pending messages for each partition ({@link #setMaxPendingMessages(int)}) if the total number exceeds the configured value.|50000
-`messageRoutingMode`| MessageRoutingMode|Message routing logic for producers on [partitioned topics](concepts-architecture-overview.md#partitioned-topics).
     Apply the logic only when setting no key on messages. 
    Available options are as follows: 
  • `pulsar.RoundRobinDistribution`: round robin
  • `pulsar.UseSinglePartition`: publish all messages to a single partition
  • `pulsar.CustomPartition`: a custom partitioning scheme
    • |
  • `pulsar.RoundRobinDistribution`
    • 
-`hashingScheme`| HashingScheme|Hashing function determining the partition where you publish a particular message (**partitioned topics only**).
    Available options are as follows:
  •  `pulsar.JavastringHash`: the equivalent of `string.hashCode()` in Java
  •  `pulsar.Murmur3_32Hash`: applies the [Murmur3](https://en.wikipedia.org/wiki/MurmurHash) hashing function
  • `pulsar.BoostHash`: applies the hashing function from C++'s [Boost](https://www.boost.org/doc/libs/1_62_0/doc/html/hash.html) library
    •  |`HashingScheme.JavastringHash`
-`cryptoFailureAction`| ProducerCryptoFailureAction|Producer should take action when encryption fails.
  • **FAIL**: if encryption fails, unencrypted messages fail to send.
  •  **SEND**: if encryption fails, unencrypted messages are sent.
    •  |`ProducerCryptoFailureAction.FAIL`
-`batchingMaxPublishDelayMicros`| long|Batching time period of sending messages.|TimeUnit.MILLISECONDS.toMicros(1)
-`batchingMaxMessages` |int|The maximum number of messages permitted in a batch.|1000
-`batchingEnabled`| boolean|Enable batching of messages. |true
-`chunkingEnabled` | boolean | Enable chunking of messages. |false
-`compressionType`|CompressionType|Message data compression type used by a producer. 
    Available options:
  • [`LZ4`](https://github.com/lz4/lz4)
  • [`ZLIB`](https://zlib.net/)
  • [`ZSTD`](https://facebook.github.io/zstd/)
  • [`SNAPPY`](https://google.github.io/snappy/)
    • | No compression
-`initialSubscriptionName`|string|Use this configuration to automatically create an initial subscription when creating a topic. If this field is not set, the initial subscription is not created.|null
-
-You can configure parameters if you do not want to use the default configuration.
-
-For a full list, see the Javadoc for the {@inject: javadoc:ProducerBuilder:/client/org/apache/pulsar/client/api/ProducerBuilder} class. The following is an example.
-
-```java
-
-Producer producer = client.newProducer()
-    .topic("my-topic")
-    .batchingMaxPublishDelay(10, TimeUnit.MILLISECONDS)
-    .sendTimeout(10, TimeUnit.SECONDS)
-    .blockIfQueueFull(true)
-    .create();
-
-```
-
-### Message routing
-
-When using partitioned topics, you can specify the routing mode whenever you publish messages using a producer. For more information on specifying a routing mode using the Java client, see the [Partitioned Topics cookbook](cookbooks-partitioned.md).
-
-### Async send
-
-You can publish messages [asynchronously](concepts-messaging.md#send-modes) using the Java client. With async send, the producer puts the message in a blocking queue and returns it immediately. Then the client library sends the message to the broker in the background. If the queue is full (max size configurable), the producer is blocked or fails immediately when calling the API, depending on arguments passed to the producer.
-
-The following is an example.
-
-```java
-
-producer.sendAsync("my-async-message".getBytes()).thenAccept(msgId -> {
-    System.out.println("Message with ID " + msgId + " successfully sent");
-});
-
-```
-
-As you can see from the example above, async send operations return a {@inject: javadoc:MessageId:/client/org/apache/pulsar/client/api/MessageId} wrapped in a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture).
-
-### Configure messages
-
-In addition to a value, you can set additional items on a given message:
-
-```java
-
-producer.newMessage()
-    .key("my-message-key")
-    .value("my-async-message".getBytes())
-    .property("my-key", "my-value")
-    .property("my-other-key", "my-other-value")
-    .send();
-
-```
-
-You can terminate the builder chain with `sendAsync()` and get a future return.
-
-### Enable chunking
-
-Message [chunking](concepts-messaging.md#chunking) enables Pulsar to process large payload messages by splitting the message into chunks at the producer side and aggregating chunked messages on the consumer side. 
-
-The message chunking feature is OFF by default. The following is an example of how to enable message chunking when creating a producer.
-
-```java
-
-Producer producer = client.newProducer()
-        .topic(topic)
-        .enableChunking(true)
-        .enableBatching(false)
-        .create();
-
-```
-
-By default, producer chunks the large message based on max message size (`maxMessageSize`) configured at broker (eg: 5MB). However, client can also configure max chunked size using producer configuration `chunkMaxMessageSize`.
-> **Note:** To enable chunking, you need to disable batching (`enableBatching`=`false`) concurrently.
-
-## Consumer
-
-In Pulsar, consumers subscribe to topics and handle messages that producers publish to those topics. You can instantiate a new [consumer](reference-terminology.md#consumer) by first instantiating a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object and passing it a URL for a Pulsar broker (as [above](#client-configuration)).
-
-Once you've instantiated a {@inject: javadoc:PulsarClient:/client/org/apache/pulsar/client/api/PulsarClient} object, you can create a {@inject: javadoc:Consumer:/client/org/apache/pulsar/client/api/Consumer} by specifying a [topic](reference-terminology.md#topic) and a [subscription](concepts-messaging.md#subscription-types).
-
-```java
-
-Consumer consumer = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscribe();
-
-```
-
-The `subscribe` method will auto-subscribe the consumer to the specified topic and subscription. One way to make the consumer listen on the topic is to set up a `while` loop. In this example loop, the consumer listens for messages, prints the contents of any received message, and then [acknowledges](reference-terminology.md#acknowledgment-ack) that the message has been processed. If the processing logic fails, you can use [negative acknowledgement](reference-terminology.md#acknowledgment-ack) to redeliver the message later.
-
-```java
-
-while (true) {
-  // Wait for a message
-  Message msg = consumer.receive();
-
-  try {
-      // Do something with the message
-      System.out.println("Message received: " + new String(msg.getData()));
-
-      // Acknowledge the message so that it can be deleted by the message broker
-      consumer.acknowledge(msg);
-  } catch (Exception e) {
-      // Message failed to process, redeliver later
-      consumer.negativeAcknowledge(msg);
-  }
-}
-
-```
-
-If you don't want to block your main thread and rather listen constantly for new messages, consider using a `MessageListener`.
-
-```java
-
-MessageListener myMessageListener = (consumer, msg) -> {
-  try {
-      System.out.println("Message received: " + new String(msg.getData()));
-      consumer.acknowledge(msg);
-  } catch (Exception e) {
-      consumer.negativeAcknowledge(msg);
-  }
-}
-
-Consumer consumer = client.newConsumer()
-     .topic("my-topic")
-     .subscriptionName("my-subscription")
-     .messageListener(myMessageListener)
-     .subscribe();
-
-```
-
-### Configure consumer
-
-If you instantiate a `Consumer` object by specifying only a topic and subscription name as in the example above, the consumer uses the default configuration. 
-
-When you create a consumer, you can use the `loadConf` configuration. The following parameters are available in `loadConf`.
-
- Name|Type | 
    Description
    |  Default
-|---|---|---|---
-`topicNames`| Set<String>|		Topic name|	Sets.newTreeSet()
- `topicsPattern`|Pattern|  	Topic pattern	|None
-`subscriptionName`|String|		Subscription name|	None
-`subscriptionType`|SubscriptionType| 	Subscription type 
    Four subscription types are available:
  • Exclusive
  • Failover
  • Shared
  • Key_Shared
    • |SubscriptionType.Exclusive
-`receiverQueueSize` |int |  Size of a consumer's receiver queue. 

    For example, the number of messages accumulated by a consumer before an application calls `Receive`. 

    A value higher than the default value increases consumer throughput, though at the expense of more memory utilization.| 1000
-`acknowledgementsGroupTimeMicros`|long|Group a consumer acknowledgment for a specified time.

    By default, a consumer uses 100ms grouping time to send out acknowledgments to a broker.

    Setting a group time of 0 sends out acknowledgments immediately. 

    A longer ack group time is more efficient at the expense of a slight increase in message re-deliveries after a failure.|TimeUnit.MILLISECONDS.toMicros(100)
-`negativeAckRedeliveryDelayMicros`|long|Delay to wait before redelivering messages that failed to be processed.

     When an application uses {@link Consumer#negativeAcknowledge(Message)}, failed messages are redelivered after a fixed timeout. |TimeUnit.MINUTES.toMicros(1)
-`maxTotalReceiverQueueSizeAcrossPartitions`|int |The max total receiver queue size across partitions.

    This setting reduces the receiver queue size for individual partitions if the total receiver queue size exceeds this value.|50000
-`consumerName`|String|Consumer name|null
-`ackTimeoutMillis`|long|Timeout of unacked messages|0
-`tickDurationMillis`|long|Granularity of the ack-timeout redelivery.

    Using an higher `tickDurationMillis` reduces the memory overhead to track messages when setting ack-timeout to a bigger value (for example, 1 hour).|1000
-`priorityLevel`|int|Priority level for a consumer to which a broker gives more priority while dispatching messages in Shared subscription type. 

    The broker follows descending priorities. For example, 0=max-priority, 1, 2,...

    In Shared subscription type, the broker **first dispatches messages to the max priority level consumers if they have permits**. Otherwise, the broker considers next priority level consumers.

     **Example 1**
    If a subscription has consumerA with `priorityLevel` 0 and consumerB with `priorityLevel` 1, then the broker **only dispatches messages to consumerA until it runs out permits** and then starts dispatching messages to consumerB.

    **Example 2**
    Consumer Priority, Level, Permits
    C1, 0, 2
    C2, 0, 1
    C3, 0, 1
    C4, 1, 2
    C5, 1, 1

    Order in which a broker dispatches messages to consumers is: C1, C2, C3, C1, C4, C5, C4.|0
-`cryptoFailureAction`|ConsumerCryptoFailureAction|Consumer should take action when it receives a message that can not be decrypted.
  • **FAIL**: this is the default option to fail messages until crypto succeeds.
  •  **DISCARD**:silently acknowledge and not deliver message to an application.
  • **CONSUME**: deliver encrypted messages to applications. It is the application's responsibility to decrypt the message.

    • The decompression of message fails. 

    If messages contain batch messages, a client is not be able to retrieve individual messages in batch.

    Delivered encrypted message contains {@link EncryptionContext} which contains encryption and compression information in it using which application can decrypt consumed message payload.|
  • ConsumerCryptoFailureAction.FAIL
    • 
-`properties`|SortedMap|A name or value property of this consumer.

    `properties` is application defined metadata attached to a consumer. 

    When getting a topic stats, associate this metadata with the consumer stats for easier identification.|new TreeMap()
-`readCompacted`|boolean|If enabling `readCompacted`, a consumer reads messages from a compacted topic rather than reading a full message backlog of a topic.

     A consumer only sees the latest value for each key in the compacted topic, up until reaching the point in the topic message when compacting backlog. Beyond that point, send messages as normal.

    Only enabling `readCompacted` on subscriptions to persistent topics, which have a single active consumer (like failure or exclusive subscriptions). 

    Attempting to enable it on subscriptions to non-persistent topics or on shared subscriptions leads to a subscription call throwing a `PulsarClientException`.|false
-`subscriptionInitialPosition`|SubscriptionInitialPosition|Initial position at which to set cursor when subscribing to a topic at first time.|SubscriptionInitialPosition.Latest
-`patternAutoDiscoveryPeriod`|int|Topic auto discovery period when using a pattern for topic's consumer.

    The default and minimum value is 1 minute.|1
-`regexSubscriptionMode`|RegexSubscriptionMode|When subscribing to a topic using a regular expression, you can pick a certain type of topics.

  • **PersistentOnly**: only subscribe to persistent topics.
  • **NonPersistentOnly**: only subscribe to non-persistent topics.
  • **AllTopics**: subscribe to both persistent and non-persistent topics.
    • |RegexSubscriptionMode.PersistentOnly
-`deadLetterPolicy`|DeadLetterPolicy|Dead letter policy for consumers.

    By default, some messages are probably redelivered many times, even to the extent that it never stops.

    By using the dead letter mechanism, messages have the max redelivery count. **When exceeding the maximum number of redeliveries, messages are sent to the Dead Letter Topic and acknowledged automatically**.

    You can enable the dead letter mechanism by setting `deadLetterPolicy`.

    **Example**

    client.newConsumer()
    .deadLetterPolicy(DeadLetterPolicy.builder().maxRedeliverCount(10).build())
    .subscribe();

    Default dead letter topic name is `{TopicName}-{Subscription}-DLQ`.

    To set a custom dead letter topic name:
    client.newConsumer()
    .deadLetterPolicy(DeadLetterPolicy.builder().maxRedeliverCount(10)
    .deadLetterTopic("your-topic-name").build())
    .subscribe();

    When specifying the dead letter policy while not specifying `ackTimeoutMillis`, you can set the ack timeout to 30000 millisecond.|None
-`autoUpdatePartitions`|boolean|If `autoUpdatePartitions` is enabled, a consumer subscribes to partition increasement automatically.

    **Note**: this is only for partitioned consumers.|true
-`replicateSubscriptionState`|boolean|If `replicateSubscriptionState` is enabled, a subscription state is replicated to geo-replicated clusters.|false
-`negativeAckRedeliveryBackoff`|RedeliveryBackoff|Interface for custom message is negativeAcked policy. You can specify `RedeliveryBackoff` for a consumer.| `MultiplierRedeliveryBackoff`
-`ackTimeoutRedeliveryBackoff`|RedeliveryBackoff|Interface for custom message is ackTimeout policy. You can specify `RedeliveryBackoff` for a consumer.| `MultiplierRedeliveryBackoff`
-`autoAckOldestChunkedMessageOnQueueFull`|boolean|Whether to automatically acknowledge pending chunked messages when the threashold of `maxPendingChunkedMessage` is reached. If set to `false`, these messages will be redelivered by their broker. |true
-`maxPendingChunkedMessage`|int| The maximum size of a queue holding pending chunked messages. When the threshold is reached, the consumer drops pending messages to optimize memory utilization.|10
-`expireTimeOfIncompleteChunkedMessageMillis`|long|The time interval to expire incomplete chunks if a consumer fails to receive all the chunks in the specified time period. The default value is 1 minute. | 60000
-
-You can configure parameters if you do not want to use the default configuration. For a full list, see the Javadoc for the {@inject: javadoc:ConsumerBuilder:/client/org/apache/pulsar/client/api/ConsumerBuilder} class. 
-
-The following is an example.
-
-```java
-
-Consumer consumer = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .ackTimeout(10, TimeUnit.SECONDS)
-        .subscriptionType(SubscriptionType.Exclusive)
-        .subscribe();
-
-```
-
-### Async receive
-
-The `receive` method receives messages synchronously (the consumer process is blocked until a message is available). You can also use [async receive](concepts-messaging.md#receive-modes), which returns a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture) object immediately once a new message is available.
-
-The following is an example.
-
-```java
-
-CompletableFuture asyncMessage = consumer.receiveAsync();
-
-```
-
-Async receive operations return a {@inject: javadoc:Message:/client/org/apache/pulsar/client/api/Message} wrapped inside of a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture).
-
-### Batch receive
-
-Use `batchReceive` to receive multiple messages for each call. 
-
-The following is an example.
-
-```java
-
-Messages messages = consumer.batchReceive();
-for (Object message : messages) {
-  // do something
-}
-consumer.acknowledge(messages)
-
-```
-
-:::note
-
-Batch receive policy limits the number and bytes of messages in a single batch. You can specify a timeout to wait for enough messages.
-The batch receive is completed if any of the following conditions is met: enough number of messages, bytes of messages, wait timeout.
-
-```java
-
-Consumer consumer = client.newConsumer()
-.topic("my-topic")
-.subscriptionName("my-subscription")
-.batchReceivePolicy(BatchReceivePolicy.builder()
-.maxNumMessages(100)
-.maxNumBytes(1024 * 1024)
-.timeout(200, TimeUnit.MILLISECONDS)
-.build())
-.subscribe();
-
-```
-
-The default batch receive policy is:
-
-```java
-
-BatchReceivePolicy.builder()
-.maxNumMessage(-1)
-.maxNumBytes(10 * 1024 * 1024)
-.timeout(100, TimeUnit.MILLISECONDS)
-.build();
-
-```
-
-:::
-
-### Configure chunking
-
-You can limit the maximum number of chunked messages a consumer maintains concurrently by configuring the `maxPendingChunkedMessage` and `autoAckOldestChunkedMessageOnQueueFull` parameters. When the threshold is reached, the consumer drops pending messages by silently acknowledging them or asking the broker to redeliver them later. The `expireTimeOfIncompleteChunkedMessage` parameter decides the time interval to expire incomplete chunks if the consumer fails to receive all chunks of a message within the specified time period.
-
-The following is an example of how to configure message chunking.
-
-```java
-
-Consumer consumer = client.newConsumer()
-        .topic(topic)
-        .subscriptionName("test")
-        .autoAckOldestChunkedMessageOnQueueFull(true)
-        .maxPendingChunkedMessage(100)
-        .expireTimeOfIncompleteChunkedMessage(10, TimeUnit.MINUTES)
-        .subscribe();
-
-```
-
-### Negative acknowledgment redelivery backoff
-
-The `RedeliveryBackoff` introduces a redelivery backoff mechanism. You can achieve redelivery with different delays by setting `redeliveryCount ` of messages. 
-
-```java
-
-Consumer consumer =  client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .negativeAckRedeliveryBackoff(MultiplierRedeliveryBackoff.builder()
-                .minDelayMs(1000)
-                .maxDelayMs(60 * 1000)
-                .build())
-        .subscribe();
-
-```
-
-### Acknowledgement timeout redelivery backoff
-
-The `RedeliveryBackoff` introduces a redelivery backoff mechanism. You can redeliver messages with different delays by setting the number
-of times the messages is retried.
-
-```java
-
-Consumer consumer =  client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .ackTimeout(10, TimeUnit.SECOND)
-        .ackTimeoutRedeliveryBackoff(MultiplierRedeliveryBackoff.builder()
-                .minDelayMs(1000)
-                .maxDelayMs(60000)
-                .multiplier(2)
-                .build())
-        .subscribe();
-
-```
-
-The message redelivery behavior should be as follows.
-
-Redelivery count | Redelivery delay
-:--------------------|:-----------
-1 | 10 + 1 seconds
-2 | 10 + 2 seconds
-3 | 10 + 4 seconds
-4 | 10 + 8 seconds
-5 | 10 + 16 seconds
-6 | 10 + 32 seconds
-7 | 10 + 60 seconds
-8 | 10 + 60 seconds
-
-:::note
-
-- The `negativeAckRedeliveryBackoff` does not work with `consumer.negativeAcknowledge(MessageId messageId)` because you are not able to get the redelivery count from the message ID.
-- If a consumer crashes, it triggers the redelivery of unacked messages. In this case, `RedeliveryBackoff` does not take effect and the messages might get redelivered earlier than the delay time from the backoff.
-
-:::
-
-### Multi-topic subscriptions
-
-In addition to subscribing a consumer to a single Pulsar topic, you can also subscribe to multiple topics simultaneously using [multi-topic subscriptions](concepts-messaging.md#multi-topic-subscriptions). To use multi-topic subscriptions you can supply either a regular expression (regex) or a `List` of topics. If you select topics via regex, all topics must be within the same Pulsar namespace.
-
-The followings are some examples.
-
-```java
-
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.PulsarClient;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-
-ConsumerBuilder consumerBuilder = pulsarClient.newConsumer()
-        .subscriptionName(subscription);
-
-// Subscribe to all topics in a namespace
-Pattern allTopicsInNamespace = Pattern.compile("public/default/.*");
-Consumer allTopicsConsumer = consumerBuilder
-        .topicsPattern(allTopicsInNamespace)
-        .subscribe();
-
-// Subscribe to a subsets of topics in a namespace, based on regex
-Pattern someTopicsInNamespace = Pattern.compile("public/default/foo.*");
-Consumer allTopicsConsumer = consumerBuilder
-        .topicsPattern(someTopicsInNamespace)
-        .subscribe();
-
-```
-
-In the above example, the consumer subscribes to the `persistent` topics that can match the topic name pattern. If you want the consumer subscribes to all `persistent` and `non-persistent` topics that can match the topic name pattern, set `subscriptionTopicsMode` to `RegexSubscriptionMode.AllTopics`.
-
-```java
-
-Pattern pattern = Pattern.compile("public/default/.*");
-pulsarClient.newConsumer()
-        .subscriptionName("my-sub")
-        .topicsPattern(pattern)
-        .subscriptionTopicsMode(RegexSubscriptionMode.AllTopics)
-        .subscribe();
-
-```
-
-:::note
-
-By default, the `subscriptionTopicsMode` of the consumer is `PersistentOnly`. Available options of `subscriptionTopicsMode` are `PersistentOnly`, `NonPersistentOnly`, and `AllTopics`.
-
-:::
-
-You can also subscribe to an explicit list of topics (across namespaces if you wish):
-
-```java
-
-List topics = Arrays.asList(
-        "topic-1",
-        "topic-2",
-        "topic-3"
-);
-
-Consumer multiTopicConsumer = consumerBuilder
-        .topics(topics)
-        .subscribe();
-
-// Alternatively:
-Consumer multiTopicConsumer = consumerBuilder
-        .topic(
-            "topic-1",
-            "topic-2",
-            "topic-3"
-        )
-        .subscribe();
-
-```
-
-You can also subscribe to multiple topics asynchronously using the `subscribeAsync` method rather than the synchronous `subscribe` method. The following is an example.
-
-```java
-
-Pattern allTopicsInNamespace = Pattern.compile("persistent://public/default.*");
-consumerBuilder
-        .topics(topics)
-        .subscribeAsync()
-        .thenAccept(this::receiveMessageFromConsumer);
-
-private void receiveMessageFromConsumer(Object consumer) {
-    ((Consumer)consumer).receiveAsync().thenAccept(message -> {
-                // Do something with the received message
-                receiveMessageFromConsumer(consumer);
-            });
-}
-
-```
-
-### Subscription types
-
-Pulsar has various [subscription types](concepts-messaging#subscription-types) to match different scenarios. A topic can have multiple subscriptions with different subscription types. However, a subscription can only have one subscription type at a time.
-
-A subscription is identical with the subscription name; a subscription name can specify only one subscription type at a time. To change the subscription type, you should first stop all consumers of this subscription.
-
-Different subscription types have different message distribution types. This section describes the differences between subscription types and how to use them.
-
-In order to better describe their differences, assuming you have a topic named "my-topic", and the producer has published 10 messages.
-
-```java
-
-Producer producer = client.newProducer(Schema.STRING)
-        .topic("my-topic")
-        .enableBatching(false)
-        .create();
-// 3 messages with "key-1", 3 messages with "key-2", 2 messages with "key-3" and 2 messages with "key-4"
-producer.newMessage().key("key-1").value("message-1-1").send();
-producer.newMessage().key("key-1").value("message-1-2").send();
-producer.newMessage().key("key-1").value("message-1-3").send();
-producer.newMessage().key("key-2").value("message-2-1").send();
-producer.newMessage().key("key-2").value("message-2-2").send();
-producer.newMessage().key("key-2").value("message-2-3").send();
-producer.newMessage().key("key-3").value("message-3-1").send();
-producer.newMessage().key("key-3").value("message-3-2").send();
-producer.newMessage().key("key-4").value("message-4-1").send();
-producer.newMessage().key("key-4").value("message-4-2").send();
-
-```
-
-#### Exclusive
-
-Create a new consumer and subscribe with the `Exclusive` subscription type.
-
-```java
-
-Consumer consumer = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Exclusive)
-        .subscribe()
-
-```
-
-Only the first consumer is allowed to the subscription, other consumers receive an error. The first consumer receives all 10 messages, and the consuming order is the same as the producing order.
-
-:::note
-
-If topic is a partitioned topic, the first consumer subscribes to all partitioned topics, other consumers are not assigned with partitions and receive an error. 
-
-:::
-
-#### Failover
-
-Create new consumers and subscribe with the`Failover` subscription type.
-
-```java
-
-Consumer consumer1 = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Failover)
-        .subscribe()
-Consumer consumer2 = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Failover)
-        .subscribe()
-//conumser1 is the active consumer, consumer2 is the standby consumer.
-//consumer1 receives 5 messages and then crashes, consumer2 takes over as an  active consumer.
-
-```
-
-Multiple consumers can attach to the same subscription, yet only the first consumer is active, and others are standby. When the active consumer is disconnected, messages will be dispatched to one of standby consumers, and the standby consumer then becomes active consumer. 
-
-If the first active consumer is disconnected after receiving 5 messages, the standby consumer becomes active consumer. Consumer1 will receive:
-
-```
-
-("key-1", "message-1-1")
-("key-1", "message-1-2")
-("key-1", "message-1-3")
-("key-2", "message-2-1")
-("key-2", "message-2-2")
-
-```
-
-consumer2 will receive:
-
-```
-
-("key-2", "message-2-3")
-("key-3", "message-3-1")
-("key-3", "message-3-2")
-("key-4", "message-4-1")
-("key-4", "message-4-2")
-
-```
-
-:::note
-
-If a topic is a partitioned topic, each partition has only one active consumer, messages of one partition are distributed to only one consumer, and messages of multiple partitions are distributed to multiple consumers. 
-
-:::
-
-#### Shared
-
-Create new consumers and subscribe with `Shared` subscription type.
-
-```java
-
-Consumer consumer1 = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Shared)
-        .subscribe()
-  
-Consumer consumer2 = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Shared)
-        .subscribe()
-//Both consumer1 and consumer2 are active consumers.
-
-```
-
-In Shared subscription type, multiple consumers can attach to the same subscription and messages are delivered in a round-robin distribution across consumers.
-
-If a broker dispatches only one message at a time, consumer1 receives the following information.
-
-```
-
-("key-1", "message-1-1")
-("key-1", "message-1-3")
-("key-2", "message-2-2")
-("key-3", "message-3-1")
-("key-4", "message-4-1")
-
-```
-
-consumer2 receives the following information.
-
-```
-
-("key-1", "message-1-2")
-("key-2", "message-2-1")
-("key-2", "message-2-3")
-("key-3", "message-3-2")
-("key-4", "message-4-2")
-
-```
-
-`Shared` subscription is different from `Exclusive` and `Failover` subscription types. `Shared` subscription has better flexibility, but cannot provide order guarantee.
-
-#### Key_shared
-
-This is a new subscription type since 2.4.0 release. Create new consumers and subscribe with `Key_Shared` subscription type.
-
-```java
-
-Consumer consumer1 = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Key_Shared)
-        .subscribe()
-  
-Consumer consumer2 = client.newConsumer()
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Key_Shared)
-        .subscribe()
-//Both consumer1 and consumer2 are active consumers.
-
-```
-
-Just like in `Shared` subscription, all consumers in `Key_Shared` subscription type can attach to the same subscription. But `Key_Shared` subscription type is different from the `Shared` subscription. In `Key_Shared` subscription type, messages with the same key are delivered to only one consumer in order. The possible distribution of messages between different consumers (by default we do not know in advance which keys will be assigned to a consumer, but a key will only be assigned to a consumer at the same time).
-
-consumer1 receives the following information.
-
-```
-
-("key-1", "message-1-1")
-("key-1", "message-1-2")
-("key-1", "message-1-3")
-("key-3", "message-3-1")
-("key-3", "message-3-2")
-
-```
-
-consumer2 receives the following information.
-
-```
-
-("key-2", "message-2-1")
-("key-2", "message-2-2")
-("key-2", "message-2-3")
-("key-4", "message-4-1")
-("key-4", "message-4-2")
-
-```
-
-If batching is enabled at the producer side, messages with different keys are added to a batch by default. The broker will dispatch the batch to the consumer, so the default batch mechanism may break the Key_Shared subscription guaranteed message distribution semantics. The producer needs to use the `KeyBasedBatcher`.
-
-```java
-
-Producer producer = client.newProducer()
-        .topic("my-topic")
-        .batcherBuilder(BatcherBuilder.KEY_BASED)
-        .create();
-
-```
-
-Or the producer can disable batching.
-
-```java
-
-Producer producer = client.newProducer()
-        .topic("my-topic")
-        .enableBatching(false)
-        .create();
-
-```
-
-:::note
-
-If the message key is not specified, messages without key are dispatched to one consumer in order by default.
-
-:::
-
-## Reader 
-
-With the [reader interface](concepts-clients.md#reader-interface), Pulsar clients can "manually position" themselves within a topic and reading all messages from a specified message onward. The Pulsar API for Java enables you to create {@inject: javadoc:Reader:/client/org/apache/pulsar/client/api/Reader} objects by specifying a topic and a {@inject: javadoc:MessageId:/client/org/apache/pulsar/client/api/MessageId}.
-
-The following is an example.
-
-```java
-
-byte[] msgIdBytes = // Some message ID byte array
-MessageId id = MessageId.fromByteArray(msgIdBytes);
-Reader reader = pulsarClient.newReader()
-        .topic(topic)
-        .startMessageId(id)
-        .create();
-
-while (true) {
-    Message message = reader.readNext();
-    // Process message
-}
-
-```
-
-In the example above, a `Reader` object is instantiated for a specific topic and message (by ID); the reader iterates over each message in the topic after the message is identified by `msgIdBytes` (how that value is obtained depends on the application).
-
-The code sample above shows pointing the `Reader` object to a specific message (by ID), but you can also use `MessageId.earliest` to point to the earliest available message on the topic of `MessageId.latest` to point to the most recent available message.
-
-### Configure reader
-When you create a reader, you can use the `loadConf` configuration. The following parameters are available in `loadConf`.
-
-| Name | Type|  
    Description
     | Default
-|---|---|---|---
-`topicName`|String|Topic name. |None
-`receiverQueueSize`|int|Size of a consumer's receiver queue.

    For example, the number of messages that can be accumulated by a consumer before an application calls `Receive`.

    A value higher than the default value increases consumer throughput, though at the expense of more memory utilization.|1000
-`readerListener`|ReaderListener<T>|A listener that is called for message received.|None
-`readerName`|String|Reader name.|null
-`subscriptionName`|String| Subscription name|When there is a single topic, the default subscription name is `"reader-" + 10-digit UUID`.
    When there are multiple topics, the default subscription name is `"multiTopicsReader-" + 10-digit UUID`.
-`subscriptionRolePrefix`|String|Prefix of subscription role. |null
-`cryptoKeyReader`|CryptoKeyReader|Interface that abstracts the access to a key store.|null
-`cryptoFailureAction`|ConsumerCryptoFailureAction|Consumer should take action when it receives a message that can not be decrypted.
  • **FAIL**: this is the default option to fail messages until crypto succeeds.
  •  **DISCARD**: silently acknowledge and not deliver message to an application.
  • **CONSUME**: deliver encrypted messages to applications. It is the application's responsibility to decrypt the message.

    • The message decompression fails. 

    If messages contain batch messages, a client is not be able to retrieve individual messages in batch.

    Delivered encrypted message contains {@link EncryptionContext} which contains encryption and compression information in it using which application can decrypt consumed message payload.|
  • ConsumerCryptoFailureAction.FAIL
    • 
-`readCompacted`|boolean|If enabling `readCompacted`, a consumer reads messages from a compacted topic rather than a full message backlog of a topic.

     A consumer only sees the latest value for each key in the compacted topic, up until reaching the point in the topic message when compacting backlog. Beyond that point, send messages as normal.

    `readCompacted` can only be enabled on subscriptions to persistent topics, which have a single active consumer (for example, failure or exclusive subscriptions). 

    Attempting to enable it on subscriptions to non-persistent topics or on shared subscriptions leads to a subscription call throwing a `PulsarClientException`.|false
-`resetIncludeHead`|boolean|If set to true, the first message to be returned is the one specified by `messageId`.

    If set to false, the first message to be returned is the one next to the message specified by `messageId`.|false
-
-### Sticky key range reader
-
-In sticky key range reader, broker will only dispatch messages which hash of the message key contains by the specified key hash range. Multiple key hash ranges can be specified on a reader.
-
-The following is an example to create a sticky key range reader.
-
-```java
-
-pulsarClient.newReader()
-        .topic(topic)
-        .startMessageId(MessageId.earliest)
-        .keyHashRange(Range.of(0, 10000), Range.of(20001, 30000))
-        .create();
-
-```
-
-Total hash range size is 65536, so the max end of the range should be less than or equal to 65535.
-
-
-### Configure chunking
-
-Configuring chuncking for readers is similar to that for consumers. See [configure chunking for consumers](#configure-chunking) for more information.
-
-The following is an example of how to configure message chunking for a reader.
-
-```java
-
-Reader reader = pulsarClient.newReader()
-        .topic(topicName)
-        .startMessageId(MessageId.earliest)
-        .maxPendingChunkedMessage(12)
-        .autoAckOldestChunkedMessageOnQueueFull(true)
-        .expireTimeOfIncompleteChunkedMessage(12, TimeUnit.MILLISECONDS)
-        .create();
-
-```
-
-### Create reader with interceptor
-
-Pulsar reader interceptor intercepts and possibly mutates messages with user-defined processing before [Pulsar reader](concepts-clients.md#reader-interface) reads them. With reader interceptors, you can apply unified messaging processes before messages can be read, such as modifying messages, adding properties, collecting statistics and etc, without creating similar mechanisms respectively.
-
-![Reader interceptor](/assets/reader-interceptor.svg)
-
-Pulsar reader interceptor works on top of Pulsar consumer interceptor. The plugin interface `ReaderInterceptor` can be treated as a subset of `ConsumerInterceptor` and it has two main events.
-* `beforeRead` is triggered before readers read messages. You can modify messages within this event.
-* `onPartitionsChange` is triggered when changes on partitions have been detected.
-
-To perceive triggered events and perform customized processing, you can add `ReaderInterceptor` when creating a `Reader` as follows.
-
-```java
-
-PulsarClient pulsarClient = PulsarClient.builder().serviceUrl("pulsar://localhost:6650").build();
-Reader reader = pulsarClient.newReader()
-        .topic("t1")
-        .autoUpdatePartitionsInterval(5, TimeUnit.SECONDS)
-        .intercept(new ReaderInterceptor() {
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public Message beforeRead(Reader reader, Message message) {
-                // user-defined processing logic
-                return message;
-            }
-
-            @Override
-            public void onPartitionsChange(String topicName, int partitions) {
-                // user-defined processing logic
-            }
-        })
-        .startMessageId(MessageId.earliest)
-        .create();
-
-```
-
-## TableView
-
-The TableView interface serves an encapsulated access pattern, providing a continuously updated key-value map view of the compacted topic data. Messages without keys will be ignored.
-
-With TableView, Pulsar clients can fetch all the message updates from a topic and construct a map with the latest values of each key. These values can then be used to build a local cache of data. In addition, you can register consumers with the TableView by specifying a listener to perform a scan of the map and then receive notifications when new messages are received. Consequently, event handling can be triggered to serve use cases, such as event-driven applications and message monitoring.
-
-:::note
-
-Each TableView uses one Reader instance per partition, and reads the topic starting from the compacted view by default. It is highly recommended to enable automatic compaction by [configuring the topic compaction policies](cookbooks-compaction.md#configuring-compaction-to-run-automatically) for the given topic or namespace. More frequent compaction results in shorter startup times because less data is replayed to reconstruct the TableView of the topic.
-
-:::
-
-The following figure illustrates the dynamic construction of a TableView updated with newer values of each key.
-![TableView](/assets/tableview.png)
-
-### Configure TableView
- 
-The following is an example of how to configure a TableView.
-
-```java
-
-TableView tv = client.newTableViewBuilder(Schema.STRING)
-  .topic("my-tableview")
-  .create()
-
-```
-
-You can use the available parameters in the `loadConf` configuration or related [API](https://pulsar.apache.org/api/client/2.10.0-SNAPSHOT/org/apache/pulsar/client/api/TableViewBuilder.html) to customize your TableView.
-
-| Name | Type| Required? |  
    Description
     | Default
-|---|---|---|---|---
-| `topic` | string | yes | The topic name of the TableView. | N/A
-| `autoUpdatePartitionInterval` | int | no | The interval to check for newly added partitions. | 60 (seconds)
-
-### Register listeners
- 
-You can register listeners for both existing messages on a topic and new messages coming into the topic by using `forEachAndListen`, and specify to perform operations for all existing messages by using `forEach`.
-
-The following is an example of how to register listeners with TableView.
-
-```java
-
-// Register listeners for all existing and incoming messages
-tv.forEachAndListen((key, value) -> /*operations on all existing and incoming messages*/)
-
-// Register action for all existing messages
-tv.forEach((key, value) -> /*operations on all existing messages*/)
-
-```
-
-## Schema
-
-In Pulsar, all message data consists of byte arrays "under the hood." [Message schemas](schema-get-started.md) enable you to use other types of data when constructing and handling messages (from simple types like strings to more complex, application-specific types.md). If you construct, say, a [producer](#producer) without specifying a schema, then the producer can only produce messages of type `byte[]`. The following is an example.
-
-```java
-
-Producer producer = client.newProducer()
-        .topic(topic)
-        .create();
-
-```
-
-The producer above is equivalent to a `Producer` (in fact, you should *always* explicitly specify the type). If you'd like to use a producer for a different type of data, you'll need to specify a **schema** that informs Pulsar which data type will be transmitted over the [topic](reference-terminology.md#topic).
-
-### AvroBaseStructSchema example
-
-Let's say that you have a `SensorReading` class that you'd like to transmit over a Pulsar topic:
-
-```java
-
-public class SensorReading {
-    public float temperature;
-
-    public SensorReading(float temperature) {
-        this.temperature = temperature;
-    }
-
-    // A no-arg constructor is required
-    public SensorReading() {
-    }
-
-    public float getTemperature() {
-        return temperature;
-    }
-
-    public void setTemperature(float temperature) {
-        this.temperature = temperature;
-    }
-}
-
-```
-
-You could then create a `Producer` (or `Consumer`) like this:
-
-```java
-
-Producer producer = client.newProducer(JSONSchema.of(SensorReading.class))
-        .topic("sensor-readings")
-        .create();
-
-```
-
-The following schema formats are currently available for Java:
-
-* No schema or the byte array schema (which can be applied using `Schema.BYTES`):
-
-  ```java
-  
-  Producer bytesProducer = client.newProducer(Schema.BYTES)
-      .topic("some-raw-bytes-topic")
-      .create();
-  
-  ```
-
-  Or, equivalently:
-
-  ```java
-  
-  Producer bytesProducer = client.newProducer()
-      .topic("some-raw-bytes-topic")
-      .create();
-  
-  ```
-
-* `String` for normal UTF-8-encoded string data. Apply the schema using `Schema.STRING`:
-
-  ```java
-  
-  Producer stringProducer = client.newProducer(Schema.STRING)
-      .topic("some-string-topic")
-      .create();
-  
-  ```
-
-* Create JSON schemas for POJOs using `Schema.JSON`. The following is an example.
-
-  ```java
-  
-  Producer pojoProducer = client.newProducer(Schema.JSON(MyPojo.class))
-      .topic("some-pojo-topic")
-      .create();
-  
-  ```
-
-* Generate Protobuf schemas using `Schema.PROTOBUF`. The following example shows how to create the Protobuf schema and use it to instantiate a new producer:
-
-  ```java
-  
-  Producer protobufProducer = client.newProducer(Schema.PROTOBUF(MyProtobuf.class))
-      .topic("some-protobuf-topic")
-      .create();
-  
-  ```
-
-* Define Avro schemas with `Schema.AVRO`. The following code snippet demonstrates how to create and use Avro schema.
-
-  ```java
-  
-  Producer avroProducer = client.newProducer(Schema.AVRO(MyAvro.class))
-      .topic("some-avro-topic")
-      .create();
-  
-  ```
-
-### ProtobufNativeSchema example
-
-For example of ProtobufNativeSchema, see [`SchemaDefinition` in `Complex type`](schema-understand.md#complex-type).
-
-## Authentication
-
-Pulsar currently supports three authentication schemes: [TLS](security-tls-authentication.md), [Athenz](security-athenz.md), and [Oauth2](security-oauth2.md). You can use the Pulsar Java client with all of them.
-
-### TLS Authentication
-
-To use [TLS](security-tls-authentication.md), `enableTls` method is deprecated and you need to use "pulsar+ssl://" in serviceUrl to enable, point your Pulsar client to a TLS cert path, and provide paths to cert and key files.
-
-The following is an example.
-
-```java
-
-Map authParams = new HashMap();
-authParams.put("tlsCertFile", "/path/to/client-cert.pem");
-authParams.put("tlsKeyFile", "/path/to/client-key.pem");
-
-Authentication tlsAuth = AuthenticationFactory
-        .create(AuthenticationTls.class.getName(), authParams);
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar+ssl://my-broker.com:6651")
-        .tlsTrustCertsFilePath("/path/to/cacert.pem")
-        .authentication(tlsAuth)
-        .build();
-
-```
-
-### Athenz
-
-To use [Athenz](security-athenz.md) as an authentication provider, you need to [use TLS](#tls-authentication) and provide values for four parameters in a hash:
-
-* `tenantDomain`
-* `tenantService`
-* `providerDomain`
-* `privateKey`
-
-You can also set an optional `keyId`. The following is an example.
-
-```java
-
-Map authParams = new HashMap();
-authParams.put("tenantDomain", "shopping"); // Tenant domain name
-authParams.put("tenantService", "some_app"); // Tenant service name
-authParams.put("providerDomain", "pulsar"); // Provider domain name
-authParams.put("privateKey", "file:///path/to/private.pem"); // Tenant private key path
-authParams.put("keyId", "v1"); // Key id for the tenant private key (optional, default: "0")
-
-Authentication athenzAuth = AuthenticationFactory
-        .create(AuthenticationAthenz.class.getName(), authParams);
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar+ssl://my-broker.com:6651")
-        .tlsTrustCertsFilePath("/path/to/cacert.pem")
-        .authentication(athenzAuth)
-        .build();
-
-```
-
-> #### Supported pattern formats
-> The `privateKey` parameter supports the following three pattern formats:
-> * `file:///path/to/file`
-> * `file:/path/to/file`
-> * `data:application/x-pem-file;base64,`
-
-### Oauth2
-
-The following example shows how to use [Oauth2](security-oauth2.md) as an authentication provider for the Pulsar Java client.
-
-You can use the factory method to configure authentication for Pulsar Java client.
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar://broker.example.com:6650/")
-    .authentication(
-        AuthenticationFactoryOAuth2.clientCredentials(this.issuerUrl, this.credentialsUrl, this.audience))
-    .build();
-
-```
-
-In addition, you can also use the encoded parameters to configure authentication for Pulsar Java client.
-
-```java
-
-Authentication auth = AuthenticationFactory
-    .create(AuthenticationOAuth2.class.getName(), "{"type":"client_credentials","privateKey":"...","issuerUrl":"...","audience":"..."}");
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar://broker.example.com:6650/")
-    .authentication(auth)
-    .build();
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-python.md b/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-python.md
deleted file mode 100644
index 425aa0827d05b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-python.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-id: client-libraries-python
-title: The Pulsar Python client
-sidebar_label: "Python"
-original_id: client-libraries-python
----
-
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/incubator-pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
-
-## Installation
-
-You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from source.
-
-### Installation using pip
-
-To install the `pulsar-client` library as a pre-built package using the [pip](https://pip.pypa.io/en/stable/) package manager:
-
-```shell
-
-$ pip install pulsar-client==@pulsar:version_number@
-
-```
-
-Installation via PyPi is available for the following Python versions:
-
-Platform | Supported Python versions
-:--------|:-------------------------
-MacOS 
     10.11 (El Capitan) — 10.12 (Sierra) — 10.13 (High Sierra) | 2.7, 3.7
-Linux | 2.7, 3.3, 3.4, 3.5, 3.6, 3.7
-
-### Installing from source
-
-To install the `pulsar-client` library by building from source, follow [these instructions](client-libraries-cpp.md#compilation) and compile the Pulsar C++ client library. That will also build the Python binding for the library.
-
-To install the built Python bindings:
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-$ cd pulsar/pulsar-client-cpp/python
-$ sudo python setup.py install
-
-```
-
-## API Reference
-
-The complete Python API reference is available at [api/python](/api/python).
-
-## Examples
-
-Below you'll find a variety of Python code examples for the `pulsar-client` library.
-
-### Producer example
-
-This creates a Python producer for the `my-topic` topic and send 10 messages on that topic:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-
-producer = client.create_producer('my-topic')
-
-for i in range(10):
-    producer.send(('Hello-%d' % i).encode('utf-8'))
-
-client.close()
-
-```
-
-### Consumer example
-
-This creates a consumer with the `my-subscription` subscription on the `my-topic` topic, listen for incoming messages, print the content and ID of messages that arrive, and acknowledge each message to the Pulsar broker:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-
-consumer = client.subscribe('my-topic', 'my-subscription')
-
-while True:
-    msg = consumer.receive()
-    print("Received message '{}' id='{}'".format(msg.data(), msg.message_id()))
-    consumer.acknowledge(msg)
-
-client.close()
-
-```
-
-### Reader interface example
-
-You can use the Pulsar Python API to use the Pulsar [reader interface](concepts-clients.md#reader-interface). Here's an example:
-
-```python
-
-# MessageId taken from a previously fetched message
-msg_id = msg.message_id()
-
-reader = client.create_reader('my-topic', msg_id)
-
-while True:
-    msg = reader.read_next()
-    print("Received message '{}' id='{}'".format(msg.data(), msg.message_id()))
-    # No acknowledgment
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-websocket.md b/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-websocket.md
deleted file mode 100644
index 0b31ffe78161a..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries-websocket.md
+++ /dev/null
@@ -1,663 +0,0 @@
----
-id: client-libraries-websocket
-title: Pulsar WebSocket API
-sidebar_label: "WebSocket"
----
-
-Pulsar [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) API provides a simple way to interact with Pulsar using languages that do not have an official [client library](getting-started-clients.md). Through WebSocket, you can publish and consume messages and use features available on the [Client Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) page.
-
-
-> You can use Pulsar WebSocket API with any WebSocket client library. See examples for Python and Node.js [below](#client-examples).
-
-## Running the WebSocket service
-
-The standalone variant of Pulsar that we recommend using for [local development](getting-started-standalone.md) already has the WebSocket service enabled.
-
-In non-standalone mode, there are two ways to deploy the WebSocket service:
-
-* [embedded](#embedded-with-a-pulsar-broker) with a Pulsar broker
-* as a [separate component](#as-a-separate-component)
-
-### Embedded with a Pulsar broker
-
-In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the [`webSocketServiceEnabled`](reference-configuration.md#broker-webSocketServiceEnabled) parameter in the [`conf/broker.conf`](reference-configuration.md#broker) configuration file in your installation.
-
-```properties
-
-webSocketServiceEnabled=true
-
-```
-
-### As a separate component
-
-In this mode, the WebSocket service will be run from a Pulsar [broker](reference-terminology.md#broker) as a separate service. Configuration for this mode is handled in the [`conf/websocket.conf`](reference-configuration.md#websocket) configuration file. You'll need to set *at least* the following parameters:
-
-* [`configurationMetadataStoreUrl`](reference-configuration.md#websocket)
-* [`webServicePort`](reference-configuration.md#websocket-webServicePort)
-* [`clusterName`](reference-configuration.md#websocket-clusterName)
-
-Here's an example:
-
-```properties
-
-configurationMetadataStoreUrl=zk1:2181,zk2:2181,zk3:2181
-webServicePort=8080
-clusterName=my-cluster
-
-```
-
-### Security settings
-
-To enable TLS encryption on WebSocket service:
-
-```properties
-
-tlsEnabled=true
-tlsAllowInsecureConnection=false
-tlsCertificateFilePath=/path/to/client-websocket.cert.pem
-tlsKeyFilePath=/path/to/client-websocket.key-pk8.pem
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-
-```
-
-### Starting the broker
-
-When the configuration is set, you can start the service using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) tool:
-
-```shell
-
-$ bin/pulsar-daemon start websocket
-
-```
-
-## API Reference
-
-Pulsar's WebSocket API offers three endpoints for [producing](#producer-endpoint) messages, [consuming](#consumer-endpoint) messages and [reading](#reader-endpoint) messages.
-
-All exchanges via the WebSocket API use JSON.
-
-### Authentication
-
-#### Browser javascript WebSocket client
-
-Use the query param `token` transport the authentication token.
-
-```http
-
-ws://broker-service-url:8080/path?token=token
-
-```
-
-### Producer endpoint
-
-The producer endpoint requires you to specify a tenant, namespace, and topic in the URL:
-
-```http
-
-ws://broker-service-url:8080/ws/v2/producer/persistent/:tenant/:namespace/:topic
-
-```
-
-##### Query param
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`sendTimeoutMillis` | long | no | Send timeout (default: 30 secs)
-`batchingEnabled` | boolean | no | Enable batching of messages (default: false)
-`batchingMaxMessages` | int | no | Maximum number of messages permitted in a batch (default: 1000)
-`maxPendingMessages` | int | no | Set the max size of the internal-queue holding the messages (default: 1000)
-`batchingMaxPublishDelay` | long | no | Time period within which the messages will be batched (default: 10ms)
-`messageRoutingMode` | string | no | Message [routing mode](https://pulsar.apache.org/api/client/index.html?org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html) for the partitioned producer: `SinglePartition`, `RoundRobinPartition`
-`compressionType` | string | no | Compression [type](https://pulsar.apache.org/api/client/index.html?org/apache/pulsar/client/api/CompressionType.html): `LZ4`, `ZLIB`
-`producerName` | string | no | Specify the name for the producer. Pulsar will enforce only one producer with same name can be publishing on a topic
-`initialSequenceId` | long | no | Set the baseline for the sequence ids for messages published by the producer.
-`hashingScheme` | string | no | [Hashing function](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html) to use when publishing on a partitioned topic: `JavaStringHash`, `Murmur3_32Hash`
-`token` | string | no | Authentication token, this is used for the browser javascript client
-
-
-#### Publishing a message
-
-```json
-
-{
-  "payload": "SGVsbG8gV29ybGQ=",
-  "properties": {"key1": "value1", "key2": "value2"},
-  "context": "1"
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`payload` | string | yes | Base-64 encoded payload
-`properties` | key-value pairs | no | Application-defined properties
-`context` | string | no | Application-defined request identifier
-`key` | string | no | For partitioned topics, decides which partition to use
-`replicationClusters` | array | no | Restrict replication to this list of [clusters](reference-terminology.md#cluster), specified by name
-
-
-##### Example success response
-
-```json
-
-{
-   "result": "ok",
-   "messageId": "CAAQAw==",
-   "context": "1"
- }
-
-```
-
-##### Example failure response
-
-```json
-
- {
-   "result": "send-error:3",
-   "errorMsg": "Failed to de-serialize from JSON",
-   "context": "1"
- }
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`result` | string | yes | `ok` if successful or an error message if unsuccessful
-`messageId` | string | yes | Message ID assigned to the published message
-`context` | string | no | Application-defined request identifier
-
-
-### Consumer endpoint
-
-The consumer endpoint requires you to specify a tenant, namespace, and topic, as well as a subscription, in the URL:
-
-```http
-
-ws://broker-service-url:8080/ws/v2/consumer/persistent/:tenant/:namespace/:topic/:subscription
-
-```
-
-##### Query param
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`ackTimeoutMillis` | long | no | Set the timeout for unacked messages (default: 0)
-`subscriptionType` | string | no | [Subscription type](https://pulsar.apache.org/api/client/index.html?org/apache/pulsar/client/api/SubscriptionType.html): `Exclusive`, `Failover`, `Shared`, `Key_Shared`
-`receiverQueueSize` | int | no | Size of the consumer receive queue (default: 1000)
-`consumerName` | string | no | Consumer name
-`priorityLevel` | int | no | Define a [priority](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html#setPriorityLevel-int-) for the consumer
-`maxRedeliverCount` | int | no | Define a [maxRedeliverCount](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerBuilder.html#deadLetterPolicy-org.apache.pulsar.client.api.DeadLetterPolicy-) for the consumer (default: 0). Activates [Dead Letter Topic](https://github.com/apache/pulsar/wiki/PIP-22%3A-Pulsar-Dead-Letter-Topic) feature.
-`deadLetterTopic` | string | no | Define a [deadLetterTopic](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ConsumerBuilder.html#deadLetterPolicy-org.apache.pulsar.client.api.DeadLetterPolicy-) for the consumer (default: {topic}-{subscription}-DLQ). Activates [Dead Letter Topic](https://github.com/apache/pulsar/wiki/PIP-22%3A-Pulsar-Dead-Letter-Topic) feature.
-`pullMode` | boolean | no | Enable pull mode (default: false). See "Flow Control" below.
-`negativeAckRedeliveryDelay` | int | no | When a message is negatively acknowledged, the delay time before the message is redelivered (in milliseconds). The default value is 60000.
-`token` | string | no | Authentication token, this is used for the browser javascript client
-
-NB: these parameter (except `pullMode`) apply to the internal consumer of the WebSocket service.
-So messages will be subject to the redelivery settings as soon as the get into the receive queue,
-even if the client doesn't consume on the WebSocket.
-
-##### Receiving messages
-
-Server will push messages on the WebSocket session:
-
-```json
-
-{
-  "messageId": "CAMQADAA",
-  "payload": "hvXcJvHW7kOSrUn17P2q71RA5SdiXwZBqw==",
-  "properties": {},
-  "publishTime": "2021-10-29T16:01:38.967-07:00",
-  "redeliveryCount": 0,
-  "encryptionContext": {
-    "keys": {
-      "client-rsa.pem": {
-        "keyValue": "jEuwS+PeUzmCo7IfLNxqoj4h7txbLjCQjkwpaw5AWJfZ2xoIdMkOuWDkOsqgFmWwxiecakS6GOZHs94x3sxzKHQx9Oe1jpwBg2e7L4fd26pp+WmAiLm/ArZJo6JotTeFSvKO3u/yQtGTZojDDQxiqFOQ1ZbMdtMZA8DpSMuq+Zx7PqLo43UdW1+krjQfE5WD+y+qE3LJQfwyVDnXxoRtqWLpVsAROlN2LxaMbaftv5HckoejJoB4xpf/dPOUqhnRstwQHf6klKT5iNhjsY4usACt78uILT0pEPd14h8wEBidBz/vAlC/zVMEqiDVzgNS7dqEYS4iHbf7cnWVCn3Hxw==",
-        "metadata": {}
-      }
-    },
-    "param": "Tfu1PxVm6S9D3+Hk",
-    "compressionType": "NONE",
-    "uncompressedMessageSize": 0,
-    "batchSize": {
-      "empty": false,
-      "present": true
-    }
-  }
-}
-
-```
-
-Below are the parameters in the WebSocket consumer response.
-
-- General parameters
-
-  Key | Type | Required? | Explanation
-  :---|:-----|:----------|:-----------
-  `messageId` | string | yes | Message ID
-  `payload` | string | yes | Base-64 encoded payload
-  `publishTime` | string | yes | Publish timestamp
-  `redeliveryCount` | number | yes | Number of times this message was already delivered
-  `properties` | key-value pairs | no | Application-defined properties
-  `key` | string | no |  Original routing key set by producer
-  `encryptionContext` | EncryptionContext | no | Encryption context that consumers can use to decrypt received messages
-  `param` | string | no | Initialization vector for cipher (Base64 encoding)
-  `batchSize` | string | no | Number of entries in a message (if it is a batch message)
-  `uncompressedMessageSize` | string | no | Message size before compression
-  `compressionType` | string | no | Algorithm used to compress the message payload
-
-- `encryptionContext` related parameter
-
-  Key | Type | Required? | Explanation
-  :---|:-----|:----------|:-----------
-  `keys` |key-EncryptionKey pairs | yes | Key in `key-EncryptionKey` pairs is an encryption key name. Value in `key-EncryptionKey` pairs is an encryption key object.
-
-- `encryptionKey` related parameters
-
-  Key | Type | Required? | Explanation
-  :---|:-----|:----------|:-----------
-  `keyValue` | string | yes | Encryption key (Base64 encoding)
-  `metadata` | key-value pairs | no | Application-defined metadata
-
-#### Acknowledging the message
-
-Consumer needs to acknowledge the successful processing of the message to
-have the Pulsar broker delete it.
-
-```json
-
-{
-  "messageId": "CAAQAw=="
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId`| string | yes | Message ID of the processed message
-
-#### Negatively acknowledging messages
-
-```json
-
-{
-  "type": "negativeAcknowledge",
-  "messageId": "CAAQAw=="
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId`| string | yes | Message ID of the processed message
-
-#### Flow control
-
-##### Push Mode
-
-By default (`pullMode=false`), the consumer endpoint will use the `receiverQueueSize` parameter both to size its
-internal receive queue and to limit the number of unacknowledged messages that are passed to the WebSocket client.
-In this mode, if you don't send acknowledgements, the Pulsar WebSocket service will stop sending messages after reaching
-`receiverQueueSize` unacked messages sent to the WebSocket client.
-
-##### Pull Mode
-
-If you set `pullMode` to `true`, the WebSocket client will need to send `permit` commands to permit the
-Pulsar WebSocket service to send more messages.
-
-```json
-
-{
-  "type": "permit",
-  "permitMessages": 100
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`type`| string | yes | Type of command. Must be `permit`
-`permitMessages`| int | yes | Number of messages to permit
-
-NB: in this mode it's possible to acknowledge messages in a different connection.
-
-#### Check if reach end of topic
-
-Consumer can check if it has reached end of topic by sending `isEndOfTopic` request.
-
-**Request**
-
-```json
-
-{
-  "type": "isEndOfTopic"
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`type`| string | yes | Type of command. Must be `isEndOfTopic`
-
-**Response**
-
-```json
-
-{
-   "endOfTopic": "true/false"
- }
-
-```
-
-### Reader endpoint
-
-The reader endpoint requires you to specify a tenant, namespace, and topic in the URL:
-
-```http
-
-ws://broker-service-url:8080/ws/v2/reader/persistent/:tenant/:namespace/:topic
-
-```
-
-##### Query param
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`readerName` | string | no | Reader name
-`receiverQueueSize` | int | no | Size of the consumer receive queue (default: 1000)
-`messageId` | int or enum | no | Message ID to start from, `earliest` or `latest` (default: `latest`)
-`token` | string | no | Authentication token, this is used for the browser javascript client
-
-##### Receiving messages
-
-Server will push messages on the WebSocket session:
-
-```json
-
-{
-  "messageId": "CAAQAw==",
-  "payload": "SGVsbG8gV29ybGQ=",
-  "properties": {"key1": "value1", "key2": "value2"},
-  "publishTime": "2016-08-30 16:45:57.785",
-  "redeliveryCount": 4
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId` | string | yes | Message ID
-`payload` | string | yes | Base-64 encoded payload
-`publishTime` | string | yes | Publish timestamp
-`redeliveryCount` | number | yes | Number of times this message was already delivered
-`properties` | key-value pairs | no | Application-defined properties
-`key` | string | no |  Original routing key set by producer
-
-#### Acknowledging the message
-
-**In WebSocket**, Reader needs to acknowledge the successful processing of the message to
-have the Pulsar WebSocket service update the number of pending messages.
-If you don't send acknowledgements, Pulsar WebSocket service will stop sending messages after reaching the pendingMessages limit.
-
-```json
-
-{
-  "messageId": "CAAQAw=="
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`messageId`| string | yes | Message ID of the processed message
-
-#### Check if reach end of topic
-
-Consumer can check if it has reached end of topic by sending `isEndOfTopic` request.
-
-**Request**
-
-```json
-
-{
-  "type": "isEndOfTopic"
-}
-
-```
-
-Key | Type | Required? | Explanation
-:---|:-----|:----------|:-----------
-`type`| string | yes | Type of command. Must be `isEndOfTopic`
-
-**Response**
-
-```json
-
-{
-   "endOfTopic": "true/false"
- }
-
-```
-
-### Error codes
-
-In case of error the server will close the WebSocket session using the
-following error codes:
-
-Error Code | Error Message
-:----------|:-------------
-1 | Failed to create producer
-2 | Failed to subscribe
-3 | Failed to deserialize from JSON
-4 | Failed to serialize to JSON
-5 | Failed to authenticate client
-6 | Client is not authorized
-7 | Invalid payload encoding
-8 | Unknown error
-
-> The application is responsible for re-establishing a new WebSocket session after a backoff period.
-
-## Client examples
-
-Below you'll find code examples for the Pulsar WebSocket API in [Python](#python) and [Node.js](#nodejs).
-
-### Python
-
-This example uses the [`websocket-client`](https://pypi.python.org/pypi/websocket-client) package. You can install it using [pip](https://pypi.python.org/pypi/pip):
-
-```shell
-
-$ pip install websocket-client
-
-```
-
-You can also download it from [PyPI](https://pypi.python.org/pypi/websocket-client).
-
-#### Python producer
-
-Here's an example Python producer that sends a simple message to a Pulsar [topic](reference-terminology.md#topic):
-
-```python
-
-import websocket, base64, json
-
-# If set enableTLS to true, your have to set tlsEnabled to true in conf/websocket.conf.
-enable_TLS = False
-scheme = 'ws'
-if enable_TLS:
-    scheme = 'wss'
-
-TOPIC = scheme + '://localhost:8080/ws/v2/producer/persistent/public/default/my-topic'
-
-ws = websocket.create_connection(TOPIC)
-
-# encode message
-s = "Hello World"
-firstEncoded = s.encode("UTF-8")
-binaryEncoded = base64.b64encode(firstEncoded)
-payloadString = binaryEncoded.decode('UTF-8')
-
-# Send one message as JSON
-ws.send(json.dumps({
-    'payload' : payloadString,
-    'properties': {
-        'key1' : 'value1',
-        'key2' : 'value2'
-    },
-    'context' : 5
-}))
-
-response =  json.loads(ws.recv())
-if response['result'] == 'ok':
-    print( 'Message published successfully')
-else:
-    print('Failed to publish message:', response)
-ws.close()
-
-```
-
-#### Python consumer
-
-Here's an example Python consumer that listens on a Pulsar topic and prints the message ID whenever a message arrives:
-
-```python
-
-import websocket, base64, json
-
-# If set enableTLS to true, your have to set tlsEnabled to true in conf/websocket.conf.
-enable_TLS = False
-scheme = 'ws'
-if enable_TLS:
-    scheme = 'wss'
-
-TOPIC = scheme + '://localhost:8080/ws/v2/consumer/persistent/public/default/my-topic/my-sub'
-
-ws = websocket.create_connection(TOPIC)
-
-while True:
-    msg = json.loads(ws.recv())
-    if not msg: break
-
-    print( "Received: {} - payload: {}".format(msg, base64.b64decode(msg['payload'])))
-
-    # Acknowledge successful processing
-    ws.send(json.dumps({'messageId' : msg['messageId']}))
-
-ws.close()
-
-```
-
-#### Python reader
-
-Here's an example Python reader that listens on a Pulsar topic and prints the message ID whenever a message arrives:
-
-```python
-
-import websocket, base64, json
-
-# If set enableTLS to true, your have to set tlsEnabled to true in conf/websocket.conf.
-enable_TLS = False
-scheme = 'ws'
-if enable_TLS:
-    scheme = 'wss'
-
-TOPIC = scheme + '://localhost:8080/ws/v2/reader/persistent/public/default/my-topic'
-ws = websocket.create_connection(TOPIC)
-
-while True:
-    msg = json.loads(ws.recv())
-    if not msg: break
-
-    print ( "Received: {} - payload: {}".format(msg, base64.b64decode(msg['payload'])))
-
-    # Acknowledge successful processing
-    ws.send(json.dumps({'messageId' : msg['messageId']}))
-
-ws.close()
-
-```
-
-### Node.js
-
-This example uses the [`ws`](https://websockets.github.io/ws/) package. You can install it using [npm](https://www.npmjs.com/):
-
-```shell
-
-$ npm install ws
-
-```
-
-#### Node.js producer
-
-Here's an example Node.js producer that sends a simple message to a Pulsar topic:
-
-```javascript
-
-const WebSocket = require('ws');
-
-// If set enableTLS to true, your have to set tlsEnabled to true in conf/websocket.conf.
-const enableTLS = false;
-const topic = `${enableTLS ? 'wss' : 'ws'}://localhost:8080/ws/v2/producer/persistent/public/default/my-topic`;
-const ws = new WebSocket(topic);
-
-var message = {
-  "payload" : new Buffer("Hello World").toString('base64'),
-  "properties": {
-    "key1" : "value1",
-    "key2" : "value2"
-  },
-  "context" : "1"
-};
-
-ws.on('open', function() {
-  // Send one message
-  ws.send(JSON.stringify(message));
-});
-
-ws.on('message', function(message) {
-  console.log('received ack: %s', message);
-});
-
-```
-
-#### Node.js consumer
-
-Here's an example Node.js consumer that listens on the same topic used by the producer above:
-
-```javascript
-
-const WebSocket = require('ws');
-
-// If set enableTLS to true, your have to set tlsEnabled to true in conf/websocket.conf.
-const enableTLS = false;
-const topic = `${enableTLS ? 'wss' : 'ws'}://localhost:8080/ws/v2/consumer/persistent/public/default/my-topic/my-sub`;
-const ws = new WebSocket(topic);
-
-ws.on('message', function(message) {
-    var receiveMsg = JSON.parse(message);
-    console.log('Received: %s - payload: %s', message, new Buffer(receiveMsg.payload, 'base64').toString());
-    var ackMsg = {"messageId" : receiveMsg.messageId};
-    ws.send(JSON.stringify(ackMsg));
-});
-
-```
-
-#### NodeJS reader
-
-```javascript
-
-const WebSocket = require('ws');
-
-// If set enableTLS to true, your have to set tlsEnabled to true in conf/websocket.conf.
-const enableTLS = false;
-const topic = `${enableTLS ? 'wss' : 'ws'}://localhost:8080/ws/v2/reader/persistent/public/default/my-topic`;
-const ws = new WebSocket(topic);
-
-ws.on('message', function(message) {
-    var receiveMsg = JSON.parse(message);
-    console.log('Received: %s - payload: %s', message, new Buffer(receiveMsg.payload, 'base64').toString());
-    var ackMsg = {"messageId" : receiveMsg.messageId};
-    ws.send(JSON.stringify(ackMsg));
-});
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries.md b/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries.md
deleted file mode 100644
index 8ebc0da713893..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/client-libraries.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-id: client-libraries
-title: Pulsar client libraries
-sidebar_label: "Client libraries"
-original_id: client-libraries
----
-
-Pulsar currently has client libraries available for following languages:
-
-* [Java](#java-client)
-* [Go](#go-client)
-* [Python](#python-client)
-* [C++](#c-client)
-
-## Java client
-
-For a tutorial on using the Pulsar Java client to produce and consume messages, see [The Pulsar Java client](client-libraries-java.md).
-
-There are also two independent sets of Javadoc API docs available:
-
-Library | Purpose
-:-------|:-------
-[`org.apache.pulsar.client.api`](/api/client) | The [Pulsar Java client](client-libraries-java.md) for producing and consuming messages on Pulsar topics [`org.apache.pulsar.client.admin`](/api/admin) | The Java client for the [Pulsar admin interface](admin-api-overview.md)
-
-
-## Go client
-
-For a tutorial on using the Pulsar Go client, see [The Pulsar Go client](client-libraries-go.md).
-
-
-## Python client
-
-For a tutorial on using the Pulsar Python client, see [The Pulsar Python client](client-libraries-python.md).
-
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](/api/python).
-
-## C++ client
-
-For a tutorial on using the Pulsar C++ clent, see [The Pulsar C++ client](client-libraries-cpp.md).
-
-There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API docs for the C++ client [here](/api/cpp).
-
-## Feature Matrix
-
-This matrix listing all the features among different languages in Pulsar master can be found [here](https://github.com/apache/pulsar/wiki/PIP-108:-Pulsar-Feature-Matrix-(Client-and-Function)).
-
-## Thirdparty Clients
-
-Besides the official released clients, there are also multiple projects on developing a Pulsar client in different languages.
-
-> if you have developed a Pulsar client, but it doesn't show up here. Feel free to submit a pull request to add your client to the list below.
-
-| Language | Project | Maintainer | License | Description |
-|----------|---------|------------|---------|-------------|
-| Go | [pulsar-client-go](https://github.com/Comcast/pulsar-client-go) | [Comcast](https://github.com/Comcast) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | A native golang client |
-| Go | [go-pulsar](https://github.com/t2y/go-pulsar) | [t2y](https://github.com/t2y) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | |
-| Scala | [pulsar4s](https://github.com/sksamuel/pulsar4s) | [sksamuel](https://github.com/sksamuel) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | Idomatic, typesafe, and reactive Scala client for Apache Pulsar |
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-architecture-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-architecture-overview.md
deleted file mode 100644
index 1ce346fc16941..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-architecture-overview.md
+++ /dev/null
@@ -1,175 +0,0 @@
----
-id: concepts-architecture-overview
-title: Architecture Overview
-sidebar_label: "Architecture"
----
-
-At the highest level, a Pulsar instance is composed of one or more Pulsar clusters. Clusters within an instance can [replicate](concepts-replication.md) data amongst themselves.
-
-In a Pulsar cluster:
-
-* One or more brokers handles and load balances incoming messages from producers, dispatches messages to consumers, communicates with the Pulsar configuration store to handle various coordination tasks, stores messages in BookKeeper instances (aka bookies), relies on a cluster-specific ZooKeeper cluster for certain tasks, and more.
-* A BookKeeper cluster consisting of one or more bookies handles [persistent storage](#persistent-storage) of messages.
-* A ZooKeeper cluster specific to that cluster handles coordination tasks between Pulsar clusters.
-
-The diagram below provides an illustration of a Pulsar cluster:
-
-![Pulsar architecture diagram](/assets/pulsar-system-architecture.png)
-
-At the broader instance level, an instance-wide ZooKeeper cluster called the configuration store handles coordination tasks involving multiple clusters, for example [geo-replication](concepts-replication.md).
-
-## Brokers
-
-The Pulsar message broker is a stateless component that's primarily responsible for running two other components:
-
-* An HTTP server that exposes a {@inject: rest:REST:/} API for both administrative tasks and [topic lookup](concepts-clients.md#client-setup-phase) for producers and consumers. The producers connect to the brokers to publish messages and the consumers connect to the brokers to consume the messages.
-* A dispatcher, which is an asynchronous TCP server over a custom [binary protocol](developing-binary-protocol.md) used for all data transfers
-
-Messages are typically dispatched out of a [managed ledger](#managed-ledgers) cache for the sake of performance, *unless* the backlog exceeds the cache size. If the backlog grows too large for the cache, the broker will start reading entries from BookKeeper.
-
-Finally, to support geo-replication on global topics, the broker manages replicators that tail the entries published in the local region and republish them to the remote region using the Pulsar [Java client library](client-libraries-java.md).
-
-> For a guide to managing Pulsar brokers, see the [brokers](admin-api-brokers.md) guide.
-
-## Clusters
-
-A Pulsar instance consists of one or more Pulsar *clusters*. Clusters, in turn, consist of:
-
-* One or more Pulsar [brokers](#brokers)
-* A ZooKeeper quorum used for cluster-level configuration and coordination
-* An ensemble of bookies used for [persistent storage](#persistent-storage) of messages
-
-Clusters can replicate amongst themselves using [geo-replication](concepts-replication.md).
-
-> For a guide to managing Pulsar clusters, see the [clusters](admin-api-clusters.md) guide.
-
-## Metadata store
-
-The Pulsar metadata store maintains all the metadata of a Pulsar cluster, such as topic metadata, schema, broker load data, and so on. Pulsar uses [Apache ZooKeeper](https://zookeeper.apache.org/) for metadata storage, cluster configuration, and coordination. The Pulsar metadata store can be deployed on a separate ZooKeeper cluster or deployed on an existing ZooKeeper cluster. You can use one ZooKeeper cluster for both Pulsar metadata store and BookKeeper metadata store. If you want to deploy Pulsar brokers connected to an existing BookKeeper cluster, you need to deploy separate ZooKeeper clusters for Pulsar metadata store and BookKeeper metadata store respectively.
-
-> Pulsar also supports more metadata backend services, including [ETCD](https://etcd.io/) and [RocksDB](http://rocksdb.org/) (for standalone Pulsar only). 
-
-
-In a Pulsar instance:
-
-* A configuration store quorum stores configuration for tenants, namespaces, and other entities that need to be globally consistent.
-* Each cluster has its own local ZooKeeper ensemble that stores cluster-specific configuration and coordination such as which brokers are responsible for which topics as well as ownership metadata, broker load reports, BookKeeper ledger metadata, and more.
-
-## Configuration store
-
-The configuration store maintains all the configurations of a Pulsar instance, such as clusters, tenants, namespaces, partitioned topic related configurations, and so on. A Pulsar instance can have a single local cluster, multiple local clusters, or multiple cross-region clusters. Consequently, the configuration store can share the configurations across multiple clusters under a Pulsar instance. The configuration store can be deployed on a separate ZooKeeper cluster or deployed on an existing ZooKeeper cluster.
-
-## Persistent storage
-
-Pulsar provides guaranteed message delivery for applications. If a message successfully reaches a Pulsar broker, it will be delivered to its intended target.
-
-This guarantee requires that non-acknowledged messages are stored in a durable manner until they can be delivered to and acknowledged by consumers. This mode of messaging is commonly called *persistent messaging*. In Pulsar, N copies of all messages are stored and synced on disk, for example 4 copies across two servers with mirrored [RAID](https://en.wikipedia.org/wiki/RAID) volumes on each server.
-
-### Apache BookKeeper
-
-Pulsar uses a system called [Apache BookKeeper](http://bookkeeper.apache.org/) for persistent message storage. BookKeeper is a distributed [write-ahead log](https://en.wikipedia.org/wiki/Write-ahead_logging) (WAL) system that provides a number of crucial advantages for Pulsar:
-
-* It enables Pulsar to utilize many independent logs, called [ledgers](#ledgers). Multiple ledgers can be created for topics over time.
-* It offers very efficient storage for sequential data that handles entry replication.
-* It guarantees read consistency of ledgers in the presence of various system failures.
-* It offers even distribution of I/O across bookies.
-* It's horizontally scalable in both capacity and throughput. Capacity can be immediately increased by adding more bookies to a cluster.
-* Bookies are designed to handle thousands of ledgers with concurrent reads and writes. By using multiple disk devices---one for journal and another for general storage--bookies are able to isolate the effects of read operations from the latency of ongoing write operations.
-
-In addition to message data, *cursors* are also persistently stored in BookKeeper. Cursors are [subscription](reference-terminology.md#subscription) positions for [consumers](reference-terminology.md#consumer). BookKeeper enables Pulsar to store consumer position in a scalable fashion.
-
-At the moment, Pulsar supports persistent message storage. This accounts for the `persistent` in all topic names. Here's an example:
-
-```http
-
-persistent://my-tenant/my-namespace/my-topic
-
-```
-
-> Pulsar also supports ephemeral ([non-persistent](concepts-messaging.md#non-persistent-topics)) message storage.
-
-
-You can see an illustration of how brokers and bookies interact in the diagram below:
-
-![Brokers and bookies](/assets/broker-bookie.png)
-
-
-### Ledgers
-
-A ledger is an append-only data structure with a single writer that is assigned to multiple BookKeeper storage nodes, or bookies. Ledger entries are replicated to multiple bookies. Ledgers themselves have very simple semantics:
-
-* A Pulsar broker can create a ledger, append entries to the ledger, and close the ledger.
-* After the ledger has been closed---either explicitly or because the writer process crashed---it can then be opened only in read-only mode.
-* Finally, when entries in the ledger are no longer needed, the whole ledger can be deleted from the system (across all bookies).
-
-#### Ledger read consistency
-
-The main strength of Bookkeeper is that it guarantees read consistency in ledgers in the presence of failures. Since the ledger can only be written to by a single process, that process is free to append entries very efficiently, without need to obtain consensus. After a failure, the ledger will go through a recovery process that will finalize the state of the ledger and establish which entry was last committed to the log. After that point, all readers of the ledger are guaranteed to see the exact same content.
-
-#### Managed ledgers
-
-Given that Bookkeeper ledgers provide a single log abstraction, a library was developed on top of the ledger called the *managed ledger* that represents the storage layer for a single topic. A managed ledger represents the abstraction of a stream of messages with a single writer that keeps appending at the end of the stream and multiple cursors that are consuming the stream, each with its own associated position.
-
-Internally, a single managed ledger uses multiple BookKeeper ledgers to store the data. There are two reasons to have multiple ledgers:
-
-1. After a failure, a ledger is no longer writable and a new one needs to be created.
-2. A ledger can be deleted when all cursors have consumed the messages it contains. This allows for periodic rollover of ledgers.
-
-### Journal storage
-
-In BookKeeper, *journal* files contain BookKeeper transaction logs. Before making an update to a [ledger](#ledgers), a bookie needs to ensure that a transaction describing the update is written to persistent (non-volatile) storage. A new journal file is created once the bookie starts or the older journal file reaches the journal file size threshold (configured using the [`journalMaxSizeMB`](reference-configuration.md#bookkeeper-journalMaxSizeMB) parameter).
-
-## Pulsar proxy
-
-One way for Pulsar clients to interact with a Pulsar [cluster](#clusters) is by connecting to Pulsar message [brokers](#brokers) directly. In some cases, however, this kind of direct connection is either infeasible or undesirable because the client doesn't have direct access to broker addresses. If you're running Pulsar in a cloud environment or on [Kubernetes](https://kubernetes.io) or an analogous platform, for example, then direct client connections to brokers are likely not possible.
-
-The **Pulsar proxy** provides a solution to this problem by acting as a single gateway for all of the brokers in a cluster. If you run the Pulsar proxy (which, again, is optional), all client connections with the Pulsar cluster will flow through the proxy rather than communicating with brokers.
-
-> 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 metadata store connection strings for the cluster-specific and instance-wide configuration store clusters. Here's an example:
-
-```bash
-
-$ cd /path/to/pulsar/directory
-$ bin/pulsar proxy \
-  --metadata-store zk:my-zk-1:2181,my-zk-2:2181,my-zk-3:2181 \
-  --configuration-metadata-store zk:my-zk-1:2181,my-zk-2:2181,my-zk-3:2181
-
-```
-
-> #### Pulsar proxy docs
-> For documentation on using the Pulsar proxy, see the [Pulsar proxy admin documentation](administration-proxy.md).
-
-
-Some important things to know about the Pulsar proxy:
-
-* Connecting clients don't need to provide *any* specific configuration to use the Pulsar proxy. You won't need to update the client configuration for existing applications beyond updating the IP used for the service URL (for example if you're running a load balancer over the Pulsar proxy).
-* [TLS encryption](security-tls-transport.md) and [authentication](security-tls-authentication.md) is supported by the Pulsar proxy
-
-## Service discovery
-
-[Clients](getting-started-clients.md) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL.
-
-You can use your own service discovery system if you'd like. If you use your own system, there is just one requirement: when a client performs an HTTP request to an endpoint, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to *some* active broker in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
-
-The diagram below illustrates Pulsar service discovery:
-
-![alt-text](/assets/pulsar-service-discovery.png)
-
-In this diagram, the Pulsar cluster is addressable via a single DNS name: `pulsar-cluster.acme.com`. A [Python client](client-libraries-python.md), for example, could access this Pulsar cluster like this:
-
-```python
-
-from pulsar import Client
-
-client = Client('pulsar://pulsar-cluster.acme.com:6650')
-
-```
-
-:::note
-
-In Pulsar, each topic is handled by only one broker. Initial requests from a client to read, update or delete a topic are sent to a broker that may not be the topic owner. If the broker cannot handle the request for this topic, it redirects the request to the appropriate broker.
-
-:::
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-authentication.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-authentication.md
deleted file mode 100644
index fbefead69f382..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-authentication.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-id: concepts-authentication
-title: Authentication and Authorization
-sidebar_label: "Authentication and Authorization"
----
-
-Pulsar supports a pluggable [authentication](security-overview.md) mechanism which can be configured at the proxy and/or the broker. Pulsar also supports a pluggable [authorization](security-authorization.md) mechanism. These mechanisms work together to identify the client and its access rights on topics, namespaces and tenants.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-clients.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-clients.md
deleted file mode 100644
index c0fe61cd06e76..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-clients.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-id: concepts-clients
-title: Pulsar Clients
-sidebar_label: "Clients"
----
-
-Pulsar exposes a client API with language bindings for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md), [C++](client-libraries-cpp.md) and [C#](client-libraries-dotnet.md). The client API optimizes and encapsulates Pulsar's client-broker communication protocol and exposes a simple and intuitive API for use by applications.
-
-Under the hood, the current official Pulsar client libraries support transparent reconnection and/or connection failover to brokers, queuing of messages until acknowledged by the broker, and heuristics such as connection retries with backoff.
-
-> **Custom client libraries**
-> If you'd like to create your own client library, we recommend consulting the documentation on Pulsar's custom [binary protocol](developing-binary-protocol.md).
-
-
-## Client setup phase
-
-Before an application creates a producer/consumer, the Pulsar client library needs to initiate a setup phase including two steps:
-
-1. The client attempts to determine the owner of the topic by sending an HTTP lookup request to the broker. The request could reach one of the active brokers which, by looking at the (cached) zookeeper metadata knows who is serving the topic or, in case nobody is serving it, tries to assign it to the least loaded broker.
-1. Once the client library has the broker address, it creates a TCP connection (or reuse an existing connection from the pool) and authenticates it. Within this connection, client and broker exchange binary commands from a custom protocol. At this point the client sends a command to create producer/consumer to the broker, which will comply after having validated the authorization policy.
-
-Whenever the TCP connection breaks, the client immediately re-initiates this setup phase and keeps trying with exponential backoff to re-establish the producer or consumer until the operation succeeds.
-
-## Reader interface
-
-In Pulsar, the "standard" [consumer interface](concepts-messaging.md#consumers) involves using consumers to listen on [topics](reference-terminology.md#topic), process incoming messages, and finally acknowledge those messages when they are processed. Whenever a new subscription is created, it is initially positioned at the end of the topic (by default), and consumers associated with that subscription begin reading with the first message created afterwards.  Whenever a consumer connects to a topic using a pre-existing subscription, it begins reading from the earliest message un-acked within that subscription. In summary, with the consumer interface, subscription cursors are automatically managed by Pulsar in response to [message acknowledgements](concepts-messaging.md#acknowledgement).
-
-The **reader interface** for Pulsar enables applications to manually manage cursors. When you use a reader to connect to a topic---rather than a consumer---you need to specify *which* message the reader begins reading from when it connects to a topic. When connecting to a topic, the reader interface enables you to begin with:
-
-* The **earliest** available message in the topic
-* The **latest** available message in the topic
-* Some other message between the earliest and the latest. If you select this option, you'll need to explicitly provide a message ID. Your application will be responsible for "knowing" this message ID in advance, perhaps fetching it from a persistent data store or cache.
-
-The reader interface is helpful for use cases like using Pulsar to provide effectively-once processing semantics for a stream processing system. For this use case, it's essential that the stream processing system be able to "rewind" topics to a specific message and begin reading there. The reader interface provides Pulsar clients with the low-level abstraction necessary to "manually position" themselves within a topic.
-
-Internally, the reader interface is implemented as a consumer using an exclusive, non-durable subscription to the topic with a randomly-allocated name.
-
-[ **IMPORTANT** ]
-
-Unlike subscription/consumer, readers are non-durable in nature and does not prevent data in a topic from being deleted, thus it is ***strongly*** advised that [data retention](cookbooks-retention-expiry.md) be configured. If data retention for a topic is not configured for an adequate amount of time, messages that the reader has not yet read might be deleted .  This causes the readers to essentially skip messages. Configuring the data retention for a topic guarantees the reader with a certain duration to read a message.
-
-Please also note that a reader can have a "backlog", but the metric is only used for users to know how behind the reader is. The metric is not considered for any backlog quota calculations. 
-
-![The Pulsar consumer and reader interfaces](/assets/pulsar-reader-consumer-interfaces.png)
-
-Here's a Java example that begins reading from the earliest available message on a topic:
-
-```java
-
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageId;
-import org.apache.pulsar.client.api.Reader;
-
-// Create a reader on a topic and for a specific message (and onward)
-Reader reader = pulsarClient.newReader()
-    .topic("reader-api-test")
-    .startMessageId(MessageId.earliest)
-    .create();
-
-while (true) {
-    Message message = reader.readNext();
-
-    // Process the message
-}
-
-```
-
-To create a reader that reads from the latest available message:
-
-```java
-
-Reader reader = pulsarClient.newReader()
-    .topic(topic)
-    .startMessageId(MessageId.latest)
-    .create();
-
-```
-
-To create a reader that reads from some message between the earliest and the latest:
-
-```java
-
-byte[] msgIdBytes = // Some byte array
-MessageId id = MessageId.fromByteArray(msgIdBytes);
-Reader reader = pulsarClient.newReader()
-    .topic(topic)
-    .startMessageId(id)
-    .create();
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-messaging.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-messaging.md
deleted file mode 100644
index 11b15cf814aa5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-messaging.md
+++ /dev/null
@@ -1,956 +0,0 @@
----
-id: concepts-messaging
-title: Messaging
-sidebar_label: "Messaging"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-Pulsar is built on the [publish-subscribe](https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern) pattern (often abbreviated to pub-sub). In this pattern, [producers](#producers) publish messages to [topics](#topics); [consumers](#consumers) [subscribe](#subscription-types) to those topics, process incoming messages, and send [acknowledgements](#acknowledgement) to the broker when processing is finished.
-
-When a subscription is created, Pulsar [retains](concepts-architecture-overview.md#persistent-storage) all messages, even if the consumer is disconnected. The retained messages are discarded only when a consumer acknowledges that all these messages are processed successfully. 
-
-If the consumption of a message fails and you want this message to be consumed again, you can enable [message redelivery mechanism](#message-redelivery) to request the broker to resend this message.
-
-## Messages
-
-Messages are the basic "unit" of Pulsar. The following table lists the components of messages.
-
-Component | Description
-:---------|:-------
-Value / data payload | The data carried by the message. All Pulsar messages contain raw bytes, although message data can also conform to data [schemas](schema-get-started.md).
-Key | The key (string type) of the message. It is a short name of message key or partition key. Messages are optionally tagged with keys, which is useful for features like [topic compaction](concepts-topic-compaction.md).
-Properties | An optional key/value map of user-defined properties.
-Producer name | The name of the producer who produces the message. If you do not specify a producer name, the default name is used. 
-Topic name | The name of the topic that the message is published to.
-Schema version | The version number of the schema that the message is produced with.
-Sequence ID | Each Pulsar message belongs to an ordered sequence on its topic. The sequence ID of a message is initially assigned by its producer, indicating its order in that sequence, and can also be customized.
    Sequence ID can be used for message deduplication. If `brokerDeduplicationEnabled` is set to `true`, the sequence ID of each message is unique within a producer of a topic (non-partitioned) or a partition.  
-Message ID | The message ID of a message is assigned by bookies as soon as the message is persistently stored. Message ID indicates a message’s specific position in a ledger and is unique within a Pulsar cluster.
-Publish time | The timestamp of when the message is published. The timestamp is automatically applied by the producer.
-Event time | An optional timestamp attached to a message by applications. For example, applications attach a timestamp on when the message is processed. If nothing is set to event time, the value is `0`. 
-
-The default size of a message is 5 MB. You can configure the max size of a message with the following configurations.
-
-- In the `broker.conf` file.
-
-  ```bash
-  
-  # The max size of a message (in bytes).
-  maxMessageSize=5242880
-  
-  ```
-
-- In the `bookkeeper.conf` file.
-
-  ```bash
-  
-  # The max size of the netty frame (in bytes). Any messages received larger than this value are rejected. The default value is 5 MB.
-  nettyMaxFrameSizeBytes=5253120
-  
-  ```
-
-> For more information on Pulsar messages, see Pulsar [binary protocol](developing-binary-protocol.md).
-
-## Producers
-
-A producer is a process that attaches to a topic and publishes messages to a Pulsar [broker](reference-terminology.md#broker). The Pulsar broker processes the messages.
-
-### Send modes
-
-Producers send messages to brokers synchronously (sync) or asynchronously (async).
-
-| Mode       | Description |
-|:-----------|-----------|
-| Sync send  | The producer waits for an acknowledgement from the broker after sending every message. If the acknowledgment is not received, the producer treats the sending operation as a failure.                                                                                                                                                                                    |
-| Async send | The producer puts a message in a blocking queue and returns immediately. The client library sends the message to the broker in the background. If the queue is full (you can [configure](reference-configuration.md#broker) the maximum size), the producer is blocked or fails immediately when calling the API, depending on arguments passed to the producer. |
-
-### Access mode
-
-You can have different types of access modes on topics for producers.
-
-Access mode | Description
-:-----------|------------
-`Shared`           | Multiple producers can publish on a topic. 

    This is the **default** setting.
-`Exclusive`        | Only one producer can publish on a topic. 

    If there is already a producer connected, other producers trying to publish on this topic get errors immediately.

    The "old" producer is evicted and a "new" producer is selected to be the next exclusive producer if the "old" producer experiences a network partition with the broker.
-`WaitForExclusive` | If there is already a producer connected, the producer creation is pending (rather than timing out) until the producer gets the `Exclusive` access.

    The producer that succeeds in becoming the exclusive one is treated as the leader. Consequently, if you want to implement a leader election scheme for your application, you can use this access mode. Note that the leader pattern scheme mentioned refers to using Pulsar as a Write-Ahead Log (WAL) which means the leader writes its "decisions" to the topic. On error cases, the leader will get notified it is no longer the leader *only* when it tries to write a message and fails on appropriate error, by the broker.
-
-:::note
-
-Once an application creates a producer with `Exclusive` or `WaitForExclusive` access mode successfully, the instance of this application is guaranteed to be the **only writer** to the topic. Any other producers trying to produce messages on this topic will either get errors immediately or have to wait until they get the `Exclusive` access. 
-For more information, see [PIP 68: Exclusive Producer](https://github.com/apache/pulsar/wiki/PIP-68:-Exclusive-Producer).
-
-:::
-
-You can set producer access mode through Java Client API. For more information, see `ProducerAccessMode` in [ProducerBuilder.java](https://github.com/apache/pulsar/blob/fc5768ca3bbf92815d142fe30e6bfad70a1b4fc6/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilder.java) file.
-
-
-### Compression
-
-You can compress messages published by producers during transportation. Pulsar currently supports the following types of compression:
-
-* [LZ4](https://github.com/lz4/lz4)
-* [ZLIB](https://zlib.net/)
-* [ZSTD](https://facebook.github.io/zstd/)
-* [SNAPPY](https://google.github.io/snappy/)
-
-### Batching
-
-When batching is enabled, the producer accumulates and sends a batch of messages in a single request. The batch size is defined by the maximum number of messages and the maximum publish latency. Therefore, the backlog size represents the total number of batches instead of the total number of messages.
-
-In Pulsar, batches are tracked and stored as single units rather than as individual messages. Consumer unbundles a batch into individual messages. However, scheduled messages (configured through the `deliverAt` or the `deliverAfter` parameter) are always sent as individual messages even batching is enabled.
-
-In general, a batch is acknowledged when all of its messages are acknowledged by a consumer. It means that when **not all** batch messages are acknowledged, then unexpected failures, negative acknowledgements, or acknowledgement timeouts can result in a redelivery of all messages in this batch.
-
-To avoid redelivering acknowledged messages in a batch to the consumer, Pulsar introduces batch index acknowledgement since Pulsar 2.6.0. When batch index acknowledgement is enabled, the consumer filters out the batch index that has been acknowledged and sends the batch index acknowledgement request to the broker. The broker maintains the batch index acknowledgement status and tracks the acknowledgement status of each batch index to avoid dispatching acknowledged messages to the consumer. The batch is deleted when all indices of the messages in it are acknowledged.
-
-By default, batch index acknowledgement is disabled (`acknowledgmentAtBatchIndexLevelEnabled=false`). You can enable batch index acknowledgement by setting the `acknowledgmentAtBatchIndexLevelEnabled` parameter to `true` at the broker side. Enabling batch index acknowledgement results in more memory overheads. 
-
-### Chunking
-Message chunking enables Pulsar to process large payload messages by splitting the message into chunks at the producer side and aggregating chunked messages at the consumer side.
-
-With message chunking enabled, when the size of a message exceeds the allowed maximum payload size (the `maxMessageSize` parameter of broker), the workflow of messaging is as follows:
-1. The producer splits the original message into chunked messages and publishes them with chunked metadata to the broker separately and in order. 
-2. The broker stores the chunked messages in one managed-ledger in the same way as that of ordinary messages, and it uses the `chunkedMessageRate` parameter to record chunked message rate on the topic.
-3. The consumer buffers the chunked messages and aggregates them into the receiver queue when it receives all the chunks of a message.
-4. The client consumes the aggregated message from the receiver queue. 
-
-**Limitations:** 
-- Chunking is only available for persisted topics.
-- Chunking is only available for the exclusive and failover subscription types.
-- Chunking cannot be enabled simultaneously with batching.
-
-#### Handle consecutive chunked messages with one ordered consumer
-
-The following figure shows a topic with one producer which publishes a large message payload in chunked messages along with regular non-chunked messages. The producer publishes message M1 in three chunks labeled M1-C1, M1-C2 and M1-C3. The broker stores all the three chunked messages in the [managed-ledger](concepts-architecture-overview.md#managed-ledgers) and dispatches them to the ordered (exclusive/failover) consumer in the same order. The consumer buffers all the chunked messages in memory until it receives all the chunked messages, aggregates them into one message and then hands over the original message M1 to the client.
-
-![](/assets/chunking-01.png)
-
-#### Handle interwoven chunked messages with one ordered consumer
-
-When multiple producers publish chunked messages into a single topic, the broker stores all the chunked messages coming from different producers in the same [managed-ledger](concepts-architecture-overview.md#managed-ledgers). The chunked messages in the managed-ledger can be interwoven with each other. As shown below, Producer 1 publishes message M1 in three chunks M1-C1, M1-C2 and M1-C3. Producer 2 publishes message M2 in three chunks M2-C1, M2-C2 and M2-C3. All chunked messages of the specific message are still in order but might not be consecutive in the managed-ledger.
-
-![](/assets/chunking-02.png)
-
-:::note
-
-In this case, interwoven chunked messages may bring some memory pressure to the consumer because the consumer keeps a separate buffer for each large message to aggregate all its chunks in one message. You can limit the maximum number of chunked messages a consumer maintains concurrently by configuring the `maxPendingChunkedMessage` parameter. When the threshold is reached, the consumer drops pending messages by silently acknowledging them or asking the broker to redeliver them later, optimizing memory utilization.
-
-:::
-
-#### Enable Message Chunking
-
-**Prerequisite:** Disable batching by setting the `enableBatching` parameter to `false`.
-
-The message chunking feature is OFF by default. 
-To enable message chunking, set the `chunkingEnabled` parameter to `true` when creating a producer.
-
-:::note
-
-If the consumer fails to receive all chunks of a message within a specified time period, it expires incomplete chunks. The default value is 1 minute. For more information about the `expireTimeOfIncompleteChunkedMessage` parameter, refer to [org.apache.pulsar.client.api](https://pulsar.apache.org/api/client/).
-
-:::
-
-## Consumers
-
-A consumer is a process that attaches to a topic via a subscription and then receives messages.
-
-A consumer sends a [flow permit request](developing-binary-protocol.md#flow-control) to a broker to get messages. There is a queue at the consumer side to receive messages pushed from the broker. You can configure the queue size with the [`receiverQueueSize`](client-libraries-java.md#configure-consumer) parameter. The default size is `1000`). Each time `consumer.receive()` is called, a message is dequeued from the buffer.  
-
-### Receive modes
-
-Messages are received from [brokers](reference-terminology.md#broker) either synchronously (sync) or asynchronously (async).
-
-| Mode          | Description                                                                                                                                                                                                   |
-|:--------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Sync receive  | A sync receive is blocked until a message is available.                                                                                                                                                  |
-| Async receive | An async receive returns immediately with a future value—for example, a [`CompletableFuture`](http://www.baeldung.com/java-completablefuture) in Java—that completes once a new message is available. |
-
-### Listeners
-
-Client libraries provide listener implementation for consumers. For example, the [Java client](client-libraries-java.md) provides a {@inject: javadoc:MesssageListener:/client/org/apache/pulsar/client/api/MessageListener} interface. In this interface, the `received` method is called whenever a new message is received.
-
-### Acknowledgement
-
-The consumer sends an acknowledgement request to the broker after it consumes a message successfully. Then, this consumed message will be permanently stored, and be deleted only after all the subscriptions have acknowledged it. If you want to store the messages that have been acknowledged by a consumer, you need to configure the [message retention policy](concepts-messaging.md#message-retention-and-expiry).
-
-For batch messages, you can enable batch index acknowledgement to avoid dispatching acknowledged messages to the consumer. For details about batch index acknowledgement, see [batching](#batching).
-
-Messages can be acknowledged in one of the following two ways:
-
-- Being acknowledged individually. With individual acknowledgement, the consumer acknowledges each message and sends an acknowledgement request to the broker.
-- Being acknowledged cumulatively. With cumulative acknowledgement, the consumer **only** acknowledges the last message it received. All messages in the stream up to (and including) the provided message are not redelivered to that consumer.
-
-If you want to acknowledge messages individually, you can use the following API.
-
-```java
-
-consumer.acknowledge(msg);
-
-```
-
-If you want to acknowledge messages cumulatively, you can use the following API.
-
-```java
-
-consumer.acknowledgeCumulative(msg);
-
-```
-
-:::note
-
-Cumulative acknowledgement cannot be used in [Shared subscription type](#subscription-types), because Shared subscription type involves multiple consumers which have access to the same subscription. In Shared subscription type, messages are acknowledged individually.
-
-:::
-
-### Negative acknowledgement
-
-The [negative acknowledgement](#negative-acknowledgement) mechanism allows you to send a notification to the broker indicating the consumer did not process a message.  When a consumer fails to consume a message and needs to re-consume it, the consumer sends a negative acknowledgement (nack) to the broker, triggering the broker to redeliver this message to the consumer.
-
-Messages are negatively acknowledged individually or cumulatively, depending on the consumption subscription type.
-
-In Exclusive and Failover subscription types, consumers only negatively acknowledge the last message they receive.
-
-In Shared and Key_Shared subscription types, consumers can negatively acknowledge messages individually.
-
-Be aware that negative acknowledgments on ordered subscription types, such as Exclusive, Failover and Key_Shared, might cause failed messages being sent to consumers out of the original order.
-
-If you are going to use negative acknowledgment on a message, make sure it is negatively acknowledged before the acknowledgment timeout.
-
-Use the following API to negatively acknowledge message consumption.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer()
-                .topic(topic)
-                .subscriptionName("sub-negative-ack")
-                .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
-                .negativeAckRedeliveryDelay(2, TimeUnit.SECONDS) // the default value is 1 min
-                .subscribe();
-
-Message message = consumer.receive();
-
-// call the API to send negative acknowledgement
-consumer.negativeAcknowledge(message);
-
-message = consumer.receive();
-consumer.acknowledge(message);
-
-```
-
-To redeliver messages with different delays, you can use the **redelivery backoff mechanism** by setting the number of retries to deliver the messages.
-Use the following API to enable `Negative Redelivery Backoff`.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer()
-        .topic(topic)
-        .subscriptionName("sub-negative-ack")
-        .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
-        .negativeAckRedeliveryBackoff(MultiplierRedeliveryBackoff.builder()
-            .minDelayMs(1000)
-            .maxDelayMs(60 * 1000)
-            .build())
-        .subscribe();
-
-```
-
-The message redelivery behavior should be as follows.
-
-Redelivery count | Redelivery delay
-:--------------------|:-----------
-1 | 10 + 1 seconds
-2 | 10 + 2 seconds
-3 | 10 + 4 seconds
-4 | 10 + 8 seconds
-5 | 10 + 16 seconds
-6 | 10 + 32 seconds
-7 | 10 + 60 seconds
-8 | 10 + 60 seconds
-:::note
-
-If batching is enabled, all messages in one batch are redelivered to the consumer.
-
-:::
-
-### Acknowledgement timeout
-
-The acknowledgement timeout mechanism allows you to set a time range during which the client tracks the unacknowledged messages. After this acknowledgement timeout (`ackTimeout`) period, the client sends `redeliver unacknowledged messages` request to the broker, thus the broker resends the unacknowledged messages to the consumer.
-
-You can configure the acknowledgement timeout mechanism to redeliver the message if it is not acknowledged after `ackTimeout` or to execute a timer task to check the acknowledgement timeout messages during every `ackTimeoutTickTime` period.
-
-You can also use the redelivery backoff mechanism, redeliver messages with different delays by setting the number 
-of times the messages is retried.
-
-If you want to use redelivery backoff, you can use the following API.
-
-```java
-
-consumer.ackTimeout(10, TimeUnit.SECOND)
-        .ackTimeoutRedeliveryBackoff(MultiplierRedeliveryBackoff.builder()
-        .minDelayMs(1000)
-        .maxDelayMs(60000)
-        .multiplier(2).build())
-
-```
-
-The message redelivery behavior should be as follows.
-
-Redelivery count | Redelivery delay
-:--------------------|:-----------
-1 | 10 + 1 seconds
-2 | 10 + 2 seconds
-3 | 10 + 4 seconds
-4 | 10 + 8 seconds
-5 | 10 + 16 seconds
-6 | 10 + 32 seconds
-7 | 10 + 60 seconds
-8 | 10 + 60 seconds
-
-:::note
-
-- If batching is enabled, all messages in one batch are redelivered to the consumer.  
-- Compared with acknowledgement timeout, negative acknowledgement is preferred. First, it is difficult to set a timeout value. Second, a broker resends messages when the message processing time exceeds the acknowledgement timeout, but these messages might not need to be re-consumed.
-
-:::
-
-Use the following API to enable acknowledgement timeout.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer()
-                .topic(topic)
-                .ackTimeout(2, TimeUnit.SECONDS) // the default value is 0
-                .ackTimeoutTickTime(1, TimeUnit.SECONDS)
-                .subscriptionName("sub")
-                .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
-                .subscribe();
-
-Message message = consumer.receive();
-
-// wait at least 2 seconds
-message = consumer.receive();
-consumer.acknowledge(message);
-
-```
-
-### Retry letter topic
-
-The retry letter topic allows you to store the messages that failed to be consumed and retry consuming them later. With this method, you can customize the interval at which the messages are redelivered. Consumers on the original topic are automatically subscribed to the retry letter topic as well. Once the maximum number of retries has been reached, the unconsumed messages are moved to a [dead letter topic](#dead-letter-topic) for manual processing.
-
-The diagram below illustrates the concept of the retry letter topic.
-![](/assets/retry-letter-topic.svg)
-
-The intention of using retry letter topic is different from using [delayed message delivery](#delayed-message-delivery), even though both are aiming to consume a message later. Retry letter topic serves failure handling through message redelivery to ensure critical data is not lost, while delayed message delivery is intended to deliver a message with a specified time of delay.
-
-By default, automatic retry is disabled. You can set `enableRetry` to `true` to enable automatic retry on the consumer.
-
-Use the following API to consume messages from a retry letter topic. When the value of `maxRedeliverCount` is reached, the unconsumed messages are moved to a dead letter topic.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer(Schema.BYTES)
-                .topic("my-topic")
-                .subscriptionName("my-subscription")
-                .subscriptionType(SubscriptionType.Shared)
-                .enableRetry(true)
-                .deadLetterPolicy(DeadLetterPolicy.builder()
-                        .maxRedeliverCount(maxRedeliveryCount)
-                        .build())
-                .subscribe();
-
-```
-
-The default retry letter topic uses this format:
-
-```
-
---RETRY
-
-```
-
-Use the Java client to specify the name of the retry letter topic.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer(Schema.BYTES)
-        .topic("my-topic")
-        .subscriptionName("my-subscription")
-        .subscriptionType(SubscriptionType.Shared)
-        .enableRetry(true)
-        .deadLetterPolicy(DeadLetterPolicy.builder()
-                .maxRedeliverCount(maxRedeliveryCount)
-                .retryLetterTopic("my-retry-letter-topic-name")
-                .build())
-        .subscribe();
-
-```
-
-The messages in the retry letter topic contain some special properties that are automatically created by the client.
-
-Special property | Description
-:--------------------|:-----------
-`REAL_TOPIC` | The real topic name.
-`ORIGIN_MESSAGE_ID` | The origin message ID. It is crucial for message tracking.
-`RECONSUMETIMES`   | The number of retries to consume messages.
-`DELAY_TIME`      | Message retry interval in milliseconds.
-**Example**
-
-```
-
-REAL_TOPIC = persistent://public/default/my-topic
-ORIGIN_MESSAGE_ID = 1:0:-1:0
-RECONSUMETIMES = 6
-DELAY_TIME = 3000
-
-```
-
-Use the following API to store the messages in a retrial queue.
-
-```java
-
-consumer.reconsumeLater(msg, 3, TimeUnit.SECONDS);
-
-```
-
-Use the following API to add custom properties for the `reconsumeLater` function. In the next attempt to consume, custom properties can be get from message#getProperty.
-
-```java
-
-Map customProperties = new HashMap();
-customProperties.put("custom-key-1", "custom-value-1");
-customProperties.put("custom-key-2", "custom-value-2");
-consumer.reconsumeLater(msg, customProperties, 3, TimeUnit.SECONDS);
-
-```
-
-:::note
-
-*  Currently, retry letter topic is enabled in Shared subscription types.
-*  Compared with negative acknowledgment, retry letter topic is more suitable for messages that require a large number of retries with a configurable retry interval. Because messages in the retry letter topic are persisted to BookKeeper, while messages that need to be retried due to negative acknowledgment are cached on the client side.
-
-:::
-
-### Dead letter topic
-
-Dead letter topic allows you to continue message consumption even some messages are not consumed successfully. The messages that are failed to be consumed are stored in a specific topic, which is called dead letter topic. You can decide how to handle the messages in the dead letter topic.
-
-Enable dead letter topic in a Java client using the default dead letter topic.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer(Schema.BYTES)
-                .topic("my-topic")
-                .subscriptionName("my-subscription")
-                .subscriptionType(SubscriptionType.Shared)
-                .deadLetterPolicy(DeadLetterPolicy.builder()
-                      .maxRedeliverCount(maxRedeliveryCount)
-                      .build())
-                .subscribe();
-
-```
-
-The default dead letter topic uses this format: 
-
-```
-
---DLQ
-
-```
-
-Use the Java client to specify the name of the dead letter topic.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer(Schema.BYTES)
-                .topic("my-topic")
-                .subscriptionName("my-subscription")
-                .subscriptionType(SubscriptionType.Shared)
-                .deadLetterPolicy(DeadLetterPolicy.builder()
-                      .maxRedeliverCount(maxRedeliveryCount)
-                      .deadLetterTopic("my-dead-letter-topic-name")
-                      .build())
-                .subscribe();
-
-```
-
-By default, there is no subscription during a DLQ topic creation. Without a just-in-time subscription to the DLQ topic, you may lose messages. To automatically create an initial subscription for the DLQ, you can specify the `initialSubscriptionName` parameter. If this parameter is set but the broker's `allowAutoSubscriptionCreation` is disabled, the DLQ producer will fail to be created.
-
-```java
-
-Consumer consumer = pulsarClient.newConsumer(Schema.BYTES)
-                .topic("my-topic")
-                .subscriptionName("my-subscription")
-                .subscriptionType(SubscriptionType.Shared)
-                .deadLetterPolicy(DeadLetterPolicy.builder()
-                      .maxRedeliverCount(maxRedeliveryCount)
-                      .deadLetterTopic("my-dead-letter-topic-name")
-                      .initialSubscriptionName("init-sub")
-                      .build())
-                .subscribe();
-
-```
-
-Dead letter topic serves message redelivery, which is triggered by [acknowledgement timeout](#acknowledgement-timeout) or [negative acknowledgement](#negative-acknowledgement) or [retry letter topic](#retry-letter-topic) . 
-:::note
-
-* Currently, dead letter topic is enabled in Shared and Key_Shared subscription types.
-
-:::
-
-## Topics
-
-As in other pub-sub systems, topics in Pulsar are named channels for transmitting messages from producers to consumers. Topic names are URLs that have a well-defined structure:
-
-```http
-
-{persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-Topic name component | Description
-:--------------------|:-----------
-`persistent` / `non-persistent` | This identifies the type of topic. Pulsar supports two kind of topics: [persistent](concepts-architecture-overview.md#persistent-storage) and [non-persistent](#non-persistent-topics). The default is persistent, so if you do not specify a type, the topic is persistent. With persistent topics, all messages are durably persisted on disks (if the broker is not standalone, messages are durably persisted on multiple disks), whereas data for non-persistent topics is not persisted to storage disks.
-`tenant`             | The topic tenant within the instance. Tenants are essential to multi-tenancy in Pulsar, and spread across clusters.
-`namespace`          | The administrative unit of the topic, which acts as a grouping mechanism for related topics. Most topic configuration is performed at the [namespace](#namespaces) level. Each tenant has one or multiple namespaces.
-`topic`              | The final part of the name. Topic names have no special meaning in a Pulsar instance.
-
-> **No need to explicitly create new topics**  
-> You do not need to explicitly create topics in Pulsar. If a client attempts to write or receive messages to/from a topic that does not yet exist, Pulsar creates that topic under the namespace provided in the [topic name](#topics) automatically.
-> If no tenant or namespace is specified when a client creates a topic, the topic is created in the default tenant and namespace. You can also create a topic in a specified tenant and namespace, such as `persistent://my-tenant/my-namespace/my-topic`. `persistent://my-tenant/my-namespace/my-topic` means the `my-topic` topic is created in the `my-namespace` namespace of the `my-tenant` tenant.
-
-## Namespaces
-
-A namespace is a logical nomenclature within a tenant. A tenant creates multiple namespaces via the [admin API](admin-api-namespaces.md#create). For instance, a tenant with different applications can create a separate namespace for each application. A namespace allows the application to create and manage a hierarchy of topics. The topic `my-tenant/app1` is a namespace for the application `app1` for `my-tenant`. You can create any number of [topics](#topics) under the namespace.
-
-## Subscriptions
-
-A subscription is a named configuration rule that determines how messages are delivered to consumers. Four subscription types are available in Pulsar: [exclusive](#exclusive), [shared](#shared), [failover](#failover), and [key_shared](#key_shared). These types are illustrated in the figure below.
-
-![Subscription types](/assets/pulsar-subscription-types.png)
-
-> **Pub-Sub or Queuing**  
-> In Pulsar, you can use different subscriptions flexibly.
-> * If you want to achieve traditional "fan-out pub-sub messaging" among consumers, specify a unique subscription name for each consumer. It is exclusive subscription type.
-> * If you want to achieve "message queuing" among consumers, share the same subscription name among multiple consumers(shared, failover, key_shared).
-> * If you want to achieve both effects simultaneously, combine exclusive subscription type with other subscription types for consumers.
-
-### Subscription types
-
-When a subscription has no consumers, its subscription type is undefined. The type of a subscription is defined when a consumer connects to it, and the type can be changed by restarting all consumers with a different configuration.
-
-#### Exclusive
-
-In *Exclusive* type, only a single consumer is allowed to attach to the subscription. If multiple consumers subscribe to a topic using the same subscription, an error occurs.
-
-In the diagram below, only **Consumer A-0** is allowed to consume messages.
-
-> Exclusive is the default subscription type.
-
-![Exclusive subscriptions](/assets/pulsar-exclusive-subscriptions.png)
-
-#### Failover
-
-In *Failover* type, multiple consumers can attach to the same subscription. A master consumer is picked for non-partitioned topic or each partition of partitioned topic and receives messages. When the master consumer disconnects, all (non-acknowledged and subsequent) messages are delivered to the next consumer in line.
-
-For partitioned topics, broker will sort consumers by priority level and lexicographical order of consumer name. Then broker will try to evenly assigns topics to consumers with the highest priority level.
-
-For non-partitioned topic, broker will pick consumer in the order they subscribe to the non partitioned topic.
-
-In the diagram below, **Consumer-B-0** is the master consumer while **Consumer-B-1** would be the next consumer in line to receive messages if **Consumer-B-0** is disconnected.
-
-![Failover subscriptions](/assets/pulsar-failover-subscriptions.png)
-
-#### Shared
-
-In *shared* or *round robin* type, multiple consumers can attach to the same subscription. Messages are delivered in a round robin distribution across consumers, and any given message is delivered to only one consumer. When a consumer disconnects, all the messages that were sent to it and not acknowledged will be rescheduled for sending to the remaining consumers.
-
-In the diagram below, **Consumer-C-1** and **Consumer-C-2** are able to subscribe to the topic, but **Consumer-C-3** and others could as well.
-
-> **Limitations of Shared type**  
-> When using Shared type, be aware that:
-> * Message ordering is not guaranteed.
-> * You cannot use cumulative acknowledgment with Shared type.
-
-![Shared subscriptions](/assets/pulsar-shared-subscriptions.png)
-
-#### Key_Shared
-
-In *Key_Shared* type, multiple consumers can attach to the same subscription. Messages are delivered in a distribution across consumers and message with same key or same ordering key are delivered to only one consumer. No matter how many times the message is re-delivered, it is delivered to the same consumer. When a consumer connected or disconnected will cause served consumer change for some key of message.
-
-![Key_Shared subscriptions](/assets/pulsar-key-shared-subscriptions.png)
-
-Note that when the consumers are using the Key_Shared subscription type, you need to **disable batching** or **use key-based batching** for the producers. There are two reasons why the key-based batching is necessary for Key_Shared subscription type:
-1. The broker dispatches messages according to the keys of the messages, but the default batching approach might fail to pack the messages with the same key to the same batch. 
-2. Since it is the consumers instead of the broker who dispatch the messages from the batches, the key of the first message in one batch is considered as the key of all messages in this batch, thereby leading to context errors. 
-
-The key-based batching aims at resolving the above-mentioned issues. This batching method ensures that the producers pack the messages with the same key to the same batch. The messages without a key are packed into one batch and this batch has no key. When the broker dispatches messages from this batch, it uses `NON_KEY` as the key. In addition, each consumer is associated with **only one** key and should receive **only one message batch** for the connected key. By default, you can limit batching by configuring the number of messages that producers are allowed to send. 
-
-Below are examples of enabling the key-based batching under the Key_Shared subscription type, with `client` being the Pulsar client that you created.
-
-````mdx-code-block
-
-
-
-```
-
-Producer producer = client.newProducer()
-        .topic("my-topic")
-        .batcherBuilder(BatcherBuilder.KEY_BASED)
-        .create();
-
-```
-
-
-
-
-```
-
-ProducerConfiguration producerConfig;
-producerConfig.setBatchingType(ProducerConfiguration::BatchingType::KeyBasedBatching);
-Producer producer;
-client.createProducer("my-topic", producerConfig, producer);
-
-```
-
-
-
-
-```
-
-producer = client.create_producer(topic='my-topic', batching_type=pulsar.BatchingType.KeyBased)
-
-```
-
-
-
-
-````
-
-> **Limitations of Key_Shared type**  
-> When you use Key_Shared type, be aware that:
-> * You need to specify a key or orderingKey for messages.
-> * You cannot use cumulative acknowledgment with Key_Shared type.
-
-### Subscription modes
-
-#### What is a subscription mode
-
-The subscription mode indicates the cursor type. 
-
-- When a subscription is created, an associated cursor is created to record the last consumed position. 
-
-- When a consumer of the subscription restarts, it can continue consuming from the last message it consumes.
-
-Subscription mode | Description | Note
-|---|---|---
-`Durable`|The cursor is durable, which retains messages and persists the current position. 
    If a broker restarts from a failure, it can recover the cursor from the persistent storage (BookKeeper), so that messages can continue to be consumed from the last consumed position.|`Durable` is the **default** subscription mode.
-`NonDurable`|The cursor is non-durable. 
    Once a broker stops, the cursor is lost and can never be recovered, so that messages **can not** continue to be consumed from the last consumed position.|Reader’s subscription mode is `NonDurable` in nature and it does not prevent data in a topic from being deleted. Reader’s subscription mode **can not** be changed. 
-
-A [subscription](#subscriptions) can have one or more consumers. When a consumer subscribes to a topic, it must specify the subscription name. A durable subscription and a non-durable subscription can have the same name, they are independent of each other. If a consumer specifies a subscription which does not exist before, the subscription is automatically created.
-
-#### When to use
-
-By default, messages of a topic without any durable subscriptions are marked as deleted. If you want to prevent the messages being marked as deleted, you can create a durable subscription for this topic. In this case, only acknowledged messages are marked as deleted. For more information, see [message retention and expiry](cookbooks-retention-expiry.md).
-
-#### How to use
-
-After a consumer is created, the default subscription mode of the consumer is `Durable`. You can change the subscription mode to `NonDurable` by making changes to the consumer’s configuration.
-
-````mdx-code-block
-
-
-
-
-```java
-
-        Consumer consumer = pulsarClient.newConsumer()
-                .topic("my-topic")
-                .subscriptionName("my-sub")
-                .subscriptionMode(SubscriptionMode.Durable)
-                .subscribe();
-
-```
-
-
-
-
-```java
-
-        Consumer consumer = pulsarClient.newConsumer()
-                .topic("my-topic")
-                .subscriptionName("my-sub")
-                .subscriptionMode(SubscriptionMode.NonDurable)
-                .subscribe();
-
-```
-
-
-
-
-````
-
-For how to create, check, or delete a durable subscription, see [manage subscriptions](admin-api-topics.md/#manage-subscriptions).
-
-## Multi-topic subscriptions
-
-When a consumer subscribes to a Pulsar topic, by default it subscribes to one specific topic, such as `persistent://public/default/my-topic`. As of Pulsar version 1.23.0-incubating, however, Pulsar consumers can simultaneously subscribe to multiple topics. You can define a list of topics in two ways:
-
-* On the basis of a [**reg**ular **ex**pression](https://en.wikipedia.org/wiki/Regular_expression) (regex), for example `persistent://public/default/finance-.*`
-* By explicitly defining a list of topics
-
-> When subscribing to multiple topics by regex, all topics must be in the same [namespace](#namespaces).
-
-When subscribing to multiple topics, the Pulsar client automatically makes a call to the Pulsar API to discover the topics that match the regex pattern/list, and then subscribe to all of them. If any of the topics do not exist, the consumer auto-subscribes to them once the topics are created.
-
-> **No ordering guarantees across multiple topics**  
-> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
-
-The following are multi-topic subscription examples for Java.
-
-```java
-
-import java.util.regex.Pattern;
-
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient pulsarClient = // Instantiate Pulsar client object
-
-// Subscribe to all topics in a namespace
-Pattern allTopicsInNamespace = Pattern.compile("persistent://public/default/.*");
-Consumer allTopicsConsumer = pulsarClient.newConsumer()
-                .topicsPattern(allTopicsInNamespace)
-                .subscriptionName("subscription-1")
-                .subscribe();
-
-// Subscribe to a subsets of topics in a namespace, based on regex
-Pattern someTopicsInNamespace = Pattern.compile("persistent://public/default/foo.*");
-Consumer someTopicsConsumer = pulsarClient.newConsumer()
-                .topicsPattern(someTopicsInNamespace)
-                .subscriptionName("subscription-1")
-                .subscribe();
-
-```
-
-For code examples, see [Java](client-libraries-java.md#multi-topic-subscriptions).
-
-## Partitioned topics
-
-Normal topics are served only by a single broker, which limits the maximum throughput of the topic. *Partitioned topics* are a special type of topic that are handled by multiple brokers, thus allowing for higher throughput.
-
-A partitioned topic is actually implemented as N internal topics, where N is the number of partitions. When publishing messages to a partitioned topic, each message is routed to one of several brokers. The distribution of partitions across brokers is handled automatically by Pulsar.
-
-The diagram below illustrates this:
-
-![](/assets/partitioning.png)
-
-The **Topic1** topic has five partitions (**P0** through **P4**) split across three brokers. Because there are more partitions than brokers, two brokers handle two partitions a piece, while the third handles only one (again, Pulsar handles this distribution of partitions automatically).
-
-Messages for this topic are broadcast to two consumers. The [routing mode](#routing-modes) determines each message should be published to which partition, while the [subscription type](#subscription-types) determines which messages go to which consumers.
-
-Decisions about routing and subscription modes can be made separately in most cases. In general, throughput concerns should guide partitioning/routing decisions while subscription decisions should be guided by application semantics.
-
-There is no difference between partitioned topics and normal topics in terms of how subscription types work, as partitioning only determines what happens between when a message is published by a producer and processed and acknowledged by a consumer.
-
-Partitioned topics need to be explicitly created via the [admin API](admin-api-overview.md). The number of partitions can be specified when creating the topic.
-
-### Routing modes
-
-When publishing to partitioned topics, you must specify a *routing mode*. The routing mode determines which partition---that is, which internal topic---each message should be published to.
-
-There are three {@inject: javadoc:MessageRoutingMode:/client/org/apache/pulsar/client/api/MessageRoutingMode} available:
-
-Mode     | Description 
-:--------|:------------
-`RoundRobinPartition` | If no key is provided, the producer will publish messages across all partitions in round-robin fashion to achieve maximum throughput. Please note that round-robin is not done per individual message but rather it's set to the same boundary of batching delay, to ensure batching is effective. While if a key is specified on the message, the partitioned producer will hash the key and assign message to a particular partition. This is the default mode. 
-`SinglePartition`     | If no key is provided, the producer will randomly pick one single partition and publish all the messages into that partition. While if a key is specified on the message, the partitioned producer will hash the key and assign message to a particular partition.
-`CustomPartition`     | Use custom message router implementation that will be called to determine the partition for a particular message. User can create a custom routing mode by using the [Java client](client-libraries-java.md) and implementing the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface.
-
-### Ordering guarantee
-
-The ordering of messages is related to MessageRoutingMode and Message Key. Usually, user would want an ordering of Per-key-partition guarantee.
-
-If there is a key attached to message, the messages will be routed to corresponding partitions based on the hashing scheme specified by {@inject: javadoc:HashingScheme:/client/org/apache/pulsar/client/api/HashingScheme} in {@inject: javadoc:ProducerBuilder:/client/org/apache/pulsar/client/api/ProducerBuilder}, when using either `SinglePartition` or `RoundRobinPartition` mode.
-
-Ordering guarantee | Description | Routing Mode and Key
-:------------------|:------------|:------------
-Per-key-partition  | All the messages with the same key will be in order and be placed in same partition. | Use either `SinglePartition` or `RoundRobinPartition` mode, and Key is provided by each message.
-Per-producer       | All the messages from the same producer will be in order. | Use `SinglePartition` mode, and no Key is provided for each message.
-
-### Hashing scheme
-
-{@inject: javadoc:HashingScheme:/client/org/apache/pulsar/client/api/HashingScheme} is an enum that represent sets of standard hashing functions available when choosing the partition to use for a particular message.
-
-There are 2 types of standard hashing functions available: `JavaStringHash` and `Murmur3_32Hash`. 
-The default hashing function for producer is `JavaStringHash`.
-Please pay attention that `JavaStringHash` is not useful when producers can be from different multiple language clients, under this use case, it is recommended to use `Murmur3_32Hash`.
-
-
-
-## Non-persistent topics
-
-
-By default, Pulsar persistently stores *all* unacknowledged messages on multiple [BookKeeper](concepts-architecture-overview.md#persistent-storage) bookies (storage nodes). Data for messages on persistent topics can thus survive broker restarts and subscriber failover.
-
-Pulsar also, however, supports **non-persistent topics**, which are topics on which messages are *never* persisted to disk and live only in memory. When using non-persistent delivery, killing a Pulsar broker or disconnecting a subscriber to a topic means that all in-transit messages are lost on that (non-persistent) topic, meaning that clients may see message loss.
-
-Non-persistent topics have names of this form (note the `non-persistent` in the name):
-
-```http
-
-non-persistent://tenant/namespace/topic
-
-```
-
-> For more info on using non-persistent topics, see the [Non-persistent messaging cookbook](cookbooks-non-persistent.md).
-
-In non-persistent topics, brokers immediately deliver messages to all connected subscribers *without persisting them* in [BookKeeper](concepts-architecture-overview.md#persistent-storage). If a subscriber is disconnected, the broker will not be able to deliver those in-transit messages, and subscribers will never be able to receive those messages again. Eliminating the persistent storage step makes messaging on non-persistent topics slightly faster than on persistent topics in some cases, but with the caveat that some of the core benefits of Pulsar are lost.
-
-> With non-persistent topics, message data lives only in memory. If a message broker fails or message data can otherwise not be retrieved from memory, your message data may be lost. Use non-persistent topics only if you're *certain* that your use case requires it and can sustain it.
-
-By default, non-persistent topics are enabled on Pulsar brokers. You can disable them in the broker's [configuration](reference-configuration.md#broker-enableNonPersistentTopics). You can manage non-persistent topics using the `pulsar-admin topics` command. For more information, see [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/).
-
-### Performance
-
-Non-persistent messaging is usually faster than persistent messaging because brokers don't persist messages and immediately send acks back to the producer as soon as that message is delivered to connected brokers. Producers thus see comparatively low publish latency with non-persistent topic.
-
-### Client API
-
-Producers and consumers can connect to non-persistent topics in the same way as persistent topics, with the crucial difference that the topic name must start with `non-persistent`. All three subscription types---[exclusive](#exclusive), [shared](#shared), and [failover](#failover)---are supported for non-persistent topics.
-
-Here's an example [Java consumer](client-libraries-java.md#consumers) for a non-persistent topic:
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-String npTopic = "non-persistent://public/default/my-topic";
-String subscriptionName = "my-subscription-name";
-
-Consumer consumer = client.newConsumer()
-        .topic(npTopic)
-        .subscriptionName(subscriptionName)
-        .subscribe();
-
-```
-
-Here's an example [Java producer](client-libraries-java.md#producer) for the same non-persistent topic:
-
-```java
-
-Producer producer = client.newProducer()
-                .topic(npTopic)
-                .create();
-
-```
-
-## Message redelivery
-
-Apache Pulsar supports graceful failure handling and ensures critical data is not lost. Software will always have unexpected conditions and at times messages may not be delivered successfully. Therefore, it is important to have a built-in mechanism that handles failure, particularly in asynchronous messaging as highlighted in the following examples.
-
-- Consumers get disconnected from the database or the HTTP server. When this happens, the database is temporarily offline while the consumer is writing the data to it and the external HTTP server that the consumer calls is momentarily unavailable.
-- Consumers get disconnected from a broker due to consumer crashes, broken connections, etc. As a consequence, the unacknowledged messages are delivered to other available consumers.
-
-Apache Pulsar avoids these and other message delivery failures using at-least-once delivery semantics that ensure Pulsar processes a message more than once. 
-
-To utilize message redelivery, you need to enable this mechanism before the broker can resend the unacknowledged messages in Apache Pulsar client. You can activate the message redelivery mechanism in Apache Pulsar using three methods. 
-
-- [Negative Acknowledgment](#negative-acknowledgement)
-- [Acknowledgement Timeout](#acknowledgement-timeout)
-- [Retry letter topic](#retry-letter-topic)
-
-
-## Message retention and expiry
-
-By default, Pulsar message brokers:
-
-* immediately delete *all* messages that have been acknowledged by a consumer, and
-* [persistently store](concepts-architecture-overview.md#persistent-storage) all unacknowledged messages in a message backlog.
-
-Pulsar has two features, however, that enable you to override this default behavior:
-
-* Message **retention** enables you to store messages that have been acknowledged by a consumer
-* Message **expiry** enables you to set a time to live (TTL) for messages that have not yet been acknowledged
-
-> All message retention and expiry is managed at the [namespace](#namespaces) level. For a how-to, see the [Message retention and expiry](cookbooks-retention-expiry.md) cookbook.
-
-The diagram below illustrates both concepts:
-
-![Message retention and expiry](/assets/retention-expiry.png)
-
-With message retention, shown at the top, a retention policy applied to all topics in a namespace dictates that some messages are durably stored in Pulsar even though they've already been acknowledged. Acknowledged messages that are not covered by the retention policy are deleted. Without a retention policy, *all* of the acknowledged messages would be deleted.
-
-With message expiry, shown at the bottom, some messages are deleted, even though they haven't been acknowledged, because they've expired according to the TTL applied to the namespace (for example because a TTL of 5 minutes has been applied and the messages haven't been acknowledged but are 10 minutes old).
-
-## Message deduplication
-
-Message duplication occurs when a message is [persisted](concepts-architecture-overview.md#persistent-storage) by Pulsar more than once. Message deduplication is an optional Pulsar feature that prevents unnecessary message duplication by processing each message only once, even if the message is received more than once.
-
-The following diagram illustrates what happens when message deduplication is disabled vs. enabled:
-
-![Pulsar message deduplication](/assets/message-deduplication.png)
-
-
-Message deduplication is disabled in the scenario shown at the top. Here, a producer publishes message 1 on a topic; the message reaches a Pulsar broker and is [persisted](concepts-architecture-overview.md#persistent-storage) to BookKeeper. The producer then sends message 1 again (in this case due to some retry logic), and the message is received by the broker and stored in BookKeeper again, which means that duplication has occurred.
-
-In the second scenario at the bottom, the producer publishes message 1, which is received by the broker and persisted, as in the first scenario. When the producer attempts to publish the message again, however, the broker knows that it has already seen message 1 and thus does not persist the message.
-
-> Message deduplication is handled at the namespace level or the topic level. For more instructions, see the [message deduplication cookbook](cookbooks-deduplication.md).
-
-
-### Producer idempotency
-
-The other available approach to message deduplication is to ensure that each message is *only produced once*. This approach is typically called **producer idempotency**. The drawback of this approach is that it defers the work of message deduplication to the application. In Pulsar, this is handled at the [broker](reference-terminology.md#broker) level, so you do not need to modify your Pulsar client code. Instead, you only need to make administrative changes. For details, see [Managing message deduplication](cookbooks-deduplication.md).
-
-### Deduplication and effectively-once semantics
-
-Message deduplication makes Pulsar an ideal messaging system to be used in conjunction with stream processing engines (SPEs) and other systems seeking to provide effectively-once processing semantics. Messaging systems that do not offer automatic message deduplication require the SPE or other system to guarantee deduplication, which means that strict message ordering comes at the cost of burdening the application with the responsibility of deduplication. With Pulsar, strict ordering guarantees come at no application-level cost.
-
-> You can find more in-depth information in [this post](https://www.splunk.com/en_us/blog/it/exactly-once-is-not-exactly-the-same.html).
-
-## Delayed message delivery
-Delayed message delivery enables you to consume a message later. In this mechanism, a message is stored in BookKeeper. The `DelayedDeliveryTracker` maintains the time index (time -> messageId) in memory after the message is published to a broker. This message will be delivered to a consumer once the specified delay is over.  
-
-Delayed message delivery only works in Shared subscription type. In Exclusive and Failover subscription types, the delayed message is dispatched immediately.
-
-The diagram below illustrates the concept of delayed message delivery:
-
-![Delayed Message Delivery](/assets/message_delay.png)
-
-A broker saves a message without any check. When a consumer consumes a message, if the message is set to delay, then the message is added to `DelayedDeliveryTracker`. A subscription checks and gets timeout messages from `DelayedDeliveryTracker`.
-
-### Broker 
-Delayed message delivery is enabled by default. You can change it in the broker configuration file as below:
-
-```
-
-# Whether to enable the delayed delivery for messages.
-# If disabled, messages are immediately delivered and there is no tracking overhead.
-delayedDeliveryEnabled=true
-
-# Control the ticking time for the retry of delayed message delivery,
-# affecting the accuracy of the delivery time compared to the scheduled time.
-# Default is 1 second.
-delayedDeliveryTickTimeMillis=1000
-
-```
-
-### Producer 
-The following is an example of delayed message delivery for a producer in Java:
-
-```java
-
-// message to be delivered at the configured delay interval
-producer.newMessage().deliverAfter(3L, TimeUnit.Minute).value("Hello Pulsar!").send();
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-multi-tenancy.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-multi-tenancy.md
deleted file mode 100644
index 26bd6a2fd183f..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-multi-tenancy.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-id: concepts-multi-tenancy
-title: Multi Tenancy
-sidebar_label: "Multi Tenancy"
----
-
-Pulsar was created from the ground up as a multi-tenant system. To support multi-tenancy, Pulsar has a concept of tenants. Tenants can be spread across clusters and can each have their own [authentication and authorization](security-overview.md) scheme applied to them. They are also the administrative unit at which storage quotas, [message TTL](cookbooks-retention-expiry.md#time-to-live-ttl), and isolation policies can be managed.
-
-The multi-tenant nature of Pulsar is reflected mostly visibly in topic URLs, which have this structure:
-
-```http
-
-persistent://tenant/namespace/topic
-
-```
-
-As you can see, the tenant is the most basic unit of categorization for topics (more fundamental than the namespace and topic name).
-
-## Tenants
-
-To each tenant in a Pulsar instance you can assign:
-
-* An [authorization](security-authorization.md) scheme
-* The set of [clusters](reference-terminology.md#cluster) to which the tenant's configuration applies
-
-## Namespaces
-
-Tenants and namespaces are two key concepts of Pulsar to support multi-tenancy.
-
-* Pulsar is provisioned for specified tenants with appropriate capacity allocated to the tenant.
-* A namespace is the administrative unit nomenclature within a tenant. The configuration policies set on a namespace apply to all the topics created in that namespace. A tenant may create multiple namespaces via self-administration using the REST API and the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool. For instance, a tenant with different applications can create a separate namespace for each application.
-
-Names for topics in the same namespace will look like this:
-
-```http
-
-persistent://tenant/app1/topic-1
-
-persistent://tenant/app1/topic-2
-
-persistent://tenant/app1/topic-3
-
-```
-
-### Namespace change events and topic-level policies
-
-Pulsar is a multi-tenant event streaming system. Administrators can manage the tenants and namespaces by setting policies at different levels. However, the policies, such as retention policy and storage quota policy, are only available at a namespace level. In many use cases, users need to set a policy at the topic level. The namespace change events approach is proposed for supporting topic-level policies in an efficient way. In this approach, Pulsar is used as an event log to store namespace change events (such as topic policy changes). This approach has a few benefits:
-
-- Avoid using ZooKeeper and introduce more loads to ZooKeeper.
-- Use Pulsar as an event log for propagating the policy cache. It can scale efficiently.
-- Use Pulsar SQL to query the namespace changes and audit the system.
-
-Each namespace has a system topic `__change_events`. This system topic is used for storing change events for a given namespace. The following figure illustrates how to use namespace change events to implement a topic-level policy.
-
-1. Pulsar Admin clients communicate with the Admin Restful API to update topic level policies.
-2. Any broker that receives the Admin HTTP request publishes a topic policy change event to the corresponding `__change_events` topic of the namespace.
-3. Each broker that owns a namespace bundle(s) subscribes to the `__change_events` topic to receive change events of the namespace. It then applies the change events to the policy cache.
-4. Once the policy cache is updated, the broker sends the response back to the Pulsar Admin clients.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-overview.md
deleted file mode 100644
index bf4993a3110b5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-overview.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-id: concepts-overview
-title: Pulsar Overview
-sidebar_label: "Overview"
----
-
-Pulsar is a multi-tenant, high-performance solution for server-to-server messaging. Originally developed by Yahoo, Pulsar is under the stewardship of the [Apache Software Foundation](https://www.apache.org/).
-
-Key features of Pulsar are listed below:
-
-* Native support for multiple clusters in a Pulsar instance, with seamless [geo-replication](administration-geo.md) of messages across clusters.
-* Very low publish and end-to-end latency.
-* Seamless scalability to over a million topics.
-* A simple [client API](concepts-clients.md) with bindings for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md) and [C++](client-libraries-cpp.md).
-* Multiple [subscription types](concepts-messaging.md#subscription-types) ([exclusive](concepts-messaging.md#exclusive), [shared](concepts-messaging.md#shared), and [failover](concepts-messaging.md#failover)) for topics.
-* Guaranteed message delivery with [persistent message storage](concepts-architecture-overview.md#persistent-storage) provided by [Apache BookKeeper](http://bookkeeper.apache.org/).
-* A serverless light-weight computing framework [Pulsar Functions](functions-overview.md) offers the capability for stream-native data processing.
-* A serverless connector framework [Pulsar IO](io-overview.md), which is built on Pulsar Functions, makes it easier to move data in and out of Apache Pulsar.
-* [Tiered Storage](concepts-tiered-storage.md) offloads data from hot/warm storage to cold/long-term storage (such as S3 and GCS) when the data is aging out.
-
-## Contents
-
-- [Messaging Concepts](concepts-messaging.md)
-- [Architecture Overview](concepts-architecture-overview.md)
-- [Pulsar Clients](concepts-clients.md)
-- [Geo Replication](concepts-replication.md)
-- [Multi Tenancy](concepts-multi-tenancy.md)
-- [Authentication and Authorization](concepts-authentication.md)
-- [Topic Compaction](concepts-topic-compaction.md)
-- [Tiered Storage](concepts-tiered-storage.md)
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-replication.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-replication.md
deleted file mode 100644
index 9cc3a7c3415bd..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-replication.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-id: concepts-replication
-title: Geo Replication
-sidebar_label: "Geo Replication"
----
-
-Regardless of industries, when an unforeseen event occurs and brings day-to-day operations to a halt, an organization needs a well-prepared disaster recovery plan to quickly restore service to clients. However, a disaster recovery plan usually requires a multi-datacenter deployment with geographically dispersed data centers. Such a multi-datacenter deployment requires a geo-replication mechanism to provide additional redundancy in case a data center fails.
-
-Pulsar's geo-replication mechanism is typically used for disaster recovery, enabling the replication of persistently stored message data across multiple data centers. For instance, your application is publishing data in one region and you would like to process it for consumption in other regions. With Pulsar’s geo-replication mechanism, messages can be produced and consumed in different geo-locations. 
-
-The diagram below illustrates the process of [geo-replication](administration-geo.md). Whenever three producers (P1, P2 and P3) respectively publish messages to the T1 topic in three clusters, those messages are instantly replicated across clusters. Once the messages are replicated, two consumers (C1 and C2) can consume those messages from their clusters.
-
-![A typical geo-replication example with full-mesh pattern](/assets/full-mesh-replication.svg)
-
-## Replication mechanisms
-
-The geo-replication mechanism can be categorized into synchronous geo-replication and asynchronous geo-replication strategies. Pulsar supports both replication mechanisms.
-
-### Asynchronous geo-replication in Pulsar
-
-An asynchronous geo-replicated cluster is composed of multiple physical clusters set up in different datacenters. Messages produced on a Pulsar topic are first persisted to the local cluster and then replicated asynchronously to the remote clusters by brokers. 
-
-![An example of asynchronous geo-replication mechanism](/assets/geo-replication-async.svg)
-
-In normal cases, when there are no connectivity issues, messages are replicated immediately, at the same time as they are dispatched to local consumers. Typically, end-to-end delivery latency is defined by the network round-trip time (RTT) between the data centers. Applications can create producers and consumers in any of the clusters, even when the remote clusters are not reachable (for example, during a network partition).
-
-Asynchronous geo-replication provides lower latency but may result in weaker consistency guarantees due to the potential replication lag that some data hasn’t been replicated. 
-
-### Synchronous geo-replication via BookKeeper
-
-In synchronous geo-replication, data is synchronously replicated to multiple data centers and the client has to wait for an acknowledgment from the other data centers. As illustrated below, when the client issues a write request to one cluster, the written data will be replicated to the other two data centers. The write request is only acknowledged to the client when the majority of data centers (in this example, at least 2 data centers) have acknowledged that the write has been persisted. 
-
-![An example of synchronous geo-replication mechanism](/assets/geo-replication-sync.svg)
-
-Synchronous geo-replication in Pulsar is achieved by BookKeeper. A synchronous geo-replicated cluster consists of a cluster of bookies and a cluster of brokers that run in multiple data centers, and a global Zookeeper installation (a ZooKeeper ensemble is running across multiple data centers). You need to configure a BookKeeper region-aware placement policy to store data across multiple data centers and guarantee availability constraints on writes.
-
-Synchronous geo-replication provides the highest availability and also guarantees stronger data consistency between different data centers. However, your applications have to pay an extra latency penalty across data centers.
-
-
-## Replication patterns
-
-Pulsar provides a great degree of flexibility for customizing your replication strategy. You can set up different replication patterns to serve your replication strategy for an application between multiple data centers.
-
-### Full-mesh replication
-
-Using full-mesh replication and applying the [selective message replication](administration-geo.md/#selective-replication), you can customize your replication strategies and topologies between any number of datacenters.
-
-![An example of full-mesh replication pattern](/assets/full-mesh-replication.svg)
-
-### Active-active replication
-
-Active-active replication is a variation of full-mesh replication, with only two data centers. Producers are able to run at any data center to produce messages, and consumers can consume all messages from all data centers.
-
-![An example of active-active replication pattern](/assets/active-active-replication.svg)
-
-For how to use active-active replication to migrate data between clusters, refer to [here](administration-geo.md/#migrate-data-between-clusters-using-geo-replication).
-
-### Active-standby replication
-
-Active-standby replication is a variation of active-active replication. Producers send messages to the active data center while messages are replicated to the standby data center for backup. If the active data center goes down, the standby data center takes over and becomes the active one. 
-
-![An example of active-standby replication pattern](/assets/active-standby-replication.svg)
-
-### Aggregation replication
-
-The aggregation replication pattern is typically used when replicating messages from the edge to the cloud. For example, assume you have 3 clusters in 3 fronting datacenters and one aggregated cluster in a central data center, and you want to replicate messages from multiple fronting datacenters to the central data center for aggregation purposes. You can then create an individual namespace for the topics used by each fronting data center and assign the aggregated data center to those namespaces.
-
-![An example of aggregation replication pattern](/assets/aggregation-replication.svg)
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-schema-registry.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-schema-registry.md
deleted file mode 100644
index d28c9e6c3014f..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-schema-registry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-id: concepts-schema-registry
-title: Schema Registry
-sidebar_label: "Schema Registry"
----
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-tiered-storage.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-tiered-storage.md
deleted file mode 100644
index ec031253ccd8d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-tiered-storage.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-id: concepts-tiered-storage
-title: Tiered Storage
-sidebar_label: "Tiered Storage"
----
-
-Pulsar's segment oriented architecture allows for topic backlogs to grow very large, effectively without limit. However, this can become expensive over time.
-
-One way to alleviate this cost is to use Tiered Storage. With tiered storage, older messages in the backlog can be moved from BookKeeper to a cheaper storage mechanism, while still allowing clients to access the backlog as if nothing had changed.
-
-![Tiered Storage](/assets/pulsar-tiered-storage.png)
-
-> Data written to BookKeeper is replicated to 3 physical machines by default. However, once a segment is sealed in BookKeeper it becomes immutable and can be copied to long term storage. Long term storage can achieve cost savings by using mechanisms such as [Reed-Solomon error correction](https://en.wikipedia.org/wiki/Reed%E2%80%93Solomon_error_correction) to require fewer physical copies of data.
-
-Pulsar currently supports S3, Google Cloud Storage (GCS), and filesystem for [long term store](https://pulsar.apache.org/docs/en/cookbooks-tiered-storage/). Offloading to long term storage triggered via a Rest API or command line interface. The user passes in the amount of topic data they wish to retain on BookKeeper, and the broker will copy the backlog data to long term storage. The original data will then be deleted from BookKeeper after a configured delay (4 hours by default).
-
-> For a guide for setting up tiered storage, see the [Tiered storage cookbook](cookbooks-tiered-storage.md).
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-topic-compaction.md b/site2/website/versioned_docs/version-2.1.1-incubating/concepts-topic-compaction.md
deleted file mode 100644
index 300cf68956dd1..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/concepts-topic-compaction.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-id: concepts-topic-compaction
-title: Topic Compaction
-sidebar_label: "Topic Compaction"
----
-
-Pulsar was built with highly scalable [persistent storage](concepts-architecture-overview.md#persistent-storage) of message data as a primary objective. Pulsar topics enable you to persistently store as many unacknowledged messages as you need while preserving message ordering. By default, Pulsar stores *all* unacknowledged/unprocessed messages produced on a topic. Accumulating many unacknowledged messages on a topic is necessary for many Pulsar use cases but it can also be very time intensive for Pulsar consumers to "rewind" through the entire log of messages.
-
-> For a more practical guide to topic compaction, see the [Topic compaction cookbook](cookbooks-compaction.md).
-
-For some use cases consumers don't need a complete "image" of the topic log. They may only need a few values to construct a more "shallow" image of the log, perhaps even just the most recent value. For these kinds of use cases Pulsar offers **topic compaction**. When you run compaction on a topic, Pulsar goes through a topic's backlog and removes messages that are *obscured* by later messages, i.e. it goes through the topic on a per-key basis and leaves only the most recent message associated with that key.
-
-Pulsar's topic compaction feature:
-
-* Allows for faster "rewind" through topic logs
-* Applies only to [persistent topics](concepts-architecture-overview.md#persistent-storage)
-* Triggered automatically when the backlog reaches a certain size or can be triggered manually via the command line. See the [Topic compaction cookbook](cookbooks-compaction.md)
-* Is conceptually and operationally distinct from [retention and expiry](concepts-messaging.md#message-retention-and-expiry). Topic compaction *does*, however, respect retention. If retention has removed a message from the message backlog of a topic, the message will also not be readable from the compacted topic ledger.
-
-> #### Topic compaction example: the stock ticker
-> An example use case for a compacted Pulsar topic would be a stock ticker topic. On a stock ticker topic, each message bears a timestamped dollar value for stocks for purchase (with the message key holding the stock symbol, e.g. `AAPL` or `GOOG`). With a stock ticker you may care only about the most recent value(s) of the stock and have no interest in historical data (i.e. you don't need to construct a complete image of the topic's sequence of messages per key). Compaction would be highly beneficial in this case because it would keep consumers from needing to rewind through obscured messages.
-
-
-## How topic compaction works
-
-When topic compaction is triggered [via the CLI](cookbooks-compaction.md), Pulsar will iterate over the entire topic from beginning to end. For each key that it encounters the compaction routine will keep a record of the latest occurrence of that key.
-
-After that, the broker will create a new [BookKeeper ledger](concepts-architecture-overview.md#ledgers) and make a second iteration through each message on the topic. For each message, if the key matches the latest occurrence of that key, then the key's data payload, message ID, and metadata will be written to the newly created ledger. If the key doesn't match the latest then the message will be skipped and left alone. If any given message has an empty payload, it will be skipped and considered deleted (akin to the concept of [tombstones](https://en.wikipedia.org/wiki/Tombstone_(data_store)) in key-value databases). At the end of this second iteration through the topic, the newly created BookKeeper ledger is closed and two things are written to the topic's metadata: the ID of the BookKeeper ledger and the message ID of the last compacted message (this is known as the **compaction horizon** of the topic). Once this metadata is written compaction is complete.
-
-After the initial compaction operation, the Pulsar [broker](reference-terminology.md#broker) that owns the topic is notified whenever any future changes are made to the compaction horizon and compacted backlog. When such changes occur:
-
-* Clients (consumers and readers) that have read compacted enabled will attempt to read messages from a topic and either:
-  * Read from the topic like normal (if the message ID is greater than or equal to the compaction horizon) or
-  * Read beginning at the compaction horizon (if the message ID is lower than the compaction horizon)
-
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-compaction.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-compaction.md
deleted file mode 100644
index 214e899fa086d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-compaction.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-id: cookbooks-compaction
-title: Topic compaction
-sidebar_label: "Topic compaction"
----
-
-Pulsar's [topic compaction](concepts-topic-compaction.md#compaction) feature enables you to create **compacted** topics in which older, "obscured" entries are pruned from the topic, allowing for faster reads through the topic's history (which messages are deemed obscured/outdated/irrelevant will depend on your use case).
-
-To use compaction:
-
-* You need to give messages keys, as topic compaction in Pulsar takes place on a *per-key basis* (i.e. messages are compacted based on their key). For a stock ticker use case, the stock symbol---e.g. `AAPL` or `GOOG`---could serve as the key (more on this [below](#when-should-i-use-compacted-topics)). Messages without keys will be left alone by the compaction process.
-* Compaction can be configured to run [automatically](#configuring-compaction-to-run-automatically), or you can manually [trigger](#triggering-compaction-manually) compaction using the Pulsar administrative API.
-* Your consumers must be [configured](#consumer-configuration) to read from compacted topics ([Java consumers](#java), for example, have a `readCompacted` setting that must be set to `true`). If this configuration is not set, consumers will still be able to read from the non-compacted topic.
-
-
-> Compaction only works on messages that have keys (as in the stock ticker example the stock symbol serves as the key for each message). Keys can thus be thought of as the axis along which compaction is applied. Messages that don't have keys are simply ignored by compaction.
-
-## When should I use compacted topics?
-
-The classic example of a topic that could benefit from compaction would be a stock ticker topic through which consumers can access up-to-date values for specific stocks. Imagine a scenario in which messages carrying stock value data use the stock symbol as the key (`GOOG`, `AAPL`, `TWTR`, etc.). Compacting this topic would give consumers on the topic two options:
-
-* They can read from the "original," non-compacted topic in case they need access to "historical" values, i.e. the entirety of the topic's messages.
-* They can read from the compacted topic if they only want to see the most up-to-date messages.
-
-Thus, if you're using a Pulsar topic called `stock-values`, some consumers could have access to all messages in the topic (perhaps because they're performing some kind of number crunching of all values in the last hour) while the consumers used to power the real-time stock ticker only see the compacted topic (and thus aren't forced to process outdated messages). Which variant of the topic any given consumer pulls messages from is determined by the consumer's [configuration](#consumer-configuration).
-
-> One of the benefits of compaction in Pulsar is that you aren't forced to choose between compacted and non-compacted topics, as the compaction process leaves the original topic as-is and essentially adds an alternate topic. In other words, you can run compaction on a topic and consumers that need access to the non-compacted version of the topic will not be adversely affected.
-
-
-## Configuring compaction to run automatically
-
-Tenant administrators can configure a policy for compaction at the namespace level. The policy specifies how large the topic backlog can grow before compaction is triggered.
-
-For example, to trigger compaction when the backlog reaches 100MB:
-
-```bash
-
-$ bin/pulsar-admin namespaces set-compaction-threshold \
-  --threshold 100M my-tenant/my-namespace
-
-```
-
-Configuring the compaction threshold on a namespace will apply to all topics within that namespace.
-
-## Triggering compaction manually
-
-In order to run compaction on a topic, you need to use the [`topics compact`](reference-pulsar-admin.md#topics-compact) command for the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin topics compact \
-  persistent://my-tenant/my-namespace/my-topic
-
-```
-
-The `pulsar-admin` tool runs compaction via the Pulsar {@inject: rest:REST:/} API. To run compaction in its own dedicated process, i.e. *not* through the REST API, you can use the [`pulsar compact-topic`](reference-cli-tools.md#pulsar-compact-topic) command. Here's an example:
-
-```bash
-
-$ bin/pulsar compact-topic \
-  --topic persistent://my-tenant-namespace/my-topic
-
-```
-
-> Running compaction in its own process is recommended when you want to avoid interfering with the broker's performance. Broker performance should only be affected, however, when running compaction on topics with a large keyspace (i.e when there are many keys on the topic). The first phase of the compaction process keeps a copy of each key in the topic, which can create memory pressure as the number of keys grows. Using the `pulsar-admin topics compact` command to run compaction through the REST API should present no issues in the overwhelming majority of cases; using `pulsar compact-topic` should correspondingly be considered an edge case.
-
-The `pulsar compact-topic` command communicates with [ZooKeeper](https://zookeeper.apache.org) directly. In order to establish communication with ZooKeeper, though, the `pulsar` CLI tool will need to have a valid [broker configuration](reference-configuration.md#broker). You can either supply a proper configuration in `conf/broker.conf` or specify a non-default location for the configuration:
-
-```bash
-
-$ bin/pulsar compact-topic \
-  --broker-conf /path/to/broker.conf \
-  --topic persistent://my-tenant/my-namespace/my-topic
-
-# If the configuration is in conf/broker.conf
-$ bin/pulsar compact-topic \
-  --topic persistent://my-tenant/my-namespace/my-topic
-
-```
-
-#### When should I trigger compaction?
-
-How often you [trigger compaction](#triggering-compaction-manually) will vary widely based on the use case. If you want a compacted topic to be extremely speedy on read, then you should run compaction fairly frequently.
-
-## Consumer configuration
-
-Pulsar consumers and readers need to be configured to read from compacted topics. The sections below show you how to enable compacted topic reads for Pulsar's language clients.
-
-### Java
-
-In order to read from a compacted topic using a Java consumer, the `readCompacted` parameter must be set to `true`. Here's an example consumer for a compacted topic:
-
-```java
-
-Consumer compactedTopicConsumer = client.newConsumer()
-        .topic("some-compacted-topic")
-        .readCompacted(true)
-        .subscribe();
-
-```
-
-As mentioned above, topic compaction in Pulsar works on a *per-key basis*. That means that messages that you produce on compacted topics need to have keys (the content of the key will depend on your use case). Messages that don't have keys will be ignored by the compaction process. Here's an example Pulsar message with a key:
-
-```java
-
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageBuilder;
-
-Message msg = MessageBuilder.create()
-        .setContent(someByteArray)
-        .setKey("some-key")
-        .build();
-
-```
-
-The example below shows a message with a key being produced on a compacted Pulsar topic:
-
-```java
-
-import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageBuilder;
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-
-Producer compactedTopicProducer = client.newProducer()
-        .topic("some-compacted-topic")
-        .create();
-
-Message msg = MessageBuilder.create()
-        .setContent(someByteArray)
-        .setKey("some-key")
-        .build();
-
-compactedTopicProducer.send(msg);
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-deduplication.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-deduplication.md
deleted file mode 100644
index a14a3c36981f2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-deduplication.md
+++ /dev/null
@@ -1,150 +0,0 @@
----
-id: cookbooks-deduplication
-title: Message deduplication
-sidebar_label: "Message deduplication "
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-When **Message deduplication** is enabled, it ensures that each message produced on Pulsar topics is persisted to disk *only once*, even if the message is produced more than once. Message deduplication is handled automatically on the server side. 
-
-To use message deduplication in Pulsar, you need to configure your Pulsar brokers and clients.
-
-## How it works
-
-You can enable or disable message deduplication at the namespace level or the topic level. By default, it is disabled on all namespaces or topics. You can enable it in the following ways:
-
-* Enable deduplication for all namespaces/topics at the broker-level.
-* Enable deduplication for a specific namespace with the `pulsar-admin namespaces` interface.
-* Enable deduplication for a specific topic with the `pulsar-admin topics` interface.
-
-## Configure message deduplication
-
-You can configure message deduplication in Pulsar using the [`broker.conf`](reference-configuration.md#broker) configuration file. The following deduplication-related parameters are available.
-
-Parameter | Description | Default
-:---------|:------------|:-------
-`brokerDeduplicationEnabled` | Sets the default behavior for message deduplication in the Pulsar broker. If it is set to `true`, message deduplication is enabled on all namespaces/topics. If it is set to `false`, you have to enable or disable deduplication at the namespace level or the topic level. | `false`
-`brokerDeduplicationMaxNumberOfProducers` | The maximum number of producers for which information is stored for deduplication purposes. | `10000`
-`brokerDeduplicationEntriesInterval` | The number of entries after which a deduplication informational snapshot is taken. A larger interval leads to fewer snapshots being taken, though this lengthens the topic recovery time (the time required for entries published after the snapshot to be replayed). | `1000`
-`brokerDeduplicationSnapshotIntervalSeconds`| The time period after which a deduplication informational snapshot is taken. It runs simultaneously with `brokerDeduplicationEntriesInterval`. |`120`
-`brokerDeduplicationProducerInactivityTimeoutMinutes` | The time of inactivity (in minutes) after which the broker discards deduplication information related to a disconnected producer. | `360` (6 hours)
-
-### Set default value at the broker-level
-
-By default, message deduplication is *disabled* on all Pulsar namespaces/topics. To enable it on all namespaces/topics, set the `brokerDeduplicationEnabled` parameter to `true` and re-start the broker.
-
-Even if you set the value for `brokerDeduplicationEnabled`, enabling or disabling via Pulsar admin CLI overrides the default settings at the broker-level.
-
-### Enable message deduplication
-
-Though message deduplication is disabled by default at the broker level, you can enable message deduplication for a specific namespace or topic using the [`pulsar-admin namespaces set-deduplication`](reference-pulsar-admin.md#namespace-set-deduplication) or the [`pulsar-admin topics set-deduplication`](reference-pulsar-admin.md#topic-set-deduplication) command. You can use the `--enable`/`-e` flag and specify the namespace/topic. 
-
-The following example shows how to enable message deduplication at the namespace level.
-
-```bash
-
-$ bin/pulsar-admin namespaces set-deduplication \
-  public/default \
-  --enable # or just -e
-
-```
-
-### Disable message deduplication
-
-Even if you enable message deduplication at the broker level, you can disable message deduplication for a specific namespace or topic using the [`pulsar-admin namespace set-deduplication`](reference-pulsar-admin.md#namespace-set-deduplication) or the [`pulsar-admin topics set-deduplication`](reference-pulsar-admin.md#topic-set-deduplication) command. Use the `--disable`/`-d` flag and specify the namespace/topic.
-
-The following example shows how to disable message deduplication at the namespace level.
-
-```bash
-
-$ bin/pulsar-admin namespaces set-deduplication \
-  public/default \
-  --disable # or just -d
-
-```
-
-## Pulsar clients
-
-If you enable message deduplication in Pulsar brokers, you need complete the following tasks for your client producers:
-
-1. Specify a name for the producer.
-1. Set the message timeout to `0` (namely, no timeout).
-
-The instructions for Java, Python, and C++ clients are different.
-
-````mdx-code-block
-
-
-
-To enable message deduplication on a [Java producer](client-libraries-java.md#producers), set the producer name using the `producerName` setter, and set the timeout to `0` using the `sendTimeout` setter. 
-
-```java
-
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.PulsarClient;
-import java.util.concurrent.TimeUnit;
-
-PulsarClient pulsarClient = PulsarClient.builder()
-        .serviceUrl("pulsar://localhost:6650")
-        .build();
-Producer producer = pulsarClient.newProducer()
-        .producerName("producer-1")
-        .topic("persistent://public/default/topic-1")
-        .sendTimeout(0, TimeUnit.SECONDS)
-        .create();
-
-```
-
-
-
-
-To enable message deduplication on a [Python producer](client-libraries-python.md#producers), set the producer name using `producer_name`, and set the timeout to `0` using `send_timeout_millis`. 
-
-```python
-
-import pulsar
-
-client = pulsar.Client("pulsar://localhost:6650")
-producer = client.create_producer(
-    "persistent://public/default/topic-1",
-    producer_name="producer-1",
-    send_timeout_millis=0)
-
-```
-
-
-
-
-To enable message deduplication on a [C++ producer](client-libraries-cpp.md#producer), set the producer name using `producer_name`, and set the timeout to `0` using `send_timeout_millis`. 
-
-```cpp
-
-#include 
-
-std::string serviceUrl = "pulsar://localhost:6650";
-std::string topic = "persistent://some-tenant/ns1/topic-1";
-std::string producerName = "producer-1";
-
-Client client(serviceUrl);
-
-ProducerConfiguration producerConfig;
-producerConfig.setSendTimeout(0);
-producerConfig.setProducerName(producerName);
-
-Producer producer;
-
-Result result = client.createProducer(topic, producerConfig, producer);
-
-```
-
-
-
-
-````
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-encryption.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-encryption.md
deleted file mode 100644
index fbd1c97ecc096..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-encryption.md
+++ /dev/null
@@ -1,183 +0,0 @@
----
-id: cookbooks-encryption
-title: Pulsar Encryption
-sidebar_label: "Encryption "
----
-
-Pulsar encryption allows applications to encrypt messages at the producer and decrypt at the consumer. Encryption is performed using the public/private key pair configured by the application. Encrypted messages can only be decrypted by consumers with a valid key.
-
-## Asymmetric and symmetric encryption
-
-Pulsar uses dynamically generated symmetric AES key to encrypt messages(data). The AES key(data key) is encrypted using application provided ECDSA/RSA key pair, as a result there is no need to share the secret with everyone.
-
-Key is a public/private key pair used for encryption/decryption. The producer key is the public key, and the consumer key is the private key of the key pair.
-
-The application configures the producer with the public  key. This key is used to encrypt the AES data key. The encrypted data key is sent as part of message header. Only entities with the private key(in this case the consumer) will be able to decrypt the data key which is used to decrypt the message.
-
-A message can be encrypted with more than one key.  Any one of the keys used for encrypting the message is sufficient to decrypt the message
-
-Pulsar does not store the encryption key anywhere in the pulsar service. If you lose/delete the private key, your message is irretrievably lost, and is unrecoverable
-
-## Producer
-![alt text](/assets/pulsar-encryption-producer.jpg "Pulsar Encryption Producer")
-
-## Consumer
-![alt text](/assets/pulsar-encryption-consumer.jpg "Pulsar Encryption Consumer")
-
-## Here are the steps to get started:
-
-1. Create your ECDSA or RSA public/private key pair.
-
-```shell
-
-openssl ecparam -name secp521r1 -genkey -param_enc explicit -out test_ecdsa_privkey.pem
-openssl ec -in test_ecdsa_privkey.pem -pubout -outform pkcs8 -out test_ecdsa_pubkey.pem
-
-```
-
-2. Add the public and private key to the key management and configure your producers to retrieve public keys and consumers clients to retrieve private keys.
-3. Implement CryptoKeyReader::getPublicKey() interface from producer and CryptoKeyReader::getPrivateKey() interface from consumer, which will be invoked by Pulsar client to load the key.
-4. Add encryption key to producer configuration: conf.addEncryptionKey("myapp.key")
-5. Add CryptoKeyReader implementation to producer/consumer config: conf.setCryptoKeyReader(keyReader)
-6. Sample producer application:
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-PulsarClient pulsarClient = PulsarClient.create("http://localhost:8080");
-
-ProducerConfiguration prodConf = new ProducerConfiguration();
-prodConf.setCryptoKeyReader(new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem"));
-prodConf.addEncryptionKey("myappkey");
-
-Producer producer = pulsarClient.createProducer("persistent://my-tenant/my-ns/my-topic", prodConf);
-
-for (int i = 0; i < 10; i++) {
-    producer.send("my-message".getBytes());
-}
-
-pulsarClient.close();
-
-```
-
-7. Sample Consumer Application:
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-
-ConsumerConfiguration consConf = new ConsumerConfiguration();
-consConf.setCryptoKeyReader(new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem"));
-PulsarClient pulsarClient = PulsarClient.create("http://localhost:8080");
-Consumer consumer = pulsarClient.subscribe("persistent://my-tenant//my-ns/my-topic", "my-subscriber-name", consConf);
-Message msg = null;
-
-for (int i = 0; i < 10; i++) {
-    msg = consumer.receive();
-    // do something
-    System.out.println("Received: " + new String(msg.getData()));
-}
-
-// Acknowledge the consumption of all messages at once
-consumer.acknowledgeCumulative(msg);
-pulsarClient.close();
-
-```
-
-## Key rotation
-Pulsar generates new AES data key every 4 hours or after a certain number of messages are published. The asymmetric public key is automatically fetched by producer every 4 hours by calling CryptoKeyReader::getPublicKey() to retrieve the latest version.
-
-## Enabling encryption at the producer application:
-If you produce messages that are consumed across application boundaries, you need to ensure that consumers in other applications have access to one of the private keys that can decrypt the messages.  This can be done in two ways:
-1. The consumer application provides you access to their public key, which you add to your producer keys
-1. You grant access to one of the private keys from the pairs used by producer 
-
-In some cases, the producer may want to encrypt the messages with multiple keys. For this, add all such keys to the config. Consumer will be able to decrypt the message, as long as it has access to at least one of the keys.
-
-E.g: If messages needs to be encrypted using 2 keys myapp.messagekey1 and myapp.messagekey2,
-
-```java
-
-conf.addEncryptionKey("myapp.messagekey1");
-conf.addEncryptionKey("myapp.messagekey2");
-
-```
-
-## Decrypting encrypted messages at the consumer application:
-Consumers require access one of the private keys to decrypt messages produced by the producer. If you would like to receive encrypted messages, create a public/private key and give your public key to the producer application to encrypt messages using your public key.
-
-## Handling Failures:
-* Producer/ Consumer loses access to the key
-  * Producer action will fail indicating the cause of the failure. Application has the option to proceed with sending unencrypted message in such cases. Call conf.setCryptoFailureAction(ProducerCryptoFailureAction) to control the producer behavior. The default behavior is to fail the request.
-  * If consumption failed due to decryption failure or missing keys in consumer, application has the option to consume the encrypted message or discard it. Call conf.setCryptoFailureAction(ConsumerCryptoFailureAction) to control the consumer behavior. The default behavior is to fail the request.
-Application will never be able to decrypt the messages if the private key is permanently lost.
-* Batch messaging
-  * If decryption fails and the message contain batch messages, client will not be able to retrieve individual messages in the batch, hence message consumption fails even if conf.setCryptoFailureAction() is set to CONSUME.
-* If decryption fails, the message consumption stops and application will notice backlog growth in addition to decryption failure messages in the client log. If application does not have access to the private key to decrypt the message, the only option is to skip/discard backlogged messages. 
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-message-queue.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-message-queue.md
deleted file mode 100644
index 9b93a940d61fe..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-message-queue.md
+++ /dev/null
@@ -1,126 +0,0 @@
----
-id: cookbooks-message-queue
-title: Using Pulsar as a message queue
-sidebar_label: "Message queue"
----
-
-Message queues are essential components of many large-scale data architectures. If every single work object that passes through your system absolutely *must* be processed in spite of the slowness or downright failure of this or that system component, there's a good chance that you'll need a message queue to step in and ensure that unprocessed data is retained---with correct ordering---until the required actions are taken.
-
-Pulsar is a great choice for a message queue because:
-
-* it was built with [persistent message storage](concepts-architecture-overview.md#persistent-storage) in mind
-* it offers automatic load balancing across [consumers](reference-terminology.md#consumer) for messages on a topic (or custom load balancing if you wish)
-
-> You can use the same Pulsar installation to act as a real-time message bus and as a message queue if you wish (or just one or the other). You can set aside some topics for real-time purposes and other topics for message queue purposes (or use specific namespaces for either purpose if you wish).
-
-
-# Client configuration changes
-
-To use a Pulsar [topic](reference-terminology.md#topic) as a message queue, you should distribute the receiver load on that topic across several consumers (the optimal number of consumers will depend on the load). Each consumer must:
-
-* Establish a [shared subscription](concepts-messaging.md#shared) and use the same subscription name as the other consumers (otherwise the subscription is not shared and the consumers can't act as a processing ensemble)
-* If you'd like to have tight control over message dispatching across consumers, set the consumers' **receiver queue** size very low (potentially even to 0 if necessary). Each Pulsar [consumer](reference-terminology.md#consumer) has a receiver queue that determines how many messages the consumer will attempt to fetch at a time. A receiver queue of 1000 (the default), for example, means that the consumer will attempt to process 1000 messages from the topic's backlog upon connection. Setting the receiver queue to zero essentially means ensuring that each consumer is only doing one thing at a time.
-
-   The downside to restricting the receiver queue size of consumers is that that limits the potential throughput of those consumers and cannot be used with [partitioned topics](reference-terminology.md#partitioned-topic). Whether the performance/control trade-off is worthwhile will depend on your use case.
-
-## Java clients
-
-Here's an example Java consumer configuration that uses a shared subscription:
-
-```java
-
-import org.apache.pulsar.client.api.Consumer;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.SubscriptionType;
-
-String SERVICE_URL = "pulsar://localhost:6650";
-String TOPIC = "persistent://public/default/mq-topic-1";
-String subscription = "sub-1";
-
-PulsarClient client = PulsarClient.builder()
-        .serviceUrl(SERVICE_URL)
-        .build();
-
-Consumer consumer = client.newConsumer()
-        .topic(TOPIC)
-        .subscriptionName(subscription)
-        .subscriptionType(SubscriptionType.Shared)
-        // If you'd like to restrict the receiver queue size
-        .receiverQueueSize(10)
-        .subscribe();
-
-```
-
-## Python clients
-
-Here's an example Python consumer configuration that uses a shared subscription:
-
-```python
-
-from pulsar import Client, ConsumerType
-
-SERVICE_URL = "pulsar://localhost:6650"
-TOPIC = "persistent://public/default/mq-topic-1"
-SUBSCRIPTION = "sub-1"
-
-client = Client(SERVICE_URL)
-consumer = client.subscribe(
-    TOPIC,
-    SUBSCRIPTION,
-    # If you'd like to restrict the receiver queue size
-    receiver_queue_size=10,
-    consumer_type=ConsumerType.Shared)
-
-```
-
-## C++ clients
-
-Here's an example C++ consumer configuration that uses a shared subscription:
-
-```cpp
-
-#include 
-
-std::string serviceUrl = "pulsar://localhost:6650";
-std::string topic = "persistent://public/defaultmq-topic-1";
-std::string subscription = "sub-1";
-
-Client client(serviceUrl);
-
-ConsumerConfiguration consumerConfig;
-consumerConfig.setConsumerType(ConsumerType.ConsumerShared);
-// If you'd like to restrict the receiver queue size
-consumerConfig.setReceiverQueueSize(10);
-
-Consumer consumer;
-
-Result result = client.subscribe(topic, subscription, consumerConfig, consumer);
-
-```
-
-## Go clients
-
-Here is an example of a Go consumer configuration that uses a shared subscription:
-
-```go
-
-import "github.com/apache/pulsar-client-go/pulsar"
-
-client, err := pulsar.NewClient(pulsar.ClientOptions{
-    URL: "pulsar://localhost:6650",
-})
-if err != nil {
-    log.Fatal(err)
-}
-consumer, err := client.Subscribe(pulsar.ConsumerOptions{
-    Topic:             "persistent://public/default/mq-topic-1",
-    SubscriptionName:  "sub-1",
-    Type:              pulsar.Shared,
-    ReceiverQueueSize: 10, // If you'd like to restrict the receiver queue size
-})
-if err != nil {
-    log.Fatal(err)
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-non-persistent.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-non-persistent.md
deleted file mode 100644
index 1346d19a04263..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-non-persistent.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-id: cookbooks-non-persistent
-title: Non-persistent messaging
-sidebar_label: "Non-persistent messaging"
----
-
-**Non-persistent topics** are Pulsar topics in which message data is *never* [persistently stored](concepts-architecture-overview.md#persistent-storage) and kept only in memory. This cookbook provides:
-
-* A basic [conceptual overview](#overview) of non-persistent topics
-* Information about [configurable parameters](#configuration) related to non-persistent topics
-* A guide to the [CLI interface](#cli) for managing non-persistent topics
-
-## Overview
-
-By default, Pulsar persistently stores *all* unacknowledged messages on multiple [BookKeeper](#persistent-storage) bookies (storage nodes). Data for messages on persistent topics can thus survive broker restarts and subscriber failover.
-
-Pulsar also, however, supports **non-persistent topics**, which are topics on which messages are *never* persisted to disk and live only in memory. When using non-persistent delivery, killing a Pulsar [broker](reference-terminology.md#broker) or disconnecting a subscriber to a topic means that all in-transit messages are lost on that (non-persistent) topic, meaning that clients may see message loss.
-
-Non-persistent topics have names of this form (note the `non-persistent` in the name):
-
-```http
-
-non-persistent://tenant/namespace/topic
-
-```
-
-> For more high-level information about non-persistent topics, see the [Concepts and Architecture](concepts-messaging.md#non-persistent-topics) documentation.
-
-## Using
-
-> In order to use non-persistent topics, they must be [enabled](#enabling) in your Pulsar broker configuration.
-
-In order to use non-persistent topics, you only need to differentiate them by name when interacting with them. This [`pulsar-client produce`](reference-cli-tools.md#pulsar-client-produce) command, for example, would produce one message on a non-persistent topic in a standalone cluster:
-
-```bash
-
-$ bin/pulsar-client produce non-persistent://public/default/example-np-topic \
-  --num-produce 1 \
-  --messages "This message will be stored only in memory"
-
-```
-
-> For a more thorough guide to non-persistent topics from an administrative perspective, see the [Non-persistent topics](admin-api-topics.md) guide.
-
-## Enabling
-
-In order to enable non-persistent topics in a Pulsar broker, the [`enableNonPersistentTopics`](reference-configuration.md#broker-enableNonPersistentTopics) must be set to `true`. This is the default, and so you won't need to take any action to enable non-persistent messaging.
-
-
-> #### Configuration for standalone mode
-> If you're running Pulsar in standalone mode, the same configurable parameters are available but in the [`standalone.conf`](reference-configuration.md#standalone) configuration file. 
-
-If you'd like to enable *only* non-persistent topics in a broker, you can set the [`enablePersistentTopics`](reference-configuration.md#broker-enablePersistentTopics) parameter to `false` and the `enableNonPersistentTopics` parameter to `true`.
-
-## Managing with cli
-
-Non-persistent topics can be managed using the [`pulsar-admin non-persistent`](reference-pulsar-admin.md#non-persistent) command-line interface. With that interface you can perform actions like [create a partitioned non-persistent topic](reference-pulsar-admin.md#non-persistent-create-partitioned-topic), get [stats](reference-pulsar-admin.md#non-persistent-stats) for a non-persistent topic, [list](reference-pulsar-admin.md) non-persistent topics under a namespace, and more.
-
-## Using with Pulsar clients
-
-You shouldn't need to make any changes to your Pulsar clients to use non-persistent messaging beyond making sure that you use proper [topic names](#using) with `non-persistent` as the topic type.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-partitioned.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-partitioned.md
deleted file mode 100644
index c857d019edc02..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-partitioned.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-id: cookbooks-partitioned
-title: Partitioned topics
-sidebar_label: "Partitioned Topics"
----
-For details of the content, refer to [manage topics](admin-api-topics.md).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-retention-expiry.md b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-retention-expiry.md
deleted file mode 100644
index cd764fad6eb37..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-retention-expiry.md
+++ /dev/null
@@ -1,519 +0,0 @@
----
-id: cookbooks-retention-expiry
-title: Message retention and expiry
-sidebar_label: "Message retention and expiry"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-Pulsar brokers are responsible for handling messages that pass through Pulsar, including [persistent storage](concepts-architecture-overview.md#persistent-storage) of messages. By default, for each topic, brokers only retain messages that are in at least one backlog. A backlog is the set of unacknowledged messages for a particular subscription. As a topic can have multiple subscriptions, a topic can have multiple backlogs.
-
-As a consequence, no messages are retained (by default) on a topic that has not had any subscriptions created for it.
-
-(Note that messages that are no longer being stored are not necessarily immediately deleted, and may in fact still be accessible until the next ledger rollover. Because clients cannot predict when rollovers may happen, it is not wise to rely on a rollover not happening at an inconvenient point in time.)
-
-In Pulsar, you can modify this behavior, with namespace granularity, in two ways:
-
-* You can persistently store messages that are not within a backlog (because they've been acknowledged by on every existing subscription, or because there are no subscriptions) by setting [retention policies](#retention-policies).
-* Messages that are not acknowledged within a specified timeframe can be automatically acknowledged, by specifying the [time to live](#time-to-live-ttl) (TTL).
-
-Pulsar's [admin interface](admin-api-overview.md) enables you to manage both retention policies and TTL with namespace granularity (and thus within a specific tenant and either on a specific cluster or in the [`global`](concepts-architecture-overview.md#global-cluster) cluster).
-
-
-> #### Retention and TTL solve two different problems
-> * Message retention: Keep the data for at least X hours (even if acknowledged)
-> * Time-to-live: Discard data after some time (by automatically acknowledging)
->
-> Most applications will want to use at most one of these.
-
-
-## Retention policies
-
-By default, when a Pulsar message arrives at a broker, the message is stored until it has been acknowledged on all subscriptions, at which point it is marked for deletion. You can override this behavior and retain messages that have already been acknowledged on all subscriptions by setting a *retention policy* for all topics in a given namespace. Retention is based on both a *size limit* and a *time limit*.
-
-The diagram below illustrates the concept of message retention.
-![](/assets/retention.svg)
-
-Retention policies are useful when you use the Reader interface. The Reader interface does not use acknowledgements, and messages do not exist within backlogs. It is required to configure retention for Reader-only use cases.
-
-When you set a retention policy on topics in a namespace, you must set **both** a *size limit* (via `defaultRetentionSizeInMB`) and a *time limit* (via `defaultRetentionTimeInMinutes`) . You can refer to the following table to set retention policies in `pulsar-admin` and Java.
-
-|Time limit|Size limit| Message retention      |
-|----------|----------|------------------------|
-| -1       | -1       | Infinite retention  |
-| -1       | >0       | Based on the size limit  |
-| >0       | -1       | Based on the time limit  |
-| 0        | 0        | Disable message retention (by default) |
-| 0        | >0       | Invalid  |
-| >0       | 0        | Invalid  |
-| >0       | >0       | Acknowledged messages or messages with no active subscription will not be retained when either time or size reaches the limit. |
-
-The retention settings apply to all messages on topics that do not have any subscriptions, or to messages that have been acknowledged by all subscriptions. The retention policy settings do not affect unacknowledged messages on topics with subscriptions. The unacknowledged messages are controlled by the backlog quota.
-
-When a retention limit on a topic is exceeded, the oldest message is marked for deletion until the set of retained messages falls within the specified limits again.
-
-### Defaults
-
-You can set message retention at instance level with the following two parameters: `defaultRetentionTimeInMinutes` and `defaultRetentionSizeInMB`. Both parameters are set to `0` by default. 
-
-For more information of the two parameters, refer to the [`broker.conf`](reference-configuration.md#broker) configuration file.
-
-### Set retention policy
-
-You can set a retention policy for a namespace by specifying the namespace, a size limit and a time limit in `pulsar-admin`, REST API and Java.
-
-````mdx-code-block
-
-
-
-You can use the [`set-retention`](reference-pulsar-admin.md#namespaces-set-retention) subcommand and specify a namespace, a size limit using the `-s`/`--size` flag, and a time limit using the `-t`/`--time` flag. 
-
-In the following example, the size limit is set to 10 GB and the time limit is set to 3 hours for each topic within the `my-tenant/my-ns` namespace. 
-- When the size of messages reaches 10 GB on a topic within 3 hours, the acknowledged messages will not be retained. 
-- After 3 hours, even if the message size is less than 10 GB, the acknowledged messages will not be retained. 
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size 10G \
-  --time 3h
-
-```
-
-In the following example, the time is not limited and the size limit is set to 1 TB. The size limit determines the retention.
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size 1T \
-  --time -1
-
-```
-
-In the following example, the size is not limited and the time limit is set to 3 hours. The time limit determines the retention.
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size -1 \
-  --time 3h
-
-```
-
-To achieve infinite retention, set both values to `-1`.
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size -1 \
-  --time -1
-
-```
-
-To disable the retention policy, set both values to `0`.
-
-```shell
-
-$ pulsar-admin namespaces set-retention my-tenant/my-ns \
-  --size 0 \
-  --time 0
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
-
-:::note
-
-To disable the retention policy, you need to set both the size and time limit to `0`. Set either size or time limit to `0` is invalid.
-
-:::
-
-
-
-
-```java
-
-int retentionTime = 10; // 10 minutes
-int retentionSize = 500; // 500 megabytes
-RetentionPolicies policies = new RetentionPolicies(retentionTime, retentionSize);
-admin.namespaces().setRetention(namespace, policies);
-
-```
-
-
-
-
-````
-
-### Get retention policy
-
-You can fetch the retention policy for a namespace by specifying the namespace. The output will be a JSON object with two keys: `retentionTimeInMinutes` and `retentionSizeInMB`.
-
-````mdx-code-block
-
-
-
-Use the [`get-retention`](reference-pulsar-admin.md#namespaces) subcommand and specify the namespace.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces get-retention my-tenant/my-ns
-{
-  "retentionTimeInMinutes": 10,
-  "retentionSizeInMB": 500
-}
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().getRetention(namespace);
-
-```
-
-
-
-
-````
-
-## Backlog quotas
-
-*Backlogs* are sets of unacknowledged messages for a topic that have been stored by bookies. Pulsar stores all unacknowledged messages in backlogs until they are processed and acknowledged.
-
-You can control the allowable size and/or time of backlogs, at the namespace level, using *backlog quotas*. Pulsar uses a quota to enforce a hard limit on the logical size of the backlogs in a topic. Backlog quota triggers an alert policy (for example, producer exception) once the quota limit is reached.
-
-The diagram below illustrates the concept of backlog quota.
-![](/assets/backlog-quota.svg)
-
-Setting a backlog quota involves setting:
-
-* an allowable *size and/or time threshold* for each topic in the namespace
-* a *retention policy* that determines which action the [broker](reference-terminology.md#broker) takes if the threshold is exceeded.
-
-The following retention policies are available:
-
-Policy | Action
-:------|:------
-`producer_request_hold` | The broker will hold and not persist produce request payload
-`producer_exception` | The broker will disconnect from the client by throwing an exception
-`consumer_backlog_eviction` | The broker will begin discarding backlog messages
-
-
-> #### Beware the distinction between retention policy types
-> As you may have noticed, there are two definitions of the term "retention policy" in Pulsar, one that applies to persistent storage of messages not in backlogs, and one that applies to messages within backlogs.
-
-
-Backlog quotas are handled at the namespace level. They can be managed via:
-
-### Set size/time thresholds and backlog retention policies
-
-You can set a size and/or time threshold and backlog retention policy for all of the topics in a [namespace](reference-terminology.md#namespace) by specifying the namespace, a size limit and/or a time limit in second, and a policy by name.
-
-````mdx-code-block
-
-
-
-Use the [`set-backlog-quota`](reference-pulsar-admin.md#namespaces) subcommand and specify a namespace, a size limit using the `-l`/`--limit` , `-lt`/`--limitTime` flag to limit backlog, a retention policy using the `-p`/`--policy` flag and a policy type using `-t`/`--type` (default is destination_storage).
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns \
-  --limit 2G \
-  --policy producer_request_hold
-
-```
-
-```shell
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns/my-topic \
---limitTime 3600 \
---policy producer_request_hold \
---type message_age
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-long sizeLimit = 2147483648L;
-BacklogQuota.RetentionPolicy policy = BacklogQuota.RetentionPolicy.producer_request_hold;
-BacklogQuota quota = new BacklogQuota(sizeLimit, policy);
-admin.namespaces().setBacklogQuota(namespace, quota);
-
-```
-
-
-
-
-````
-
-### Get backlog threshold and backlog retention policy
-
-You can see which size threshold and backlog retention policy has been applied to a namespace.
-
-````mdx-code-block
-
-
-
-Use the [`get-backlog-quotas`](reference-pulsar-admin.md#pulsar-admin-namespaces-get-backlog-quotas) subcommand and specify a namespace. Here's an example:
-
-```shell
-
-$ pulsar-admin namespaces get-backlog-quotas my-tenant/my-ns
-{
-  "destination_storage": {
-    "limit" : 2147483648,
-    "policy" : "producer_request_hold"
-  }
-}
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-Map quotas =
-  admin.namespaces().getBacklogQuotas(namespace);
-
-```
-
-
-
-
-````
-
-### Remove backlog quotas
-
-````mdx-code-block
-
-
-
-Use the [`remove-backlog-quota`](reference-pulsar-admin.md#pulsar-admin-namespaces-remove-backlog-quota) subcommand and specify a namespace, use `t`/`--type` to specify backlog type to remove(default is destination_storage). Here's an example:
-
-```shell
-
-$ pulsar-admin namespaces remove-backlog-quota my-tenant/my-ns
-
-```
-
-
-
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().removeBacklogQuota(namespace);
-
-```
-
-
-
-
-````
-
-### Clear backlog
-
-#### pulsar-admin
-
-Use the [`clear-backlog`](reference-pulsar-admin.md#pulsar-admin-namespaces-clear-backlog) subcommand.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces clear-backlog my-tenant/my-ns
-
-```
-
-By default, you will be prompted to ensure that you really want to clear the backlog for the namespace. You can override the prompt using the `-f`/`--force` flag.
-
-## Time to live (TTL)
-
-By default, Pulsar stores all unacknowledged messages forever. This can lead to heavy disk space usage in cases where a lot of messages are going unacknowledged. If disk space is a concern, you can set a time to live (TTL) that determines how long unacknowledged messages will be retained.
-
-The TTL parameter is like a stopwatch attached to each message that defines the amount of time a message is allowed to stay in the unacknowledged state. When the TTL expires, Pulsar automatically moves the message to the acknowledged state (and thus makes it ready for deletion).
-
-The diagram below illustrates the concept of TTL.
-![](/assets/ttl.svg)
-
-### Set the TTL for a namespace
-
-````mdx-code-block
-
-
-
-Use the [`set-message-ttl`](reference-pulsar-admin.md#pulsar-admin-namespaces-set-message-ttl) subcommand and specify a namespace and a TTL (in seconds) using the `-ttl`/`--messageTTL` flag.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces set-message-ttl my-tenant/my-ns \
-  --messageTTL 120 # TTL of 2 minutes
-
-```
-
-
-
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().setNamespaceMessageTTL(namespace, ttlInSeconds);
-
-```
-
-
-
-
-````
-
-### Get the TTL configuration for a namespace
-
-````mdx-code-block
-
-
-
-Use the [`get-message-ttl`](reference-pulsar-admin.md#pulsar-admin-namespaces-get-message-ttl) subcommand and specify a namespace.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces get-message-ttl my-tenant/my-ns
-60
-
-```
-
-
-
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().getNamespaceMessageTTL(namespace)
-
-```
-
-
-
-
-````
-
-### Remove the TTL configuration for a namespace
-
-````mdx-code-block
-
-
-
-Use the [`remove-message-ttl`](reference-pulsar-admin.md#pulsar-admin-namespaces-remove-message-ttl) subcommand and specify a namespace.
-
-##### Example
-
-```shell
-
-$ pulsar-admin namespaces remove-message-ttl my-tenant/my-ns
-
-```
-
-
-
-
-{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
-
-
-
-
-```java
-
-admin.namespaces().removeNamespaceMessageTTL(namespace)
-
-```
-
-
-
-
-````
-
-## Delete messages from namespaces
-
-When it comes to the physical storage size, message expiry and retention are just like two sides of the same coin.
-* The backlog quota and TTL parameters prevent disk size from growing indefinitely, as Pulsar’s default behaviour is to persist unacknowledged messages. 
-* The retention policy allocates storage space to accommodate the messages that are supposed to be deleted by Pulsar by default.
-
-As a conclusion, the size of your physical storage should accommodate the sum of the backlog quota and the retention size. 
-
-The message deletion rate (releasing rate of disk space) can be determined by multiple factors. 
-
-- **Segment rollover period**: basically, the segment rollover period is how often a new segment is created. Once a new segment is created, the old segment will be deleted. By default, this happens either when you have written 50,000 entries (messages) or have waited 240 minutes. You can tune this in your broker.
-
-- **Entry log rollover period**: multiple ledgers in BookKeeper are interleaved into an [entry log](https://bookkeeper.apache.org/docs/4.11.1/getting-started/concepts/#entry-logs). In order for a ledger that has been deleted, the entry log must all be rolled over.
-The entry log rollover period is configurable, but is purely based on the entry log size. For details, see [here](https://bookkeeper.apache.org/docs/4.11.1/reference/config/#entry-log-settings). Once the entry log is rolled over, the entry log can be garbage collected.
-
-- **Garbage collection interval**: because entry logs have interleaved ledgers, to free up space, the entry logs need to be rewritten. The garbage collection interval is how often BookKeeper performs garbage collection. which is related to minor compaction and major compaction of entry logs. For details, see [here](https://bookkeeper.apache.org/docs/4.11.1/reference/config/#entry-log-compaction-settings).
-
-The diagram below illustrates one of the cases that the consumed storage size is larger than the given limits for backlog and retention. Messages over the retention limit are kept because other messages in the same segment are still within retention period.
-![](/assets/retention-storage-size.svg)
-
-If you do not have any retention period and that you never have much of a backlog, the upper limit for retained messages, which are acknowledged, equals to the Pulsar segment rollover period + entry log rollover period + (garbage collection interval * garbage collection ratios).
\ No newline at end of file
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
deleted file mode 100644
index 328b7c6d64ee3..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-tiered-storage.md
+++ /dev/null
@@ -1,154 +0,0 @@
----
-id: cookbooks-tiered-storage
-title: Tiered Storage
-sidebar_label: "Tiered Storage"
-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.
-
-## When should I use Tiered Storage?
-
-Tiered storage should be used when you have a topic for which you want to keep a very long backlog for a long time. For example, if you have a topic containing user actions which you use to train your recommendation systems, you may want to keep that data for a long time, so that if you change your recommendation algorithm you can rerun it against your full user history.
-
-## The offloading mechanism
-
-A topic in Pulsar is backed by a log, known as a managed ledger. This log is composed of an ordered list of segments. Pulsar only every writes to the final segment of the log. All previous segments are sealed. The data within the segment is immutable. This is known as a segment oriented architecture.
-
-![Tiered storage](/assets/pulsar-tiered-storage.png "Tiered Storage")
-
-The Tiered Storage offloading mechanism takes advantage of this segment oriented architecture. When offloading is requested, the segments of the log are copied, one-by-one, to tiered storage. All segments of the log, apart from the segment currently being written to can be offloaded.
-
-## Amazon S3
-
-Tiered storage currently supports S3 for long term storage. On the broker, the administrator must configure a S3 bucket and the AWS region where the bucket exists. Offloaded data will be placed into this bucket.
-
-The configured S3 bucket must exist before attempting to offload. If it does not exist, the offload operation will fail.
-
-Pulsar users multipart objects to update the segment data. It is possible that a broker could crash while uploading the data. We recommend you add a lifecycle rule your S3 bucket to expire incomplete multipart upload after a day or two to avoid getting charged for incomplete uploads.
-
-### Configuring the broker
-
-Offloading is configured in ```broker.conf```. 
-
-At a minimum, the user must configure the driver, the region and the bucket.
-
-```conf
-
-managedLedgerOffloadDriver=S3
-s3ManagedLedgerOffloadRegion=eu-west-3
-s3ManagedLedgerOffloadBucket=pulsar-topic-offload
-
-```
-
-It is also possible to specify the s3 endpoint directly, using `s3ManagedLedgerOffloadServiceEndpoint`. This is useful if you are using a non-AWS storage service which provides an S3 compatible API. 
-
-> If the endpoint is specified directly, then the region must _not_ be set.
-
-> The broker.conf of all brokers must have the same configuration for driver, region and bucket for offload to avoid data becoming unavailable as topics move from one broker to another.
-
-Pulsar also provides some knobs to configure the size of requests sent to S3.
-
-- `s3ManagedLedgerOffloadMaxBlockSizeInBytes` configures the maximum size of a "part" sent during a multipart upload. This cannot be smaller than 5MB. Default is 64MB.
-- `s3ManagedLedgerOffloadReadBufferSizeInBytes` configures the block size for each individual read when reading back data from S3. Default is 1MB.
-
-In both cases, these should not be touched unless you know what you are doing.
-
-> The broker must be rebooted for any changes in the configuration to take effect.
-
-### Authenticating with S3
-
-To be able to access S3, you need to authenticate with S3. Pulsar does not provide any direct means of configuring authentication for S3, but relies on the mechanisms supported by the [DefaultAWSCredentialsProviderChain](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html).
-
-Once you have created a set of credentials in the AWS IAM console, they can be configured in a number of ways.
-
-1. Set the environment variables **AWS_ACCESS_KEY_ID** and **AWS_SECRET_ACCESS_KEY** in ```conf/pulsar_env.sh```.
-
-```bash
-
-export AWS_ACCESS_KEY_ID=ABC123456789
-export AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-
-```
-
-> \"export\" is important so that the variables are made available in the environment of spawned processes.
-
-
-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.maxCapacityPerThread=4096"
-
-```
-
-3. Set the access credentials in ```~/.aws/credentials```.
-
-```conf
-
-[default]
-aws_access_key_id=ABC123456789
-aws_secret_access_key=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-
-```
-
-If you are running in EC2 you can also use instance profile credentials, provided through the EC2 metadata service, but that is out of scope for this cookbook.
-
-> The broker must be rebooted for credentials specified in pulsar_env to take effect.
-
-## Configuring offload to run automatically
-
-Namespace policies can be configured to offload data automatically once a threshold is reached. The threshold is based on the size of data that the topic has stored on the pulsar cluster. Once the topic reaches the threshold, an offload operation will be triggered. Setting a negative value to the threshold will disable automatic offloading. Setting the threshold to 0 will cause the broker to offload data as soon as it possiby can.
-
-```bash
-
-$ bin/pulsar-admin namespaces set-offload-threshold --size 10M my-tenant/my-namespace
-
-```
-
-> Automatic offload runs when a new segment is added to a topic log. If you set the threshold on a namespace, but few messages are being produced to the topic, offload will not until the current segment is full.
-
-
-## Triggering offload manually
-
-Offloading can manually triggered through a REST endpoint on the Pulsar broker. We provide a CLI which will call this rest endpoint for you.
-
-When triggering offload, you must specify the maximum size, in bytes, of backlog which will be retained locally on the bookkeeper. The offload mechanism will offload segments from the start of the topic backlog until this condition is met.
-
-```bash
-
-$ bin/pulsar-admin topics offload --size-threshold 10M my-tenant/my-namespace/topic1
-Offload triggered for persistent://my-tenant/my-namespace/topic1 for messages before 2:0:-1
-
-```
-
-The command to triggers an offload will not wait until the offload operation has completed. To check the status of the offload, use offload-status.
-
-```bash
-
-$ bin/pulsar-admin topics offload-status my-tenant/my-namespace/topic1
-Offload is currently running
-
-```
-
-To wait for offload to complete, add the -w flag.
-
-```bash
-
-$ bin/pulsar-admin topics offload-status -w my-tenant/my-namespace/topic1
-Offload was a success
-
-```
-
-If there is an error offloading, the error will be propagated to the offload-status command.
-
-```bash
-
-$ bin/pulsar-admin topics offload-status persistent://public/default/topic1                                                                                                       
-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/oBEepeNlhrtsDlzoOhocuYMpKihQGXe6EG8puRGOkK6UwqzVrMXTWBxxHcS+g=
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-aws.md b/site2/website/versioned_docs/version-2.1.1-incubating/deploy-aws.md
deleted file mode 100644
index 60ac4c22d7672..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-aws.md
+++ /dev/null
@@ -1,270 +0,0 @@
----
-id: deploy-aws
-title: Deploying a Pulsar cluster on AWS using Terraform and Ansible
-sidebar_label: "Amazon Web Services"
----
-
-> For instructions on deploying a single Pulsar cluster manually rather than using Terraform and Ansible, see [Deploying a Pulsar cluster on bare metal](deploy-bare-metal.md). For instructions on manually deploying a multi-cluster Pulsar instance, see [Deploying a Pulsar instance on bare metal](deploy-bare-metal-multi-cluster.md).
-
-One of the easiest ways to get a Pulsar [cluster](reference-terminology.md#cluster) running on [Amazon Web Services](https://aws.amazon.com/) (AWS) is to use the [Terraform](https://terraform.io) infrastructure provisioning tool and the [Ansible](https://www.ansible.com) server automation tool. Terraform can create the resources necessary for running the Pulsar cluster---[EC2](https://aws.amazon.com/ec2/) instances, networking and security infrastructure, etc.---While Ansible can install and run Pulsar on the provisioned resources.
-
-## Requirements and setup
-
-In order to install a Pulsar cluster on AWS using Terraform and Ansible, you need to prepare the following things:
-
-* An [AWS account](https://aws.amazon.com/account/) and the [`aws`](https://aws.amazon.com/cli/) command-line tool
-* Python and [pip](https://pip.pypa.io/en/stable/)
-* The [`terraform-inventory`](https://github.com/adammck/terraform-inventory) tool, which enables Ansible to use Terraform artifacts
-
-You also need to make sure that you are currently logged into your AWS account via the `aws` tool:
-
-```bash
-
-$ aws configure
-
-```
-
-## Installation
-
-You can install Ansible on Linux or macOS using pip.
-
-```bash
-
-$ pip install ansible
-
-```
-
-You can install Terraform using the instructions [here](https://learn.hashicorp.com/tutorials/terraform/install-cli).
-
-You also need to have the Terraform and Ansible configuration for Pulsar locally on your machine. You can find them in the [GitHub repository](https://github.com/apache/pulsar) of Pulsar, which you can fetch using Git commands:
-
-```bash
-
-$ git clone https://github.com/apache/pulsar
-$ cd pulsar/deployment/terraform-ansible/aws
-
-```
-
-## SSH setup
-
-> If you already have an SSH key and want to use it, you can skip the step of generating an SSH key and update `private_key_file` setting
-> in `ansible.cfg` file and `public_key_path` setting in `terraform.tfvars` file.
->
-> For example, if you already have a private SSH key in `~/.ssh/pulsar_aws` and a public key in `~/.ssh/pulsar_aws.pub`,
-> follow the steps below:
->
-> 1. update `ansible.cfg` with following values:
->
-
-> ```shell
-> 
-> private_key_file=~/.ssh/pulsar_aws
->
-> 
-> ```
-
->
-> 2. update `terraform.tfvars` with following values:
->
-
-> ```shell
-> 
-> public_key_path=~/.ssh/pulsar_aws.pub
->
-> 
-> ```
-
-
-In order to create the necessary AWS resources using Terraform, you need to create an SSH key. Enter the following commands to create a private SSH key in `~/.ssh/id_rsa` and a public key in `~/.ssh/id_rsa.pub`:
-
-```bash
-
-$ ssh-keygen -t rsa
-
-```
-
-Do *not* enter a passphrase (hit **Enter** instead when the prompt comes out). Enter the following command to verify that a key has been created:
-
-```bash
-
-$ ls ~/.ssh
-id_rsa               id_rsa.pub
-
-```
-
-## Create AWS resources using Terraform
-
-To start building AWS resources with Terraform, you need to install all Terraform dependencies. Enter the following command:
-
-```bash
-
-$ terraform init
-# This will create a .terraform folder
-
-```
-
-After that, you can apply the default Terraform configuration by entering this command:
-
-```bash
-
-$ terraform apply
-
-```
-
-Then you see this prompt below:
-
-```bash
-
-Do you want to perform these actions?
-  Terraform will perform the actions described above.
-  Only 'yes' will be accepted to approve.
-
-  Enter a value:
-
-```
-
-Type `yes` and hit **Enter**. Applying the configuration could take several minutes. When the configuration applying finishes, you can see `Apply complete!` along with some other information, including the number of resources created.
-
-### Apply a non-default configuration
-
-You can apply a non-default Terraform configuration by changing the values in the `terraform.tfvars` file. The following variables are available:
-
-Variable name | Description | Default
-:-------------|:------------|:-------
-`public_key_path` | The path of the public key that you have generated. | `~/.ssh/id_rsa.pub`
-`region` | The AWS region in which the Pulsar cluster runs | `us-west-2`
-`availability_zone` | The AWS availability zone in which the Pulsar cluster runs | `us-west-2a`
-`aws_ami` | The [Amazon Machine Image](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html) (AMI) that the cluster uses  | `ami-9fa343e7`
-`num_zookeeper_nodes` | The number of [ZooKeeper](https://zookeeper.apache.org) nodes in the ZooKeeper cluster | 3
-`num_bookie_nodes` | The number of bookies that runs in the cluster | 3
-`num_broker_nodes` | The number of Pulsar brokers that runs in the cluster | 2
-`num_proxy_nodes` | The number of Pulsar proxies that runs in the cluster | 1
-`base_cidr_block` | The root [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) that network assets uses for the cluster | `10.0.0.0/16`
-`instance_types` | The EC2 instance types to be used. This variable is a map with two keys: `zookeeper` for the ZooKeeper instances, `bookie` for the BookKeeper bookies and `broker` and `proxy` for Pulsar brokers and bookies | `t2.small` (ZooKeeper), `i3.xlarge` (BookKeeper) and `c5.2xlarge` (Brokers/Proxies)
-
-### What is installed
-
-When you run the Ansible playbook, the following AWS resources are used:
-
-* 9 total [Elastic Compute Cloud](https://aws.amazon.com/ec2) (EC2) instances running the [ami-9fa343e7](https://access.redhat.com/articles/3135091) Amazon Machine Image (AMI), which runs [Red Hat Enterprise Linux (RHEL) 7.4](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/7.4_release_notes/index). By default, that includes:
-  * 3 small VMs for ZooKeeper ([t3.small](https://www.ec2instances.info/?selected=t3.small) instances)
-  * 3 larger VMs for BookKeeper [bookies](reference-terminology.md#bookie) ([i3.xlarge](https://www.ec2instances.info/?selected=i3.xlarge) instances)
-  * 2 larger VMs for Pulsar [brokers](reference-terminology.md#broker) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
-  * 1 larger VMs for Pulsar [proxy](reference-terminology.md#proxy) ([c5.2xlarge](https://www.ec2instances.info/?selected=c5.2xlarge) instances)
-* An EC2 [security group](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html)
-* A [virtual private cloud](https://aws.amazon.com/vpc/) (VPC) for security
-* An [API Gateway](https://aws.amazon.com/api-gateway/) for connections from the outside world
-* A [route table](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Route_Tables.html) for the Pulsar cluster's VPC
-* A [subnet](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Subnets.html) for the VPC
-
-All EC2 instances for the cluster run in the [us-west-2](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html) region.
-
-### Fetch your Pulsar connection URL
-
-When you apply the Terraform configuration by entering the command `terraform apply`, Terraform outputs a value for the `pulsar_service_url`. The value should look something like this:
-
-```
-
-pulsar://pulsar-elb-1800761694.us-west-2.elb.amazonaws.com:6650
-
-```
-
-You can fetch that value at any time by entering the command `terraform output pulsar_service_url` or parsing the `terraform.tstate` file (which is JSON, even though the filename does not reflect that):
-
-```bash
-
-$ cat terraform.tfstate | jq .modules[0].outputs.pulsar_service_url.value
-
-```
-
-### Destroy your cluster
-
-At any point, you can destroy all AWS resources associated with your cluster using Terraform's `destroy` command:
-
-```bash
-
-$ terraform destroy
-
-```
-
-## Setup Disks
-
-Before you run the Pulsar playbook, you need to mount the disks to the correct directories on those bookie nodes. Since different type of machines have different disk layout, you need to update the task defined in `setup-disk.yaml` file after changing the `instance_types` in your terraform config,
-
-To setup disks on bookie nodes, enter this command:
-
-```bash
-
-$ ansible-playbook \
-  --user='ec2-user' \
-  --inventory=`which terraform-inventory` \
-  setup-disk.yaml
-
-```
-
-After that, the disks is mounted under `/mnt/journal` as journal disk, and `/mnt/storage` as ledger disk.
-Remember to enter this command just only once. If you attempt to enter this command again after you have run Pulsar playbook, your disks might potentially be erased again, causing the bookies to fail to start up.
-
-## Run the Pulsar playbook
-
-Once you have created the necessary AWS resources using Terraform, you can install and run Pulsar on the Terraform-created EC2 instances using Ansible. 
-
-(Optional) If you want to use any [built-in IO connectors](io-connectors.md), edit the `Download Pulsar IO packages` task in the `deploy-pulsar.yaml` file and uncomment the connectors you want to use. 
-
-To run the playbook, enter this command:
-
-```bash
-
-$ ansible-playbook \
-  --user='ec2-user' \
-  --inventory=`which terraform-inventory` \
-  ../deploy-pulsar.yaml
-
-```
-
-If you have created a private SSH key at a location different from `~/.ssh/id_rsa`, you can specify the different location using the `--private-key` flag in the following command:
-
-```bash
-
-$ ansible-playbook \
-  --user='ec2-user' \
-  --inventory=`which terraform-inventory` \
-  --private-key="~/.ssh/some-non-default-key" \
-  ../deploy-pulsar.yaml
-
-```
-
-## Access the cluster
-
-You can now access your running Pulsar using the unique Pulsar connection URL for your cluster, which you can obtain following the instructions [above](#fetching-your-pulsar-connection-url).
-
-For a quick demonstration of accessing the cluster, we can use the Python client for Pulsar and the Python shell. First, install the Pulsar Python module using pip:
-
-```bash
-
-$ pip install pulsar-client
-
-```
-
-Now, open up the Python shell using the `python` command:
-
-```bash
-
-$ python
-
-```
-
-Once you are in the shell, enter the following command:
-
-```python
-
->>> import pulsar
->>> client = pulsar.Client('pulsar://pulsar-elb-1800761694.us-west-2.elb.amazonaws.com:6650')
-# Make sure to use your connection URL
->>> producer = client.create_producer('persistent://public/default/test-topic')
->>> producer.send('Hello world')
->>> client.close()
-
-```
-
-If all of these commands are successful, Pulsar clients can now use your cluster!
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-bare-metal-multi-cluster.md b/site2/website/versioned_docs/version-2.1.1-incubating/deploy-bare-metal-multi-cluster.md
deleted file mode 100644
index 8a765d8843f43..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-bare-metal-multi-cluster.md
+++ /dev/null
@@ -1,452 +0,0 @@
----
-id: deploy-bare-metal-multi-cluster
-title: Deploying a multi-cluster on bare metal
-sidebar_label: "Bare metal multi-cluster"
----
-
-:::tip
-
-1. You can use single-cluster Pulsar installation in most use cases, such as experimenting with Pulsar or using Pulsar in a startup or in a single team. If you need to run a multi-cluster Pulsar instance, see the [guide](deploy-bare-metal-multi-cluster.md).
-2. If you want to use all built-in [Pulsar IO](io-overview.md) connectors, you need to download `apache-pulsar-io-connectors`package and install `apache-pulsar-io-connectors` under `connectors` directory in the pulsar directory on every broker node or on every function-worker node if you have run a separate cluster of function workers for [Pulsar Functions](functions-overview.md).
-3. If you want to use [Tiered Storage](concepts-tiered-storage.md) feature in your Pulsar deployment, you need to download `apache-pulsar-offloaders`package and install `apache-pulsar-offloaders` under `offloaders` directory in the Pulsar directory on every broker node. For more details of how to configure this feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage.md).
-
-:::
-
-A Pulsar instance consists of multiple Pulsar clusters working in unison. You can distribute clusters across data centers or geographical regions and replicate the clusters amongst themselves using [geo-replication](administration-geo.md).Deploying a  multi-cluster Pulsar instance consists of the following steps:
-
-1. Deploying two separate ZooKeeper quorums: a local quorum for each cluster in the instance and a configuration store quorum for instance-wide tasks
-2. Initializing cluster metadata for each cluster
-3. Deploying a BookKeeper cluster of bookies in each Pulsar cluster
-4. Deploying brokers in each Pulsar cluster
-
-
-> #### Run Pulsar locally or on Kubernetes?
-> This guide shows you how to deploy Pulsar in production in a non-Kubernetes environment. If you want to run a standalone Pulsar cluster on a single machine for development purposes, see the [Setting up a local cluster](getting-started-standalone.md) guide. If you want to run Pulsar on [Kubernetes](https://kubernetes.io), see the [Pulsar on Kubernetes](deploy-kubernetes.md) guide, which includes sections on running Pulsar on Kubernetes, on Google Kubernetes Engine and on Amazon Web Services.
-
-## System requirement
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK.
-For the runtime Java version, please refer to [Pulsar Runtime Java Version Recommendation](https://github.com/apache/pulsar/blob/master/README.md#pulsar-runtime-java-version-recommendation) according to your target Pulsar version.
-
-:::note
-
-Broker is only supported on 64-bit JVM.
-
-:::
-
-## Install Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=pulsar/pulsar-@pulsar:version@/apache-pulsar-@pulsar:version@-bin.tar.gz' -O apache-pulsar-@pulsar:version@-bin.tar.gz
-  
-  ```
-
-Once you download the tarball, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-The Pulsar binary package initially contains the following directories:
-
-Directory | Contains
-:---------|:--------
-`bin` | [Command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files that Pulsar uses 
-`licenses` | License files, in `.txt` form, for various components of the Pulsar codebase
-
-The following directories are created once you begin running Pulsar:
-
-Directory | Contains
-:---------|:--------
-`data` | The data storage directory that ZooKeeper and BookKeeper use
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
-`logs` | Logs that the installation creates
-
-
-## Deploy ZooKeeper
-
-Each Pulsar instance relies on two separate ZooKeeper quorums.
-
-* Local ZooKeeper operates at the cluster level and provides cluster-specific configuration management and coordination. Each Pulsar cluster needs a dedicated ZooKeeper cluster.
-* Configuration Store operates at the instance level and provides configuration management for the entire system (and thus across clusters). An independent cluster of machines or the same machines that local ZooKeeper uses can provide the configuration store quorum.
-
-You can use an independent cluster of machines or the same machines used by local ZooKeeper to provide the configuration store quorum.
-
-
-### Deploy local ZooKeeper
-
-ZooKeeper manages a variety of essential coordination-related and configuration-related tasks for Pulsar.
-
-You need to stand up one local ZooKeeper cluster per Pulsar cluster for deploying a Pulsar instance. 
-
-To begin, add all ZooKeeper servers to the quorum configuration specified in the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. Add a `server.N` line for each node in the cluster to the configuration, where `N` is the number of the ZooKeeper node. The following is an example for a three-node cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-On each host, you need to specify the ID of the node in the `myid` file of each node, which is in `data/zookeeper` folder of each server by default (you can change the file location via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
-
-:::tip
-
-See the [Multi-server setup guide](https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup) in the ZooKeeper documentation for detailed information on `myid` and more.
-
-:::
-
-On a ZooKeeper server at `zk1.us-west.example.com`, for example, you could set the `myid` value like this:
-
-```shell
-
-$ mkdir -p data/zookeeper
-$ echo 1 > data/zookeeper/myid
-
-```
-
-On `zk2.us-west.example.com` the command looks like `echo 2 > data/zookeeper/myid` and so on.
-
-Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```shell
-
-$ bin/pulsar-daemon start zookeeper
-
-```
-
-### Deploy the configuration store 
-
-The ZooKeeper cluster configured and started up in the section above is a local ZooKeeper cluster that you can use to manage a single Pulsar cluster. In addition to a local cluster, however, a full Pulsar instance also requires a configuration store for handling some instance-level configuration and coordination tasks.
-
-If you deploy a single-cluster instance, you do not need a separate cluster for the configuration store. If, however, you deploy a multi-cluster instance, you should stand up a separate ZooKeeper cluster for configuration tasks.
-
-#### Single-cluster Pulsar instance
-
-If your Pulsar instance consists of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but run on different TCP ports.
-
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorum. You need to use the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-
-```
-
-As before, create the `myid` files for each server on `data/global-zookeeper/myid`.
-
-#### Multi-cluster Pulsar instance
-
-When you deploy a global Pulsar instance, with clusters distributed across different geographical regions, the configuration store serves as a highly available and strongly consistent metadata store that can tolerate failures and partitions spanning whole regions.
-
-The key here is to make sure the ZK quorum members are spread across at least 3 regions, and other regions run as observers.
-
-Again, given the very low expected load on the configuration store servers, you can share the same hosts used for the local ZooKeeper quorum.
-
-For example, assume a Pulsar instance with the following clusters `us-west`, `us-east`, `us-central`, `eu-central`, `ap-south`. Also assume, each cluster has its own local ZK servers named such as the following: 
-
-```
-
-zk[1-3].${CLUSTER}.example.com
-
-```
-
-In this scenario if you want to pick the quorum participants from few clusters and let all the others be ZK observers. For example, to form a 7 servers quorum, you can pick 3 servers from `us-west`, 2 from `us-central` and 2 from `us-east`.
-
-This method guarantees that writes to configuration store is possible even if one of these regions is unreachable.
-
-The ZK configuration in all the servers looks like:
-
-```properties
-
-clientPort=2184
-server.1=zk1.us-west.example.com:2185:2186
-server.2=zk2.us-west.example.com:2185:2186
-server.3=zk3.us-west.example.com:2185:2186
-server.4=zk1.us-central.example.com:2185:2186
-server.5=zk2.us-central.example.com:2185:2186
-server.6=zk3.us-central.example.com:2185:2186:observer
-server.7=zk1.us-east.example.com:2185:2186
-server.8=zk2.us-east.example.com:2185:2186
-server.9=zk3.us-east.example.com:2185:2186:observer
-server.10=zk1.eu-central.example.com:2185:2186:observer
-server.11=zk2.eu-central.example.com:2185:2186:observer
-server.12=zk3.eu-central.example.com:2185:2186:observer
-server.13=zk1.ap-south.example.com:2185:2186:observer
-server.14=zk2.ap-south.example.com:2185:2186:observer
-server.15=zk3.ap-south.example.com:2185:2186:observer
-
-```
-
-Additionally, ZK observers need to have the following parameters:
-
-```properties
-
-peerType=observer
-
-```
-
-##### Start the service
-
-Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
-
-```shell
-
-$ bin/pulsar-daemon start configuration-store
-
-```
-
-## Cluster metadata initialization
-
-Once you set up the cluster-specific ZooKeeper and configuration store quorums for your instance, you need to write some metadata to ZooKeeper for each cluster in your instance. **you only need to write these metadata once**.
-
-You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. The following is an example:
-
-```shell
-
-$ bin/pulsar initialize-cluster-metadata \
-  --cluster us-west \
-  --metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
-  --configuration-metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
-  --web-service-url http://pulsar.us-west.example.com:8080/ \
-  --web-service-url-tls https://pulsar.us-west.example.com:8443/ \
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650/ \
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651/
-
-```
-
-As you can see from the example above, you need to specify the following:
-
-* The name of 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
-
-If you use [TLS](security-tls-transport.md), you also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster.
-
-Make sure to run `initialize-cluster-metadata` for each cluster in your instance.
-
-## Deploy BookKeeper
-
-BookKeeper provides [persistent message storage](concepts-architecture-overview.md#persistent-storage) for Pulsar.
-
-Each Pulsar broker needs its own cluster of bookies. The BookKeeper cluster shares a local ZooKeeper quorum with the Pulsar cluster.
-
-### Configure bookies
-
-You can configure BookKeeper bookies using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. The most important aspect of configuring each bookie is ensuring that the [`zkServers`](reference-configuration.md#bookkeeper-zkServers) parameter is set to the connection string for the local ZooKeeper of Pulsar cluster.
-
-### Start bookies
-
-You can start a bookie in two ways: in the foreground or as a background daemon.
-
-To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start bookie
-
-```
-
-You can verify that the bookie works properly using the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
-
-```bash
-
-$ bin/bookkeeper shell bookiesanity
-
-```
-
-This command creates a new ledger on the local bookie, writes a few entries, reads them back and finally deletes the ledger.
-
-After you have started all bookies, you can use the `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to verify that all bookies in the cluster are running.
-
-```bash
-
-$ bin/bookkeeper shell simpletest --ensemble  --writeQuorum  --ackQuorum  --numEntries 
-
-```
-
-Bookie hosts are responsible for storing message data on disk. In order for bookies to provide optimal performance, having a suitable hardware configuration is essential for the bookies. The following are key dimensions for bookie hardware capacity.
-
-* Disk I/O capacity read/write
-* Storage capacity
-
-Message entries written to bookies are always synced to disk before returning an acknowledgement to the Pulsar broker. To ensure low write latency, BookKeeper is
-designed to use multiple devices:
-
-* A **journal** to ensure durability. For sequential writes, having fast [fsync](https://linux.die.net/man/2/fsync) operations on bookie hosts is critical. Typically, small and fast [solid-state drives](https://en.wikipedia.org/wiki/Solid-state_drive) (SSDs) should suffice, or [hard disk drives](https://en.wikipedia.org/wiki/Hard_disk_drive) (HDDs) with a [RAID](https://en.wikipedia.org/wiki/RAID) controller and a battery-backed write cache. Both solutions can reach fsync latency of ~0.4 ms.
-* A **ledger storage device** is where data is stored until all consumers acknowledge the message. Writes happen in the background, so write I/O is not a big concern. Reads happen sequentially most of the time and the backlog is drained only in case of consumer drain. To store large amounts of data, a typical configuration involves multiple HDDs with a RAID controller.
-
-
-
-## Deploy brokers
-
-Once you set up ZooKeeper, initialize cluster metadata, and spin up BookKeeper bookies, you can deploy brokers.
-
-### Broker configuration
-
-You can configure brokers using the [`conf/broker.conf`](reference-configuration.md#broker) configuration file.
-
-The most important element of broker configuration is ensuring that each broker is aware of its local ZooKeeper quorum as well as the configuration store quorum. Make sure that you set the [`metadataStoreUrl`](reference-configuration.md#broker) parameter to reflect the local quorum and the [`configurationMetadataStoreUrl`](reference-configuration.md#broker) parameter to reflect the configuration store quorum (although you need to specify only those ZooKeeper servers located in the same cluster).
-
-You also need to specify the name of the [cluster](reference-terminology.md#cluster) to which the broker belongs using the [`clusterName`](reference-configuration.md#broker-clusterName) parameter. In addition, you need to match the broker and web service ports provided when you initialize the metadata (especially when you use a different port from default) of the cluster.
-
-The following is an example configuration:
-
-```properties
-
-# Local ZooKeeper servers
-metadataStoreUrl=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-# Configuration store quorum connection string.
-configurationMetadataStoreUrl=zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184
-
-clusterName=us-west
-
-# Broker data port
-brokerServicePort=6650
-
-# Broker data port for TLS
-brokerServicePortTls=6651
-
-# Port to use to server HTTP request
-webServicePort=8080
-
-# Port to use to server HTTPS request
-webServicePortTls=8443
-
-```
-
-### Broker hardware
-
-Pulsar brokers do not require any special hardware since they do not use the local disk. You had better choose fast CPUs and 10Gbps [NIC](https://en.wikipedia.org/wiki/Network_interface_controller) so that the software can take full advantage of that.
-
-### Start the broker service
-
-You can start a broker in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```shell
-
-$ bin/pulsar-daemon start broker
-
-```
-
-You can also start brokers in the foreground by using [`pulsar broker`](reference-cli-tools.md#broker):
-
-```shell
-
-$ bin/pulsar broker
-
-```
-
-## Service discovery
-
-[Clients](getting-started-clients.md) connecting to Pulsar brokers need to communicate with an entire Pulsar instance using a single URL.
-
-You can use your own service discovery system. If you use your own system, you only need to satisfy just one requirement: when a client performs an HTTP request to an [endpoint](reference-configuration.md) for a Pulsar cluster, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to some active brokers in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
-
-> **Service discovery already provided by many scheduling systems**
-> Many large-scale deployment systems, such as [Kubernetes](deploy-kubernetes.md), have service discovery systems built in. If you run Pulsar on such a system, you may not need to provide your own service discovery mechanism.
-
-## Admin client and verification
-
-At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as [administrative clients](admin-api-overview.md) for each cluster. You can use the [`conf/client.conf`](reference-configuration.md#client) configuration file to configure admin clients.
-
-The most important thing is that you point the [`serviceUrl`](reference-configuration.md#client-serviceUrl) parameter to the correct service URL for the cluster:
-
-```properties
-
-serviceUrl=http://pulsar.us-west.example.com:8080/
-
-```
-
-## Provision new tenants
-
-Pulsar is built as a fundamentally multi-tenant system.
-
-
-If a new tenant wants to use the system, you need to create a new one. You can create a new tenant by using the [`pulsar-admin`](reference-pulsar-admin.md#tenants) CLI tool:
-
-```shell
-
-$ bin/pulsar-admin tenants create test-tenant \
-  --allowed-clusters us-west \
-  --admin-roles test-admin-role
-
-```
-
-In this command, users who identify with `test-admin-role` role can administer the configuration for the `test-tenant` tenant. The `test-tenant` tenant can only use the `us-west` cluster. From now on, this tenant can manage its resources.
-
-Once you create a tenant, you need to create [namespaces](reference-terminology.md#namespace) for topics within that tenant.
-
-
-The first step is to create a namespace. A namespace is an administrative unit that can contain many topics. A common practice is to create a namespace for each different use case from a single tenant.
-
-```shell
-
-$ bin/pulsar-admin namespaces create test-tenant/ns1
-
-```
-
-##### Test producer and consumer
-
-
-Everything is now ready to send and receive messages. The quickest way to test the system is through the [`pulsar-perf`](reference-cli-tools.md#pulsar-perf) client tool.
-
-
-You can use a topic in the namespace that you have just created. Topics are automatically created the first time when a producer or a consumer tries to use them.
-
-The topic name in this case could be:
-
-```http
-
-persistent://test-tenant/ns1/my-topic
-
-```
-
-Start a consumer that creates a subscription on the topic and waits for messages:
-
-```shell
-
-$ bin/pulsar-perf consume persistent://test-tenant/ns1/my-topic
-
-```
-
-Start a producer that publishes messages at a fixed rate and reports stats every 10 seconds:
-
-```shell
-
-$ bin/pulsar-perf produce persistent://test-tenant/ns1/my-topic
-
-```
-
-To report the topic stats:
-
-```shell
-
-$ bin/pulsar-admin topics stats persistent://test-tenant/ns1/my-topic
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-bare-metal.md b/site2/website/versioned_docs/version-2.1.1-incubating/deploy-bare-metal.md
deleted file mode 100644
index 7bc83e0176958..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-bare-metal.md
+++ /dev/null
@@ -1,399 +0,0 @@
----
-id: deploy-bare-metal
-title: Deploying a cluster on bare metal
-sidebar_label: "Bare metal"
-original_id: deploy-bare-metal
----
-
-:::tip
-
-1. Single-cluster Pulsar installations should be sufficient for all but the most ambitious use cases. If you're interested in experimenting with
-Pulsar or using it in a startup or on a single team, we recommend opting for a single cluster. If you do need to run a multi-cluster Pulsar instance,
-however, see the guide [here](deploy-bare-metal-multi-cluster.md).
-2. If you want to use all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
-package and make sure it is installed under `connectors` directory in the pulsar directory on every broker node or on every function-worker node if you
-have run a separate cluster of function workers for [Pulsar Functions](functions-overview.md).
-
-:::
-
-Deploying a Pulsar cluster involves doing the following (in order):
-
-* Deploying a [ZooKeeper](#deploying-a-zookeeper-cluster) cluster (optional)
-* Initializing [cluster metadata](#initializing-cluster-metadata)
-* Deploying a [BookKeeper](#deploying-a-bookkeeper-cluster) cluster
-* Deploying one or more Pulsar [brokers](#deploying-pulsar-brokers)
-
-## Preparation
-
-### Requirements
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-> If you already have an existing ZooKeeper cluster and would like to reuse it, you don't need to prepare the machines
-> for running ZooKeeper.
-
-To run Pulsar on bare metal, you will need:
-
-* At least 6 Linux machines or VMs
-  * 3 running [ZooKeeper](https://zookeeper.apache.org)
-  * 3 running a Pulsar broker, and a [BookKeeper](https://bookkeeper.apache.org) bookie
-* A single [DNS](https://en.wikipedia.org/wiki/Domain_Name_System) name covering all of the Pulsar broker hosts
-
-Each machine in your cluster will need to have [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or higher installed.
-
-Here's a diagram showing the basic setup:
-
-![alt-text](/assets/pulsar-basic-setup.png)
-
-In this diagram, connecting clients need to be able to communicate with the Pulsar cluster using a single URL, in this case `pulsar-cluster.acme.com`, that abstracts over all of the message-handling brokers. Pulsar message brokers run on machines alongside BookKeeper bookies; brokers and bookies, in turn, rely on ZooKeeper.
-
-### Hardware considerations
-
-When deploying a Pulsar cluster, we have some basic recommendations that you should keep in mind when capacity planning.
-
-#### ZooKeeper
-
-For machines running ZooKeeper, we recommend using lighter-weight machines or VMs. Pulsar uses ZooKeeper only for periodic coordination- and configuration-related tasks, *not* for basic operations. If you're running Pulsar on [Amazon Web Services](https://aws.amazon.com/) (AWS), for example, a [t2.small](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/t2-instances.html) instance would likely suffice.
-
-#### Bookies & Brokers
-
-For machines running a bookie and a Pulsar broker, we recommend using more powerful machines. For an AWS deployment, for example, [i3.4xlarge](https://aws.amazon.com/blogs/aws/now-available-i3-instances-for-demanding-io-intensive-applications/) instances may be appropriate. On those machines we also recommend:
-
-* Fast CPUs and 10Gbps [NIC](https://en.wikipedia.org/wiki/Network_interface_controller) (for Pulsar brokers)
-* Small and fast [solid-state drives](https://en.wikipedia.org/wiki/Solid-state_drive) (SSDs) or [hard disk drives](https://en.wikipedia.org/wiki/Hard_disk_drive) (HDDs) with a [RAID](https://en.wikipedia.org/wiki/RAID) controller and a battery-backed write cache (for BookKeeper bookies)
-
-## Installing the Pulsar binary package
-
-> You'll need to install the Pulsar binary package on *each machine in the cluster*, including machines running [ZooKeeper](#deploying-a-zookeeper-cluster) and [BookKeeper](#deploying-a-bookkeeper-cluster).
-
-To get started deploying a Pulsar cluster on bare metal, you'll need to download a binary tarball release in one of the following ways:
-
-* By clicking on the link directly below, which will automatically trigger a download:
-  * Pulsar @pulsar:version@ binary release
-* From the Pulsar [downloads page](pulsar:download_page_url)
-* From the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest) on [GitHub](https://github.com)
-* Using [wget](https://www.gnu.org/software/wget):
-
-```bash
-
-$ wget pulsar:binary_release_url
-
-```
-
-Once you've downloaded the tarball, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvzf apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-The untarred directory contains the following subdirectories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's [command-line tools](reference-cli-tools.md), such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`data` | The data storage directory used by ZooKeeper and BookKeeper.
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar.
-`logs` | Logs created by the installation.
-
-## Installing Builtin Connectors (optional)
-
-> Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-> If you would like to enable those `builtin` connectors, you can follow the instructions as below; otherwise you can
-> skip this section for now.
-
-To get started using builtin connectors, you'll need to download the connectors tarball release on every broker node in
-one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ mv apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-## Deploying a ZooKeeper cluster
-
-> If you already have an existing zookeeper cluster and would like to use it, you can skip this section.
-
-[ZooKeeper](https://zookeeper.apache.org) manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.
-
-To begin, add all ZooKeeper servers to the configuration specified in [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) (in the Pulsar directory you created [above](#installing-the-pulsar-binary-package)). Here's an example:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-On each host, you need to specify the ID of the node in each node's `myid` file, which is in each server's `data/zookeeper` folder by default (this can be changed via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
-
-> See the [Multi-server setup guide](https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup) in the ZooKeeper documentation for detailed info on `myid` and more.
-
-On a ZooKeeper server at `zk1.us-west.example.com`, for example, you could set the `myid` value like this:
-
-```bash
-
-$ mkdir -p data/zookeeper
-$ echo 1 > data/zookeeper/myid
-
-```
-
-On `zk2.us-west.example.com` the command would be `echo 2 > data/zookeeper/myid` and so on.
-
-Once each server has been added to the `zookeeper.conf` configuration and has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start zookeeper
-
-```
-
-## Initializing cluster metadata
-
-Once you've deployed ZooKeeper for your cluster, there is some metadata that needs to be written to ZooKeeper for each cluster in your instance. It only needs to be written **once**.
-
-You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. This command can be run on any machine in your ZooKeeper cluster. Here's an example:
-
-```shell
-
-$ bin/pulsar initialize-cluster-metadata \
-  --cluster pulsar-cluster-1 \
-  --zookeeper zk1.us-west.example.com:2181 \
-  --configuration-store zk1.us-west.example.com:2181 \
-  --web-service-url http://pulsar.us-west.example.com:8080 \
-  --web-service-url-tls https://pulsar.us-west.example.com:8443 \
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650 \
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651
-
-```
-
-As you can see from the example above, the following needs to be specified:
-
-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.
-`--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 (we don't recommend using a different port).
-`--web-service-url-tls` | If you're using [TLS](security-tls-transport.md), you'll also need to specify a TLS web service URL for the cluster. The default port is 8443 (we don't recommend using a different port).
-`--broker-service-url` | A broker service URL enabling interaction with the brokers in the cluster. This URL should use the same DNS name as the web service URL but should use the `pulsar` scheme instead. The default port is 6650 (we don't recommend using a different port).
-`--broker-service-url-tls` | If you're using [TLS](security-tls-transport.md), you'll also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster. The default port is 6651 (we don't recommend using a different port).
-
-## Deploying a BookKeeper cluster
-
-[BookKeeper](https://bookkeeper.apache.org) handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a **3-bookie BookKeeper cluster**.
-
-BookKeeper bookies can be configured using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. The most important step in configuring bookies for our purposes here is ensuring that the [`zkServers`](reference-configuration.md#bookkeeper-zkServers) is set to the connection string for the ZooKeeper cluster. Here's an example:
-
-```properties
-
-zkServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-```
-
-Once you've appropriately modified the `zkServers` parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters [here](reference-configuration.md#bookkeeper), although we would recommend consulting the [BookKeeper documentation](http://bookkeeper.apache.org/docs/latest/reference/config/) for a more in-depth guide.
-
-Once you've applied the desired configuration in `conf/bookkeeper.conf`, you can start up a bookie on each of your BookKeeper hosts. You can start up each bookie either in the background, using [nohup](https://en.wikipedia.org/wiki/Nohup), or in the foreground.
-
-To start the bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start bookie
-
-```
-
-To start the bookie in the foreground:
-
-```bash
-
-$ bin/bookkeeper bookie
-
-```
-
-You can verify that a bookie is working properly by running the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#shell) on it:
-
-```bash
-
-$ bin/bookkeeper shell bookiesanity
-
-```
-
-This will create an ephemeral BookKeeper ledger on the local bookie, write a few entries, read them back, and finally delete the ledger.
-
-After you have started all the bookies, you can use `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to
-verify all the bookies in the cluster are up running.
-
-```bash
-
-$ bin/bookkeeper shell simpletest --ensemble  --writeQuorum  --ackQuorum  --numEntries 
-
-```
-
-This command will create a `num-bookies` sized ledger on the cluster, write a few entries, and finally delete the ledger.
-
-
-## Deploying Pulsar brokers
-
-Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running **3 brokers**, one for each machine that's already running a BookKeeper bookie.
-
-### Configuring Brokers
-
-The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the [`zookeeperServers`](reference-configuration.md#broker-zookeeperServers) and [`configurationStoreServers`](reference-configuration.md#broker-configurationStoreServers) parameters. In this case, since we only have 1 cluster and no configuration store setup, the `configurationStoreServers` will point to the same `zookeeperServers`.
-
-```properties
-
-zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-configurationStoreServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-
-```
-
-You also need to specify the cluster name (matching the name that you provided when [initializing the cluster's metadata](#initializing-cluster-metadata):
-
-```properties
-
-clusterName=pulsar-cluster-1
-
-```
-
-### Enabling Pulsar Functions (optional)
-
-If you want to enable [Pulsar Functions](functions-overview.md), you can follow the instructions as below:
-
-1. Edit `conf/broker.conf` to enable function worker, by setting `functionsWorkerEnabled` to `true`.
-
-   ```conf
-   
-   functionsWorkerEnabled=true
-   
-   ```
-
-2. Edit `conf/functions_worker.yml` and set `pulsarFunctionsCluster` to the cluster name that you provided when [initializing the cluster's metadata](#initializing-cluster-metadata). 
-
-   ```conf
-   
-   pulsarFunctionsCluster: pulsar-cluster-1
-   
-   ```
-
-### Starting Brokers
-
-You can then provide any other configuration changes that you'd like in the [`conf/broker.conf`](reference-configuration.md#broker) file. Once you've decided on a configuration, you can start up the brokers for your Pulsar cluster. Like ZooKeeper and BookKeeper, brokers can be started either in the foreground or in the background, using nohup.
-
-You can start a broker in the foreground using the [`pulsar broker`](reference-cli-tools.md#pulsar-broker) command:
-
-```bash
-
-$ bin/pulsar broker
-
-```
-
-You can start a broker in the background using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
-
-```bash
-
-$ bin/pulsar-daemon start broker
-
-```
-
-Once you've successfully started up all the brokers you intend to use, your Pulsar cluster should be ready to go!
-
-## Connecting to the running cluster
-
-Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool, which is included with the Pulsar binary package. The `pulsar-client` tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is running properly.
-
-To use the `pulsar-client` tool, first modify the client configuration file in [`conf/client.conf`](reference-configuration.md#client) in your binary package. You'll need to change the values for `webServiceUrl` and `brokerServiceUrl`, substituting `localhost` (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:
-
-```properties
-
-webServiceUrl=http://us-west.example.com:8080/
-brokerServiceurl=pulsar://us-west.example.com:6650/
-
-```
-
-Once you've done that, you can publish a message to Pulsar topic:
-
-```bash
-
-$ bin/pulsar-client produce \
-  persistent://public/default/test \
-  -n 1 \
-  -m "Hello, Pulsar"
-
-```
-
-> You may need to use a different cluster name in the topic if you specified a cluster name different from `pulsar-cluster-1`.
-
-This will publish a single message to the Pulsar topic.
-
-## Running Functions
-
-> If you have [enabled](#enabling-pulsar-functions-optional) Pulsar Functions, you can also tryout pulsar functions now.
-
-Create a ExclamationFunction `exclamation`.
-
-```bash
-
-bin/pulsar-admin functions create \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-Check if the function is running as expected by [triggering](functions-deploying.md#triggering-pulsar-functions) the function.
-
-```bash
-
-bin/pulsar-admin functions trigger --name exclamation --triggerValue "hello world"
-
-```
-
-You will see output as below:
-
-```shell
-
-hello world!
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-kubernetes.md b/site2/website/versioned_docs/version-2.1.1-incubating/deploy-kubernetes.md
deleted file mode 100644
index 7455247c901d4..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-kubernetes.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-id: deploy-kubernetes
-title: Deploy Pulsar on Kubernetes
-sidebar_label: "Kubernetes"
----
-
-To get up and running with these charts as fast as possible, in a **non-production** use case, we provide
-a [quick start guide](getting-started-helm.md) for Proof of Concept (PoC) deployments.
-
-To configure and install a Pulsar cluster on Kubernetes for production usage, follow the complete [Installation Guide](helm-install.md).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-monitoring.md b/site2/website/versioned_docs/version-2.1.1-incubating/deploy-monitoring.md
deleted file mode 100644
index d581fe2edfacb..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/deploy-monitoring.md
+++ /dev/null
@@ -1,137 +0,0 @@
----
-id: deploy-monitoring
-title: Monitor
-sidebar_label: "Monitor"
----
-
-You can use different ways to monitor a Pulsar cluster, exposing both metrics related to the usage of topics and the overall health of the individual components of the cluster.
-
-## Collect metrics
-
-You can collect broker stats, ZooKeeper stats, and BookKeeper stats. 
-
-### Broker stats
-
-You can collect Pulsar broker metrics from brokers and export the metrics in JSON format. The Pulsar broker metrics mainly have two types:
-
-* *Destination dumps*, which contain stats for each individual topic. You can fetch the destination dumps using the command below:
-
-  ```shell
-  
-  bin/pulsar-admin broker-stats destinations
-  
-  ```
-
-* Broker metrics, which contain the broker information and topics stats aggregated at namespace level. You can fetch the broker metrics by using the following command:
-
-  ```shell
-  
-  bin/pulsar-admin broker-stats monitoring-metrics
-  
-  ```
-
-All the message rates are updated every minute.
-
-The aggregated broker metrics are also exposed in the [Prometheus](https://prometheus.io) format at:
-
-```shell
-
-http://$BROKER_ADDRESS:8080/metrics/
-
-```
-
-### ZooKeeper stats
-
-The local ZooKeeper, configuration store server and clients that are shipped with Pulsar can expose detailed stats through Prometheus.
-
-```shell
-
-http://$LOCAL_ZK_SERVER:8000/metrics
-http://$GLOBAL_ZK_SERVER:8001/metrics
-
-```
-
-The default port of local ZooKeeper is `8000` and the default port of the configuration store is `8001`. You can use a different stats port by configuring `metricsProvider.httpPort` in the `conf/zookeeper.conf` file.
-
-### BookKeeper stats
-
-You can configure the stats frameworks for BookKeeper by modifying the `statsProviderClass` in the `conf/bookkeeper.conf` file.
-
-The default BookKeeper configuration enables the Prometheus exporter. The configuration is included with Pulsar distribution.
-
-```shell
-
-http://$BOOKIE_ADDRESS:8000/metrics
-
-```
-
-The default port for bookie is `8000`. You can change the port by configuring `prometheusStatsHttpPort` in the `conf/bookkeeper.conf` file.
-
-### Managed cursor acknowledgment state
-The acknowledgment state is persistent to the ledger first. When the acknowledgment state fails to be persistent to the ledger, they are persistent to ZooKeeper. To track the stats of acknowledgement, you can configure the metrics for the managed cursor. 
-
-```
-
-brk_ml_cursor_persistLedgerSucceed(namespace=", ledger_name="", cursor_name:")
-brk_ml_cursor_persistLedgerErrors(namespace="", ledger_name="", cursor_name:"")
-brk_ml_cursor_persistZookeeperSucceed(namespace="", ledger_name="", cursor_name:"")
-brk_ml_cursor_persistZookeeperErrors(namespace="", ledger_name="", cursor_name:"")
-brk_ml_cursor_nonContiguousDeletedMessagesRange(namespace="", ledger_name="", cursor_name:"")
-
-```
-
-Those metrics are added in the Prometheus interface, you can monitor and check the metrics stats in the Grafana.
-
-### Function and connector stats
-
-You can collect functions worker stats from `functions-worker` and export the metrics in JSON formats, which contain functions worker JVM metrics.
-
-```
-
-pulsar-admin functions-worker monitoring-metrics
-
-```
-
-You can collect functions and connectors metrics from `functions-worker` and export the metrics in JSON formats.
-
-```
-
-pulsar-admin functions-worker function-stats
-
-```
-
-The aggregated functions and connectors metrics can be exposed in Prometheus formats as below. You can get [`FUNCTIONS_WORKER_ADDRESS`](http://pulsar.apache.org/docs/en/next/functions-worker/) and `WORKER_PORT` from the `functions_worker.yml` file.
-
-```
-
-http://$FUNCTIONS_WORKER_ADDRESS:$WORKER_PORT/metrics:
-
-```
-
-## Configure Prometheus
-
-You can use Prometheus to collect all the metrics exposed for Pulsar components and set up [Grafana](https://grafana.com/) dashboards to display the metrics and monitor your Pulsar cluster. For details, refer to [Prometheus guide](https://prometheus.io/docs/introduction/getting_started/).
-
-When you run Pulsar on bare metal, you can provide the list of nodes to be probed. When you deploy Pulsar in a Kubernetes cluster, the monitoring is setup automatically. For details, refer to [Kubernetes instructions](helm-deploy.md). 
-
-## Dashboards
-
-When you collect time series statistics, the major problem is to make sure the number of dimensions attached to the data does not explode. Thus you only need to collect time series of metrics aggregated at the namespace level.
-
-### Pulsar per-topic dashboard
-
-The per-topic dashboard instructions are available at [Pulsar manager](administration-pulsar-manager.md).
-
-### Grafana
-
-You can use grafana to create dashboard driven by the data that is stored in Prometheus.
-
-When you deploy Pulsar on Kubernetes with the Pulsar Helm Chart, a `pulsar-grafana` Docker image is enabled by default. You can use the docker image with the principal dashboards.
-
-The following are some Grafana dashboards examples:
-
-- [pulsar-grafana](http://pulsar.apache.org/docs/en/deploy-monitoring/#grafana): a Grafana dashboard that displays metrics collected in Prometheus for Pulsar clusters running on Kubernetes.
-- [apache-pulsar-grafana-dashboard](https://github.com/streamnative/apache-pulsar-grafana-dashboard): a collection of Grafana dashboard templates for different Pulsar components running on both Kubernetes and on-premise machines.
-
-## Alerting rules
-You can set alerting rules according to your Pulsar environment. To configure alerting rules for Apache Pulsar, refer to [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/develop-cpp.md b/site2/website/versioned_docs/version-2.1.1-incubating/develop-cpp.md
deleted file mode 100644
index ce71100237040..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/develop-cpp.md
+++ /dev/null
@@ -1,115 +0,0 @@
----
-id: develop-cpp
-title: Building Pulsar C++ client
-sidebar_label: "Building Pulsar C++ client"
-original_id: develop-cpp
----
-
-## Supported platforms
-
-The Pulsar C++ client has been successfully tested on **MacOS** and **Linux**.
-
-## System requirements
-
-You need to have the following installed to use the C++ client:
-
-* [CMake](https://cmake.org/)
-* [Boost](http://www.boost.org/)
-* [Protocol Buffers](https://developers.google.com/protocol-buffers/) 2.6
-* [Log4CXX](https://logging.apache.org/log4cxx)
-* [libcurl](https://curl.haxx.se/libcurl/)
-* [Google Test](https://github.com/google/googletest)
-* [JsonCpp](https://github.com/open-source-parsers/jsoncpp)
-
-## Compilation
-
-There are separate compilation instructions for [MacOS](#macos) and [Linux](#linux). For both systems, start by cloning the Pulsar repository:
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-
-```
-
-### Linux
-
-First, install all of the necessary dependencies:
-
-```shell
-
-$ apt-get install cmake libssl-dev libcurl4-openssl-dev liblog4cxx-dev \
-  libprotobuf-dev protobuf-compiler libboost-all-dev google-mock libgtest-dev libjsoncpp-dev
-
-```
-
-Then compile and install [Google Test](https://github.com/google/googletest):
-
-```shell
-
-# libgtest-dev version is 1.18.0 or above
-$ cd /usr/src/googletest
-$ sudo cmake .
-$ sudo make
-$ sudo cp ./googlemock/libgmock.a ./googlemock/gtest/libgtest.a /usr/lib/
-
-# less than 1.18.0
-$ cd /usr/src/gtest
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgtest.a /usr/lib
-
-$ cd /usr/src/gmock
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgmock.a /usr/lib
-
-```
-
-Finally, compile the Pulsar client library for C++ inside the Pulsar repo:
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
-The resulting files, `libpulsar.so` and `libpulsar.a`, will be placed in the `lib` folder of the repo while two tools, `perfProducer` and `perfConsumer`, will be placed in the `perf` directory.
-
-### MacOS
-
-First, install all of the necessary dependencies:
-
-```shell
-
-# OpenSSL installation
-$ brew install openssl
-$ export OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/
-$ export OPENSSL_ROOT_DIR=/usr/local/opt/openssl/
-
-# Protocol Buffers installation
-$ brew tap homebrew/versions
-$ brew install protobuf260
-$ brew install boost
-$ brew install log4cxx
-
-# Google Test installation
-$ git clone https://github.com/google/googletest.git
-$ cd googletest
-$ git checkout release-1.12.1
-$ cmake .
-$ make install
-
-```
-
-Then compile the Pulsar client library in the repo that you cloned:
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/develop-load-manager.md b/site2/website/versioned_docs/version-2.1.1-incubating/develop-load-manager.md
deleted file mode 100644
index 9687f30bcebbb..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/develop-load-manager.md
+++ /dev/null
@@ -1,226 +0,0 @@
----
-id: develop-load-manager
-title: Modular load manager
-sidebar_label: "Modular load manager"
----
-
-The *modular load manager*, implemented in  [`ModularLoadManagerImpl`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java), is a flexible alternative to the previously implemented load manager, [`SimpleLoadManagerImpl`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java), which attempts to simplify how load is managed while also providing abstractions so that complex load management strategies may be implemented.
-
-## Usage
-
-There are two ways that you can enable the modular load manager:
-
-1. Change the value of the `loadManagerClassName` parameter in `conf/broker.conf` from `org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl` to `org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`.
-2. Using the `pulsar-admin` tool. Here's an example:
-
-   ```shell
-   
-   $ pulsar-admin update-dynamic-config \
-    --config loadManagerClassName \
-    --value org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl
-   
-   ```
-
-   You can use the same method to change back to the original value. In either case, any mistake in specifying the load manager will cause Pulsar to default to `SimpleLoadManagerImpl`.
-
-## Verification
-
-There are a few different ways to determine which load manager is being used:
-
-1. Use `pulsar-admin` to examine the `loadManagerClassName` element:
-
-   ```shell
-   
-   $ bin/pulsar-admin brokers get-all-dynamic-config
-   {
-    "loadManagerClassName" : "org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl"
-   }
-   
-   ```
-
-   If there is no `loadManagerClassName` element, then the default load manager is used.
-
-2. Consult a ZooKeeper load report. With the module load manager, the load report in `/loadbalance/brokers/...` will have many differences. for example the `systemResourceUsage` sub-elements (`bandwidthIn`, `bandwidthOut`, etc.) are now all at the top level. Here is an example load report from the module load manager:
-
-   ```json
-   
-   {
-     "bandwidthIn": {
-       "limit": 10240000.0,
-       "usage": 4.256510416666667
-     },
-     "bandwidthOut": {
-       "limit": 10240000.0,
-       "usage": 5.287239583333333
-     },
-     "bundles": [],
-     "cpu": {
-       "limit": 2400.0,
-       "usage": 5.7353247655435915
-     },
-     "directMemory": {
-       "limit": 16384.0,
-       "usage": 1.0
-     }
-   }
-   
-   ```
-
-   With the simple load manager, the load report in `/loadbalance/brokers/...` will look like this:
-
-   ```json
-   
-   {
-     "systemResourceUsage": {
-       "bandwidthIn": {
-         "limit": 10240000.0,
-         "usage": 0.0
-       },
-       "bandwidthOut": {
-         "limit": 10240000.0,
-         "usage": 0.0
-       },
-       "cpu": {
-         "limit": 2400.0,
-         "usage": 0.0
-       },
-       "directMemory": {
-         "limit": 16384.0,
-         "usage": 1.0
-       },
-       "memory": {
-         "limit": 8192.0,
-         "usage": 3903.0
-       }
-     }
-   }
-   
-   ```
-
-3. The command-line [broker monitor](reference-cli-tools.md#monitor-brokers) will have a different output format depending on which load manager implementation is being used.
-
-   Here is an example from the modular load manager:
-
-   ```
-   
-   ===================================================================================================================
-   ||SYSTEM         |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
-   ||               |0.00           |48.33          |0.01           |0.00           |0.00           |48.33          ||
-   ||COUNT          |TOPIC          |BUNDLE         |PRODUCER       |CONSUMER       |BUNDLE +       |BUNDLE -       ||
-   ||               |4              |4              |0              |2              |4              |0              ||
-   ||LATEST         |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
-   ||SHORT          |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
-   ||LONG           |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
-   ===================================================================================================================
-   
-   ```
-
-   Here is an example from the simple load manager:
-
-   ```
-   
-   ===================================================================================================================
-   ||COUNT          |TOPIC          |BUNDLE         |PRODUCER       |CONSUMER       |BUNDLE +       |BUNDLE -       ||
-   ||               |4              |4              |0              |2              |0              |0              ||
-   ||RAW SYSTEM     |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
-   ||               |0.25           |47.94          |0.01           |0.00           |0.00           |47.94          ||
-   ||ALLOC SYSTEM   |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
-   ||               |0.20           |1.89           |               |1.27           |3.21           |3.21           ||
-   ||RAW MSG        |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |0.00           |0.00           |0.00           |0.01           |0.01           |0.01           ||
-   ||ALLOC MSG      |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
-   ||               |54.84          |134.48         |189.31         |126.54         |320.96         |447.50         ||
-   ===================================================================================================================
-   
-   ```
-
-It is important to note that the module load manager is _centralized_, meaning that all requests to assign a bundle---whether it's been seen before or whether this is the first time---only get handled by the _lead_ broker (which can change over time). To determine the current lead broker, examine the `/loadbalance/leader` node in ZooKeeper.
-
-## Implementation
-
-### Data
-
-The data monitored by the modular load manager is contained in the [`LoadData`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LoadData.java) class.
-Here, the available data is subdivided into the bundle data and the broker data.
-
-#### Broker
-
-The broker data is contained in the [`BrokerData`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/BrokerData.java) class. It is further subdivided into two parts,
-one being the local data which every broker individually writes to ZooKeeper, and the other being the historical broker
-data which is written to ZooKeeper by the leader broker.
-
-##### Local Broker Data
-The local broker data is contained in the class [`LocalBrokerData`](https://github.com/apache/pulsar/blob/master/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java) and provides information about the following resources:
-
-* CPU usage
-* JVM heap memory usage
-* Direct memory usage
-* Bandwidth in/out usage
-* Most recent total message rate in/out across all bundles
-* Total number of topics, bundles, producers, and consumers
-* Names of all bundles assigned to this broker
-* Most recent changes in bundle assignments for this broker
-
-The local broker data is updated periodically according to the service configuration
-"loadBalancerReportUpdateMaxIntervalMinutes". After any broker updates their local broker data, the leader broker will
-receive the update immediately via a ZooKeeper watch, where the local data is read from the ZooKeeper node
-`/loadbalance/brokers/`
-
-##### Historical Broker Data
-
-The historical broker data is contained in the [`TimeAverageBrokerData`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/TimeAverageBrokerData.java) class.
-
-In order to reconcile the need to make good decisions in a steady-state scenario and make reactive decisions in a critical scenario, the historical data is split into two parts: the short-term data for reactive decisions, and the long-term data for steady-state decisions. Both time frames maintain the following information:
-
-* Message rate in/out for the entire broker
-* Message throughput in/out for the entire broker
-
-Unlike the bundle data, the broker data does not maintain samples for the global broker message rates and throughputs, which is not expected to remain steady as new bundles are removed or added. Instead, this data is aggregated over the short-term and long-term data for the bundles. See the section on bundle data to understand how that data is collected and maintained.
-
-The historical broker data is updated for each broker in memory by the leader broker whenever any broker writes their local data to ZooKeeper. Then, the historical data is written to ZooKeeper by the leader broker periodically according to the configuration `loadBalancerResourceQuotaUpdateIntervalMinutes`.
-
-##### Bundle Data
-
-The bundle data is contained in the [`BundleData`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/BundleData.java). Like the historical broker data, the bundle data is split into a short-term and a long-term time frame. The information maintained in each time frame:
-
-* Message rate in/out for this bundle
-* Message Throughput In/Out for this bundle
-* Current number of samples for this bundle
-
-The time frames are implemented by maintaining the average of these values over a set, limited number of samples, where
-the samples are obtained through the message rate and throughput values in the local data. Thus, if the update interval
-for the local data is 2 minutes, the number of short samples is 10 and the number of long samples is 1000, the
-short-term data is maintained over a period of `10 samples * 2 minutes / sample = 20 minutes`, while the long-term
-data is similarly over a period of 2000 minutes. Whenever there are not enough samples to satisfy a given time frame,
-the average is taken only over the existing samples. When no samples are available, default values are assumed until
-they are overwritten by the first sample. Currently, the default values are
-
-* Message rate in/out: 50 messages per second both ways
-* Message throughput in/out: 50KB per second both ways
-
-The bundle data is updated in memory on the leader broker whenever any broker writes their local data to ZooKeeper.
-Then, the bundle data is written to ZooKeeper by the leader broker periodically at the same time as the historical
-broker data, according to the configuration `loadBalancerResourceQuotaUpdateIntervalMinutes`.
-
-### Traffic Distribution
-
-The modular load manager uses the abstraction provided by [`ModularLoadManagerStrategy`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java) to make decisions about bundle assignment. The strategy makes a decision by considering the service configuration, the entire load data, and the bundle data for the bundle to be assigned. Currently, the only supported strategy is [`LeastLongTermMessageRate`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java), though soon users will have the ability to inject their own strategies if desired.
-
-#### Least Long Term Message Rate Strategy
-
-As its name suggests, the least long term message rate strategy attempts to distribute bundles across brokers so that
-the message rate in the long-term time window for each broker is roughly the same. However, simply balancing load based
-on message rate does not handle the issue of asymmetric resource burden per message on each broker. Thus, the system
-resource usages, which are CPU, memory, direct memory, bandwidth in, and bandwidth out, are also considered in the
-assignment process. This is done by weighting the final message rate according to
-`1 / (overload_threshold - max_usage)`, where `overload_threshold` corresponds to the configuration
-`loadBalancerBrokerOverloadedThresholdPercentage` and `max_usage` is the maximum proportion among the system resources
-that is being utilized by the candidate broker. This multiplier ensures that machines with are being more heavily taxed
-by the same message rates will receive less load. In particular, it tries to ensure that if one machine is overloaded,
-then all machines are approximately overloaded. In the case in which a broker's max usage exceeds the overload
-threshold, that broker is not considered for bundle assignment. If all brokers are overloaded, the bundle is randomly
-assigned.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/develop-schema.md b/site2/website/versioned_docs/version-2.1.1-incubating/develop-schema.md
deleted file mode 100644
index 2d4461a5ea2b5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/develop-schema.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-id: develop-schema
-title: Custom schema storage
-sidebar_label: "Custom schema storage"
-original_id: develop-schema
----
-
-By default, Pulsar stores data type [schemas](concepts-schema-registry.md) in [Apache BookKeeper](https://bookkeeper.apache.org) (which is deployed alongside Pulsar). You can, however, use another storage system if you wish. This doc walks you through creating your own schema storage implementation.
-
-In order to use a non-default (i.e. non-BookKeeper) storage system for Pulsar schemas, you need to implement two Java interfaces: [`SchemaStorage`](#schemastorage-interface) and [`SchemaStorageFactory`](#schemastoragefactory-interface).
-
-## SchemaStorage interface
-
-The `SchemaStorage` interface has the following methods:
-
-```java
-
-public interface SchemaStorage {
-    // How schemas are updated
-    CompletableFuture put(String key, byte[] value, byte[] hash);
-
-    // How schemas are fetched from storage
-    CompletableFuture get(String key, SchemaVersion version);
-
-    // How schemas are deleted
-    CompletableFuture delete(String key);
-
-    // Utility method for converting a schema version byte array to a SchemaVersion object
-    SchemaVersion versionFromBytes(byte[] version);
-
-    // Startup behavior for the schema storage client
-    void start() throws Exception;
-
-    // Shutdown behavior for the schema storage client
-    void close() throws Exception;
-}
-
-```
-
-> For a full-fledged example schema storage implementation, see the [`BookKeeperSchemaStorage`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java) class.
-
-## SchemaStorageFactory interface 
-
-```java
-
-public interface SchemaStorageFactory {
-    @NotNull
-    SchemaStorage create(PulsarService pulsar) throws Exception;
-}
-
-```
-
-> For a full-fledged example schema storage factory implementation, see the [`BookKeeperSchemaStorageFactory`](https://github.com/apache/pulsar/blob/master/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java) class.
-
-## Deployment
-
-In order to use your custom schema storage implementation, you'll need to:
-
-1. Package the implementation in a [JAR](https://docs.oracle.com/javase/tutorial/deployment/jar/basicsindex.html) file.
-1. Add that jar to the `lib` folder in your Pulsar [binary or source distribution](getting-started-standalone.md#installing-pulsar).
-1. Change the `schemaRegistryStorageClassName` configuration in [`broker.conf`](reference-configuration.md#broker) to your custom factory class (i.e. the `SchemaStorageFactory` implementation, not the `SchemaStorage` implementation).
-1. Start up Pulsar.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/develop-tools.md b/site2/website/versioned_docs/version-2.1.1-incubating/develop-tools.md
deleted file mode 100644
index d034926f4c299..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/develop-tools.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-id: develop-tools
-title: Simulation tools
-sidebar_label: "Simulation tools"
----
-
-It is sometimes necessary create an test environment and incur artificial load to observe how well load managers
-handle the load. The load simulation controller, the load simulation client, and the broker monitor were created as an
-effort to make create this load and observe the effects on the managers more easily.
-
-## Simulation Client
-The simulation client is a machine which will create and subscribe to topics with configurable message rates and sizes.
-Because it is sometimes necessary in simulating large load to use multiple client machines, the user does not interact
-with the simulation client directly, but instead delegates their requests to the simulation controller, which will then
-send signals to clients to start incurring load. The client implementation is in the class
-`org.apache.pulsar.testclient.LoadSimulationClient`.
-
-### Usage
-To Start a simulation client, use the `pulsar-perf` script with the command `simulation-client` as follows:
-
-```
-
-pulsar-perf simulation-client --port  --service-url 
-
-```
-
-The client will then be ready to receive controller commands.
-## Simulation Controller
-The simulation controller send signals to the simulation clients, requesting them to create new topics, stop old
-topics, change the load incurred by topics, as well as several other tasks. It is implemented in the class
-`org.apache.pulsar.testclient.LoadSimulationController` and presents a shell to the user as an interface to send
-command with.
-
-### Usage
-To start a simulation controller, use the `pulsar-perf` script with the command `simulation-controller` as follows:
-
-```
-
-pulsar-perf simulation-controller --cluster  --client-port 
---clients 
-
-```
-
-The clients should already be started before the controller is started. You will then be presented with a simple prompt,
-where you can issue commands to simulation clients. Arguments often refer to tenant names, namespace names, and topic
-names. In all cases, the BASE name of the tenants, namespaces, and topics are used. For example, for the topic
-`persistent://my_tenant/my_cluster/my_namespace/my_topic`, the tenant name is `my_tenant`, the namespace name is
-`my_namespace`, and the topic name is `my_topic`. The controller can perform the following actions:
-
-* Create a topic with a producer and a consumer
-  * `trade    [--rate ]
-  [--rand-rate ,]
-  [--size ]`
-* Create a group of topics with a producer and a consumer
-  * `trade_group    [--rate ]
-  [--rand-rate ,]
-  [--separation ] [--size ]
-  [--topics-per-namespace ]`
-* Change the configuration of an existing topic
-  * `change    [--rate ]
-  [--rand-rate ,]
-  [--size ]`
-* Change the configuration of a group of topics
-  * `change_group   [--rate ] [--rand-rate ,]
-  [--size ] [--topics-per-namespace ]`
-* Shutdown a previously created topic
-  * `stop   `
-* Shutdown a previously created group of topics
-  * `stop_group  `
-* Copy the historical data from one ZooKeeper to another and simulate based on the message rates and sizes in that history
-  * `copy    [--rate-multiplier value]`
-* Simulate the load of the historical data on the current ZooKeeper (should be same ZooKeeper being simulated on)
-  * `simulate   [--rate-multiplier value]`
-* Stream the latest data from the given active ZooKeeper to simulate the real-time load of that ZooKeeper.
-  * `stream   [--rate-multiplier value]`
-
-The "group" arguments in these commands allow the user to create or affect multiple topics at once. Groups are created
-when calling the `trade_group` command, and all topics from these groups may be subsequently modified or stopped
-with the `change_group` and `stop_group` commands respectively. All ZooKeeper arguments are of the form
-`zookeeper_host:port`.
-
-### Difference Between Copy, Simulate, and Stream
-The commands `copy`, `simulate`, and `stream` are very similar but have significant differences. `copy` is used when
-you want to simulate the load of a static, external ZooKeeper on the ZooKeeper you are simulating on. Thus,
-`source zookeeper` should be the ZooKeeper you want to copy and `target zookeeper` should be the ZooKeeper you are
-simulating on, and then it will get the full benefit of the historical data of the source in both load manager
-implementations. `simulate` on the other hand takes in only one ZooKeeper, the one you are simulating on. It assumes
-that you are simulating on a ZooKeeper that has historical data for `SimpleLoadManagerImpl` and creates equivalent
-historical data for `ModularLoadManagerImpl`. Then, the load according to the historical data is simulated by the
-clients. Finally, `stream` takes in an active ZooKeeper different than the ZooKeeper being simulated on and streams
-load data from it and simulates the real-time load. In all cases, the optional `rate-multiplier` argument allows the
-user to simulate some proportion of the load. For instance, using `--rate-multiplier 0.05` will cause messages to
-be sent at only `5%` of the rate of the load that is being simulated.
-
-## Broker Monitor
-To observe the behavior of the load manager in these simulations, one may utilize the broker monitor, which is
-implemented in `org.apache.pulsar.testclient.BrokerMonitor`. The broker monitor will print tabular load data to the
-console as it is updated using watchers.
-
-### Usage
-To start a broker monitor, use the `monitor-brokers` command in the `pulsar-perf` script:
-
-```
-
-pulsar-perf monitor-brokers --connect-string 
-
-```
-
-The console will then continuously print load data until it is interrupted.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/developing-binary-protocol.md b/site2/website/versioned_docs/version-2.1.1-incubating/developing-binary-protocol.md
deleted file mode 100644
index f39e44c80dea2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/developing-binary-protocol.md
+++ /dev/null
@@ -1,625 +0,0 @@
----
-id: developing-binary-protocol
-title: Pulsar binary protocol specification
-sidebar_label: "Binary protocol"
----
-
-Pulsar uses a custom binary protocol for communications between producers/consumers and brokers. This protocol is designed to support required features, such as acknowledgements and flow control, while ensuring maximum transport and implementation efficiency.
-
-Clients and brokers exchange *commands* with each other. Commands are formatted as binary [protocol buffer](https://developers.google.com/protocol-buffers/) (aka *protobuf*) messages. The format of protobuf commands is specified in the [`PulsarApi.proto`](https://github.com/apache/pulsar/blob/master/pulsar-common/src/main/proto/PulsarApi.proto) file and also documented in the [Protobuf interface](#protobuf-interface) section below.
-
-> ### Connection sharing
-> Commands for different producers and consumers can be interleaved and sent through the same connection without restriction.
-
-All commands associated with Pulsar's protocol are contained in a [`BaseCommand`](#pulsar.proto.BaseCommand) protobuf message that includes a [`Type`](#pulsar.proto.Type) [enum](https://developers.google.com/protocol-buffers/docs/proto#enum) with all possible subcommands as optional fields. `BaseCommand` messages can specify only one subcommand.
-
-## Framing
-
-Since protobuf doesn't provide any sort of message frame, all messages in the Pulsar protocol are prepended with a 4-byte field that specifies the size of the frame. The maximum allowable size of a single frame is 5 MB.
-
-The Pulsar protocol allows for two types of commands:
-
-1. **Simple commands** that do not carry a message payload.
-2. **Payload commands** that bear a payload that is used when publishing or delivering messages. In payload commands, the protobuf command data is followed by protobuf [metadata](#message-metadata) and then the payload, which is passed in a raw format outside of protobuf. All sizes are passed as 4-byte unsigned big-endian integers.
-
-> Message payloads are passed in raw format rather than protobuf format for efficiency reasons.
-
-### Simple commands
-
-Simple (payload-free) commands have this basic structure:
-
-| Component     | Description                                                                             | Size (in bytes) |
-|:--------------|:----------------------------------------------------------------------------------------|:----------------|
-| `totalSize`   | The size of the frame, counting everything that comes after it (in bytes)               | 4               |
-| `commandSize` | The size of the protobuf-serialized command                                             | 4               |
-| `message`     | The protobuf message serialized in a raw binary format (rather than in protobuf format) |                 |
-
-### Payload commands
-
-Payload commands have this basic structure:
-
-| Component                          | Required or optional| Description                                                                                 | Size (in bytes) |
-|:-----------------------------------|:----------|:--------------------------------------------------------------------------------------------|:----------------|
-| `totalSize`                        | Required  | The size of the frame, counting everything that comes after it (in bytes)                   | 4               |
-| `commandSize`                      | Required  | The size of the protobuf-serialized command                                                 | 4               |
-| `message`                          | Required  | The protobuf message serialized in a raw binary format (rather than in protobuf format)     |                 |
-| `magicNumberOfBrokerEntryMetadata` | Optional  | A 2-byte byte array (`0x0e02`) identifying the broker entry metadata   
     **Note**: `magicNumberOfBrokerEntryMetadata` , `brokerEntryMetadataSize`, and `brokerEntryMetadata` should be used **together**.                     | 2               |
-| `brokerEntryMetadataSize`          | Optional  | The size of the broker entry metadata                                                       | 4               |
-| `brokerEntryMetadata`              | Optional  | The broker entry metadata stored as a binary protobuf message                               |                 |
-| `magicNumber`                      | Required  | A 2-byte byte array (`0x0e01`) identifying the current format                               | 2               |
-| `checksum`                         | Required  | A [CRC32-C checksum](http://www.evanjones.ca/crc32c.html) of everything that comes after it | 4               |
-| `metadataSize`                     | Required  | The size of the message [metadata](#message-metadata)                                       | 4               |
-| `metadata`                         | Required  | The message [metadata](#message-metadata) stored as a binary protobuf message               |                 |
-| `payload`                          | Required  | Anything left in the frame is considered the payload and can include any sequence of bytes  |                 |
-
-## Message metadata
-
-Message metadata is stored alongside the application-specified payload as a serialized protobuf message. Metadata is created by the producer and passed without changes to the consumer.
-
-| Field                    | Required or optional | Description                                                                                                                                                                                                                                               |
-|:-------------------------|:----------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `producer_name`          | Required  | The name of the producer that published the message                                                                                                                                                                                         |
-| `sequence_id`            | Required  | The sequence ID of the message, assigned by producer                                                                                                                                                                                        |
-| `publish_time`           | Required  | The publish timestamp in Unix time (i.e. as the number of milliseconds since January 1st, 1970 in UTC)                                                                                                                                                    |
-| `properties`             | Required  | A sequence of key/value pairs (using the [`KeyValue`](https://github.com/apache/pulsar/blob/master/pulsar-common/src/main/proto/PulsarApi.proto#L32) message). These are application-defined keys and values with no special meaning to Pulsar. |
-| `replicated_from`        | Optional  |  Indicates that the message has been replicated and specifies the name of the [cluster](reference-terminology.md#cluster) where the message was originally published                                                                                                             |
-| `partition_key`          | Optional  | While publishing on a partitioned topic, if the key is present, the hash of the key is used to determine which partition to choose. Partition key is used as the message key.                                                                                                                          |
-| `compression`            | Optional  | Signals that payload has been compressed and with which compression library                                                                                                                                                                               |
-| `uncompressed_size`      | Optional  | If compression is used, the producer must fill the uncompressed size field with the original payload size                                                                                                                                                 |
-| `num_messages_in_batch`  | Optional  | If this message is really a [batch](#batch-messages) of multiple entries, this field must be set to the number of messages in the batch                                                                                                                   |
-
-### Batch messages
-
-When using batch messages, the payload will be containing a list of entries,
-each of them with its individual metadata, defined by the `SingleMessageMetadata`
-object.
-
-
-For a single batch, the payload format will look like this:
-
-
-| Field           | Required or optional | Description                                                |
-|:----------------|:---------------------|:-----------------------------------------------------------|
-| `metadataSizeN` | Required             |The size of the single message metadata serialized Protobuf |
-| `metadataN`     | Required             |Single message metadata                                     |
-| `payloadN`      | Required             |Message payload passed by application                       |
-
-Each metadata field looks like this;
-
-| Field           | Required or optional  | Description                                             |
-|:----------------|:----------------------|:--------------------------------------------------------|
-| `properties`    | Required              | Application-defined properties                          |
-| `partition key` | Optional              | Key to indicate the hashing to a particular partition   |
-| `payload_size`  | Required              | Size of the payload for the single message in the batch |
-
-When compression is enabled, the whole batch will be compressed at once.
-
-## Interactions
-
-### Connection establishment
-
-After opening a TCP connection to a broker, typically on port 6650, the client
-is responsible to initiate the session.
-
-![Connect interaction](/assets/binary-protocol-connect.png)
-
-After receiving a `Connected` response from the broker, the client can
-consider the connection ready to use. Alternatively, if the broker doesn't
-validate the client authentication, it will reply with an `Error` command and
-close the TCP connection.
-
-Example:
-
-```protobuf
-
-message CommandConnect {
-  "client_version" : "Pulsar-Client-Java-v1.15.2",
-  "auth_method_name" : "my-authentication-plugin",
-  "auth_data" : "my-auth-data",
-  "protocol_version" : 6
-}
-
-```
-
-Fields:
- * `client_version`: String-based identifier. Format is not enforced.
- * `auth_method_name`: *(optional)* Name of the authentication plugin if auth is enabled.
- * `auth_data`: *(optional)* Plugin specific authentication data.
- * `protocol_version`: Indicates the protocol version supported by the client. Broker will not send commands introduced in newer revisions of the protocol. Broker might be enforcing a minimum version.
-
-```protobuf
-
-message CommandConnected {
-  "server_version" : "Pulsar-Broker-v1.15.2",
-  "protocol_version" : 6
-}
-
-```
-
-Fields:
- * `server_version`: String identifier of broker version.
- * `protocol_version`: Protocol version supported by the broker. Client
-   must not attempt to send commands introduced in newer revisions of the
-   protocol.
-
-### Keep Alive
-
-To identify prolonged network partitions between clients and brokers or cases
-in which a machine crashes without interrupting the TCP connection on the remote
-end (eg: power outage, kernel panic, hard reboot...), we have introduced a
-mechanism to probe for the availability status of the remote peer.
-
-Both clients and brokers are sending `Ping` commands periodically and they will
-close the socket if a `Pong` response is not received within a timeout (default
-used by broker is 60s).
-
-A valid implementation of a Pulsar client is not required to send the `Ping`
-probe, though it is required to promptly reply after receiving one from the
-broker in order to prevent the remote side from forcibly closing the TCP connection.
-
-
-### Producer
-
-In order to send messages, a client needs to establish a producer. When creating
-a producer, the broker will first verify that this particular client is
-authorized to publish on the topic.
-
-Once the client gets confirmation of the producer creation, it can publish
-messages to the broker, referring to the producer ID negotiated before.
-
-![Producer interaction](/assets/binary-protocol-producer.png)
-
-If the client does not receive a response indicating producer creation success or failure,
-the client should first send a command to close the original producer before sending a
-command to re-attempt producer creation.
-
-##### Command Producer
-
-```protobuf
-
-message CommandProducer {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "producer_id" : 1,
-  "request_id" : 1
-}
-
-```
-
-Fields:
- * `topic`: Complete topic name to where you want to create the producer on.
- * `producer_id`: Client generated producer identifier. Needs to be unique
-    within the same connection.
- * `request_id`: Identifier for this request. Used to match the response with
-    the originating request. Needs to be unique within the same connection.
- * `producer_name`: *(optional)* If a producer name is specified, the name will
-    be used, otherwise the broker will generate a unique name. Generated
-    producer name is guaranteed to be globally unique. Implementations are
-    expected to let the broker generate a new producer name when the producer
-    is initially created, then reuse it when recreating the producer after
-    reconnections.
-
-The broker will reply with either `ProducerSuccess` or `Error` commands.
-
-##### Command ProducerSuccess
-
-```protobuf
-
-message CommandProducerSuccess {
-  "request_id" :  1,
-  "producer_name" : "generated-unique-producer-name"
-}
-
-```
-
-Fields:
- * `request_id`: Original ID of the `CreateProducer` request.
- * `producer_name`: Generated globally unique producer name or the name
-    specified by the client, if any.
-
-##### Command Send
-
-Command `Send` is used to publish a new message within the context of an
-already existing producer. If a producer has not yet been created for the
-connection, the broker will terminate the connection. This command is used
-in a frame that includes command as well as message payload, for which the
-complete format is specified in the [payload commands](#payload-commands) section.
-
-```protobuf
-
-message CommandSend {
-  "producer_id" : 1,
-  "sequence_id" : 0,
-  "num_messages" : 1
-}
-
-```
-
-Fields:
- * `producer_id`: The ID of an existing producer.
- * `sequence_id`: Each message has an associated sequence ID which is expected
-   to be implemented with a counter starting at 0. The `SendReceipt` that
-   acknowledges the effective publishing of messages will refer to it by
-   its sequence ID.
- * `num_messages`: *(optional)* Used when publishing a batch of messages at
-   once.
-
-##### Command SendReceipt
-
-After a message has been persisted on the configured number of replicas, the
-broker will send the acknowledgment receipt to the producer.
-
-```protobuf
-
-message CommandSendReceipt {
-  "producer_id" : 1,
-  "sequence_id" : 0,
-  "message_id" : {
-    "ledgerId" : 123,
-    "entryId" : 456
-  }
-}
-
-```
-
-Fields:
- * `producer_id`: The ID of producer originating the send request.
- * `sequence_id`: The sequence ID of the published message.
- * `message_id`: The message ID assigned by the system to the published message
-   Unique within a single cluster. Message ID is composed of 2 longs, `ledgerId`
-   and `entryId`, that reflect that this unique ID is assigned when appending
-   to a BookKeeper ledger.
-
-
-##### Command CloseProducer
-
-:::note
-
-This command can be sent by either producer or broker.
-
-:::
-
-When receiving a `CloseProducer` command, the broker will stop accepting any
-more messages for the producer, wait until all pending messages are persisted
-and then reply `Success` to the client.
-
-If the client does not receive a response to a `Producer` command within a timeout,
-the client must first send a `CloseProducer` command before sending another
-`Producer` command. The client does not need to await a response to the `CloseProducer`
-command before sending the next `Producer` command.
-
-The broker can send a `CloseProducer` command to client when it's performing
-a graceful failover (eg: broker is being restarted, or the topic is being unloaded
-by load balancer to be transferred to a different broker).
-
-When receiving the `CloseProducer`, the client is expected to go through the
-service discovery lookup again and recreate the producer again. The TCP
-connection is not affected.
-
-### Consumer
-
-A consumer is used to attach to a subscription and consume messages from it.
-After every reconnection, a client needs to subscribe to the topic. If a
-subscription is not already there, a new one will be created.
-
-![Consumer](/assets/binary-protocol-consumer.png)
-
-#### Flow control
-
-After the consumer is ready, the client needs to *give permission* to the
-broker to push messages. This is done with the `Flow` command.
-
-A `Flow` command gives additional *permits* to send messages to the consumer.
-A typical consumer implementation will use a queue to accumulate these messages
-before the application is ready to consume them.
-
-After the application has dequeued half of the messages in the queue, the consumer 
-sends permits to the broker to ask for more messages (equals to half of the messages in the queue).
-
-For example, if the queue size is 1000 and the consumer consumes 500 messages in the queue.
-Then the consumer sends permits to the broker to ask for 500 messages.
-
-##### Command Subscribe
-
-```protobuf
-
-message CommandSubscribe {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "subscription" : "my-subscription-name",
-  "subType" : "Exclusive",
-  "consumer_id" : 1,
-  "request_id" : 1
-}
-
-```
-
-Fields:
- * `topic`: Complete topic name to where you want to create the consumer on.
- * `subscription`: Subscription name.
- * `subType`: Subscription type: Exclusive, Shared, Failover, Key_Shared.
- * `consumer_id`: Client generated consumer identifier. Needs to be unique
-    within the same connection.
- * `request_id`: Identifier for this request. Used to match the response with
-    the originating request. Needs to be unique within the same connection.
- * `consumer_name`: *(optional)* Clients can specify a consumer name. This
-    name can be used to track a particular consumer in the stats. Also, in
-    Failover subscription type, the name is used to decide which consumer is
-    elected as *master* (the one receiving messages): consumers are sorted by
-    their consumer name and the first one is elected master.
-
-##### Command Flow
-
-```protobuf
-
-message CommandFlow {
-  "consumer_id" : 1,
-  "messagePermits" : 1000
-}
-
-```
-
-Fields:
-* `consumer_id`: The ID of an already established consumer.
-* `messagePermits`: The number of additional permits to grant to the broker for
-  pushing more messages.
-
-##### Command Message
-
-Command `Message` is used by the broker to push messages to an existing consumer,
-within the limits of the given permits.
-
-
-This command is used in a frame that includes the message payload as well, for
-which the complete format is specified in the [payload commands](#payload-commands)
-section.
-
-```protobuf
-
-message CommandMessage {
-  "consumer_id" : 1,
-  "message_id" : {
-    "ledgerId" : 123,
-    "entryId" : 456
-  }
-}
-
-```
-
-##### Command Ack
-
-An `Ack` is used to signal to the broker that a given message has been
-successfully processed by the application and can be discarded by the broker.
-
-In addition, the broker will also maintain the consumer position based on the
-acknowledged messages.
-
-```protobuf
-
-message CommandAck {
-  "consumer_id" : 1,
-  "ack_type" : "Individual",
-  "message_id" : {
-    "ledgerId" : 123,
-    "entryId" : 456
-  }
-}
-
-```
-
-Fields:
- * `consumer_id`: The ID of an already established consumer.
- * `ack_type`: Acknowledgment type: `Individual` or `Cumulative`.
- * `message_id`: The ID of the message to acknowledge.
- * `validation_error`: *(optional)* Indicates that the consumer has discarded
-   the messages due to: `UncompressedSizeCorruption`,
-   `DecompressionError`, `ChecksumMismatch`, `BatchDeSerializeError`.
- * `properties`: *(optional)* Reserved configuration items.
- * `txnid_most_bits`: *(optional)* Same as Transaction Coordinator ID, `txnid_most_bits` and `txnid_least_bits`
-   uniquely identify a transaction.
- * `txnid_least_bits`: *(optional)* The ID of the transaction opened in a transaction coordinator,
-   `txnid_most_bits` and `txnid_least_bits`uniquely identify a transaction.
- * `request_id`: *(optional)* The ID for handling response and timeout.
-
-##### Command AckResponse
-
-An `AckResponse` is the broker’s response to acknowledge a request sent by the client. It contains the `consumer_id` sent in the request.
-If a transaction is used, it contains both the Transaction ID and the Request ID that are sent in the request.
-The client finishes the specific request according to the Request ID.
-If the `error` field is set, it indicates that the request has failed.
-
-An example of `AckResponse` with redirection:
-
-```protobuf
-
-message CommandAckResponse {
-    "consumer_id" : 1,
-    "txnid_least_bits" = 0,
-    "txnid_most_bits" = 1,
-    "request_id" = 5
-}
-
-```
-
-##### Command CloseConsumer
-
-:::note
-
-This command can be sent by either producer or broker.
-
-:::
-
-This command behaves the same as [`CloseProducer`](#command-closeproducer)
-
-##### Command RedeliverUnacknowledgedMessages
-
-A consumer can ask the broker to redeliver some or all of the pending messages
-that were pushed to that particular consumer and not yet acknowledged.
-
-The protobuf object accepts a list of message IDs that the consumer wants to
-be redelivered. If the list is empty, the broker will redeliver all the
-pending messages.
-
-On redelivery, messages can be sent to the same consumer or, in the case of a
-shared subscription, spread across all available consumers.
-
-
-##### Command ReachedEndOfTopic
-
-This is sent by a broker to a particular consumer, whenever the topic
-has been "terminated" and all the messages on the subscription were
-acknowledged.
-
-The client should use this command to notify the application that no more
-messages are coming from the consumer.
-
-##### Command ConsumerStats
-
-This command is sent by the client to retrieve Subscriber and Consumer level 
-stats from the broker.
-
-Fields:
- * `request_id`: The ID of the request, used to correlate the request 
-      and the response.
- * `consumer_id`: The ID of an already established consumer.
-
-##### Command ConsumerStatsResponse
-
-This is the broker's response to ConsumerStats request by the client. 
-It contains the Subscriber and Consumer level stats of the `consumer_id` sent in the request.
-If the `error_code` or the `error_message` field is set it indicates that the request has failed.
-
-##### Command Unsubscribe
-
-This command is sent by the client to unsubscribe the `consumer_id` from the associated topic.
-
-Fields:
- * `request_id`: The ID of the request.
- * `consumer_id`: The ID of an already established consumer that needs to unsubscribe.
-
-
-## Service discovery
-
-### Topic lookup
-
-Topic lookup needs to be performed each time a client needs to create or
-reconnect a producer or a consumer. Lookup is used to discover which particular
-broker is serving the topic we are about to use.
-
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic) docs.
-
-Since Pulsar-1.16 it is also possible to perform the lookup within the binary protocol.
-
-For the sake of example, let's assume we have a service discovery component
-running at `pulsar://broker.example.com:6650`
-
-Individual brokers will be running at `pulsar://broker-1.example.com:6650`,
-`pulsar://broker-2.example.com:6650`, ...
-
-A client can use a connection to the discovery service host to issue a
-`LookupTopic` command. The response can either be a broker hostname to
-connect to, or a broker hostname to which retry the lookup.
-
-The `LookupTopic` command has to be used in a connection that has already
-gone through the `Connect` / `Connected` initial handshake.
-
-![Topic lookup](/assets/binary-protocol-topic-lookup.png)
-
-```protobuf
-
-message CommandLookupTopic {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "request_id" : 1,
-  "authoritative" : false
-}
-
-```
-
-Fields:
- * `topic`: The topic name to lookup.
- * `request_id`: The ID of the request that will be passed with its response.
- * `authoritative`: Initial lookup request should use false. When following a
-   redirect response, client should pass the same value contained in the
-   response.
-
-##### LookupTopicResponse
-
-An example of response with successful lookup:
-
-```protobuf
-
-message CommandLookupTopicResponse {
-  "request_id" : 1,
-  "response" : "Connect",
-  "brokerServiceUrl" : "pulsar://broker-1.example.com:6650",
-  "brokerServiceUrlTls" : "pulsar+ssl://broker-1.example.com:6651",
-  "authoritative" : true
-}
-
-```
-
-This is an example of lookup response with redirection:
-
-```protobuf
-
-message CommandLookupTopicResponse {
-  "request_id" : 1,
-  "response" : "Redirect",
-  "brokerServiceUrl" : "pulsar://broker-2.example.com:6650",
-  "brokerServiceUrlTls" : "pulsar+ssl://broker-2.example.com:6651",
-  "authoritative" : true
-}
-
-```
-
-In this second case, we need to reissue the `LookupTopic` command request
-to `broker-2.example.com` and this broker will be able to give a definitive
-answer to the lookup request.
-
-### Partitioned topics discovery
-
-Partitioned topics metadata discovery is used to find out if a topic is a
-"partitioned topic" and how many partitions were set up.
-
-If the topic is marked as "partitioned", the client is expected to create
-multiple producers or consumers, one for each partition, using the `partition-X`
-suffix.
-
-This information only needs to be retrieved the first time a producer or
-consumer is created. There is no need to do this after reconnections.
-
-The discovery of partitioned topics metadata works very similarly to the topic
-lookup. The client send a request to the service discovery address and the
-response will contain actual metadata.
-
-##### Command PartitionedTopicMetadata
-
-```protobuf
-
-message CommandPartitionedTopicMetadata {
-  "topic" : "persistent://my-property/my-cluster/my-namespace/my-topic",
-  "request_id" : 1
-}
-
-```
-
-Fields:
- * `topic`: The topic for which to check the partitions metadata.
- * `request_id`: The ID of the request that will be passed with its response.
-
-
-##### Command PartitionedTopicMetadataResponse
-
-An example of response with metadata:
-
-```protobuf
-
-message CommandPartitionedTopicMetadataResponse {
-  "request_id" : 1,
-  "response" : "Success",
-  "partitions" : 32
-}
-
-```
-
-## Protobuf interface
-
-All Pulsar's Protobuf definitions can be found {@inject: github:here:/pulsar-common/src/main/proto/PulsarApi.proto}.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-api.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-api.md
deleted file mode 100644
index 3c4ffa027368b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-api.md
+++ /dev/null
@@ -1,769 +0,0 @@
----
-id: functions-api
-title: The Pulsar Functions API
-sidebar_label: "API"
-original_id: functions-api
----
-
-[Pulsar Functions](functions-overview.md) provides an easy-to-use API that developers can use to create and manage processing logic for the Apache Pulsar messaging system. With Pulsar Functions, you can write functions of any level of complexity in [Java](#functions-for-java) or [Python](#functions-for-python) and run them in conjunction with a Pulsar cluster without needing to run a separate stream processing engine.
-
-> For a more in-depth overview of the Pulsar Functions feature, see the [Pulsar Functions overview](functions-overview.md).
-
-## Core programming model
-
-Pulsar Functions provide a wide range of functionality but are based on a very simple programming model. You can think of Pulsar Functions as lightweight processes that
-
-* consume messages from one or more Pulsar topics and then
-* apply some user-defined processing logic to each incoming message. That processing logic could be just about anything you want, including
-  * producing the resulting, processed message on another Pulsar topic, or
-  * doing something else with the message, such as writing results to an external database.
-
-You could use Pulsar Functions, for example, to set up the following processing chain:
-
-* A [Python](#functions-for-python) function listens on the `raw-sentences` topic and "[sanitizes](#example-function)" incoming strings (removing extraneous whitespace and converting all characters to lower case) and then publishes the results to a `sanitized-sentences` topic
-* A [Java](#functions-for-java) function listens on the `sanitized-sentences` topic, counts the number of times each word appears within a specified time window, and publishes the results to a `results` topic
-* Finally, a Python function listens on the `results` topic and writes the results to a MySQL table
-
-### Example function
-
-Here's an example "input sanitizer" function written in Python and stored in a `sanitizer.py` file:
-
-```python
-
-def clean_string(s):
-    return s.strip().lower()
-
-def process(input):
-    return clean_string(input)
-
-```
-
-Some things to note about this Pulsar Function:
-
-* There is no client, producer, or consumer object involved. All message "plumbing" is already taken care of for you, enabling you to worry only about processing logic.
-* No topics, subscription types, tenants, or namespaces are specified in the function logic itself. Instead, topics are specified upon [deployment](#example-deployment). This means that you can use and re-use Pulsar Functions across topics, tenants, and namespaces without needing to hard-code those attributes.
-
-### Example deployment
-
-Deploying Pulsar Functions is handled by the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool, in particular the [`functions`](reference-pulsar-admin.md#functions) command. Here's an example command that would run our [sanitizer](#example-function) function from above in [local run](functions-deploying.md#local-run-mode) mode:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --py sanitizer.py \          # The Python file with the function's code
-  --className sanitizer \      # The class or function holding the processing logic
-  --tenant public \            # The function's tenant (derived from the topic name by default)
-  --namespace default \        # The function's namespace (derived from the topic name by default)
-  --name sanitizer-function \  # The name of the function (the class name by default)
-  --inputs dirty-strings-in \  # The input topic(s) for the function
-  --output clean-strings-out \ # The output topic for the function
-  --logTopic sanitizer-logs    # The topic to which all functions logs are published
-
-```
-
-For instructions on running functions in your Pulsar cluster, see the [Deploying Pulsar Functions](functions-deploying.md) guide.
-
-### Available APIs
-
-In both Java and Python, you have two options for writing Pulsar Functions:
-
-Interface | Description | Use cases
-:---------|:------------|:---------
-Language-native interface | No Pulsar-specific libraries or special dependencies required (only core libraries from Java/Python) | Functions that don't require access to the function's [context](#context)
-Pulsar Function SDK for Java/Python | Pulsar-specific libraries that provide a range of functionality not provided by "native" interfaces | Functions that require access to the function's [context](#context)
-
-In Python, for example, this language-native function, which adds an exclamation point to all incoming strings and publishes the resulting string to a topic, would have no external dependencies:
-
-```python
-
-def process(input):
-    return "{}!".format(input)
-
-```
-
-This function, however, would use the Pulsar Functions [SDK for Python](#python-sdk-functions):
-
-```python
-
-from pulsar import Function
-
-class DisplayFunctionName(Function):
-    def process(self, input, context):
-        function_name = context.function_name()
-        return "The function processing this message has the name {0}".format(function_name)
-
-```
-
-### Serialization and deserialization (SerDe)
-
-SerDe stands for **Ser**ialization and **De**serialization. All Pulsar Functions use SerDe for message handling. How SerDe works by default depends on the language you're using for a particular function:
-
-* In [Python](#python-serde), the default SerDe is identity, meaning that the type is serialized as whatever type the producer function returns
-* In [Java](#java-serde), a number of commonly used types (`String`s, `Integer`s, etc.) are supported by default
-
-In both languages, however, you can write your own custom SerDe logic for more complex, application-specific types. See the docs for [Java](#java-serde) and [Python](#python-serde) for language-specific instructions.
-
-### Context
-
-Both the [Java](#java-sdk-functions) and [Python](#python-sdk-functions) SDKs provide access to a **context object** that can be used by the function. This context object provides a wide variety of information and functionality to the function:
-
-* The name and ID of the Pulsar Function
-* The message ID of each message. Each Pulsar message is automatically assigned an ID.
-* The name of the topic on which the message was sent
-* The names of all input topics as well as the output topic associated with the function
-* The name of the class used for [SerDe](#serialization-and-deserialization-serde)
-* The [tenant](reference-terminology.md#tenant) and namespace associated with the function
-* The ID of the Pulsar Functions instance running the function
-* The version of the function
-* The [logger object](functions-overview.md#logging) used by the function, which can be used to create function log messages
-* Access to arbitrary [user config](#user-config) values supplied via the CLI
-* An interface for recording [metrics](functions-metrics.md)
-* An interface for storing and retrieving state in [state storage](functions-overview.md#state-storage)
-
-### User config
-
-When you run or update Pulsar Functions created using the [SDK](#available-apis), you can pass arbitrary key/values to them via the command line with the `--userConfig` flag. Key/values must be specified as JSON. Here's an example of a function creation command that passes a user config key/value to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name word-filter \
-  # Other function configs
-  --userConfig '{"forbidden-word":"rosebud"}'
-
-```
-
-If the function were a Python function, that config value could be accessed like this:
-
-```python
-
-from pulsar import Function
-
-class WordFilter(Function):
-    def process(self, context, input):
-        forbidden_word = context.user_config()["forbidden-word"]
-
-        # Don't publish the message if it contains the user-supplied
-        # forbidden word
-        if forbidden_word in input:
-            pass
-        # Otherwise publish the message
-        else:
-            return input
-
-```
-
-## Functions for Java
-
-Writing Pulsar Functions in Java involves implementing one of two interfaces:
-
-* The [`java.util.Function`](https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html) interface
-* The {@inject: javadoc:Function:/pulsar-functions/org/apache/pulsar/functions/api/Function} interface. This interface works much like the `java.util.Function` interface, but with the important difference that it provides a {@inject: javadoc:Context:/pulsar-functions/org/apache/pulsar/functions/api/Context} object that you can use in a [variety of ways](#context)
-
-### Getting started
-
-In order to write Pulsar Functions in Java, you'll need to install the proper [dependencies](#dependencies) and package your function [as a JAR](#packaging).
-
-#### Dependencies
-
-How you get started writing Pulsar Functions in Java depends on which API you're using:
-
-* If you're writing a [Java native function](#java-native-functions), you won't need any external dependencies.
-* If you're writing a [Java SDK function](#java-sdk-functions), you'll need to import the `pulsar-functions-api` library.
-
-  Here's an example for a Maven `pom.xml` configuration file:
-
-  ```xml
-  
-  
-    org.apache.pulsar
-    pulsar-functions-api
-    2.0.0-incubating-SNAPSHOT
-  
-  
-  ```
-
-  Here's an example for a Gradle `build.gradle` configuration file:
-
-  ```groovy
-  
-  dependencies {
-  compile group: 'org.apache.pulsar', name: 'pulsar-functions-api', version: '2.0.0-incubating-SNAPSHOT'
-  }
-  
-  ```
-
-#### Packaging
-
-Whether you're writing Java Pulsar Functions using the [native](#java-native-functions) Java `java.util.Function` interface or using the [Java SDK](#java-sdk-functions), you'll need to package your function(s) as a "fat" JAR.
-
-> #### Starter repo
-> If you'd like to get up and running quickly, you can use [this repo](https://github.com/streamlio/pulsar-functions-java-starter), which contains the necessary Maven configuration to build a fat JAR as well as some example functions.
-
-### Java native functions
-
-If your function doesn't require access to its [context](#context), you can create a Pulsar Function by implementing the [`java.util.Function`](https://docs.oracle.com/javase/8/docs/api/java/util/function/Function.html) interface, which has this very simple, single-method signature:
-
-```java
-
-public interface Function {
-    O apply(I input);
-}
-
-```
-
-Here's an example function that takes a string as its input, adds an exclamation point to the end of the string, and then publishes the resulting string:
-
-```java
-
-import java.util.Function;
-
-public class ExclamationFunction implements Function {
-    @Override
-    public String process(String input) {
-        return String.format("%s!", input);
-    }
-}
-
-```
-
-In general, you should use native functions when you don't need access to the function's [context](#context). If you *do* need access to the function's context, then we recommend using the [Pulsar Functions Java SDK](#java-sdk-functions).
-
-#### Java native examples
-
-There is one example Java native function in this {@inject: github:folder:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples}:
-
-* {@inject: github:JavaNativeExclamationFunction:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java}
-
-### Java SDK functions
-
-To get started developing Pulsar Functions using the Java SDK, you'll need to add a dependency on the `pulsar-functions-api` artifact to your project. Instructions can be found [above](#dependencies).
-
-> An easy way to get up and running with Pulsar Functions in Java is to clone the [`pulsar-functions-java-starter`](https://github.com/streamlio/pulsar-functions-java-starter) repo and follow the instructions there.
-
-
-#### Java SDK examples
-
-There are several example Java SDK functions in this {@inject: github:folder:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples}:
-
-Function name | Description
-:-------------|:-----------
-[`ContextFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ContextFunction.java) | Illustrates [context](#context)-specific functionality like [logging](#java-logging) and [metrics](#java-metrics)
-[`WordCountFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java) | Illustrates usage of Pulsar Function [state-storage](functions-overview.md#state-storage)
-[`ExclamationFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java) | A basic string manipulation function for the Java SDK [`LoggingFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/LoggingFunction.java) | A function that shows how [logging](#java-logging) works for Java [`PublishFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java) | Publishes results to a topic specified in the function's [user config](#java-user-config) (rather than on the function's output topic)
-[`UserConfigFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java) | A function that consumes [user-supplied configuration](#java-user-config) values [`UserMetricFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java) | A function that records metrics [`VoidFunction`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserMetricFunction.java)  | A simple [void function](#void-functions)
-
-### Java context object
-
-The {@inject: javadoc:Context:/client/org/apache/pulsar/functions/api/Context} interface provides a number of methods that you can use to access the function's [context](#context). The various method signatures for the `Context` interface are listed below:
-
-```java
-
-public interface Context {
-    byte[] getMessageId();
-    String getTopicName();
-    Collection getSourceTopics();
-    String getSinkTopic();
-    String getOutputSerdeClassName();
-    String getTenant();
-    String getNamespace();
-    String getFunctionName();
-    String getFunctionId();
-    String getInstanceId();
-    String getFunctionVersion();
-    Logger getLogger();
-    Map getUserConfigMap();
-    Optional getUserConfigValue(String key);
-    String getUserConfigValueOrDefault(String key, String default);
-    void recordMetric(String metricName, double value);
-     CompletableFuture publish(String topicName, O object, String serDeClassName);
-     CompletableFuture publish(String topicName, O object);
-    CompletableFuture ack(byte[] messageId, String topic);
-}
-
-```
-
-Here's an example function that uses several methods available via the `Context` object:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-import java.util.stream.Collectors;
-
-public class ContextFunction implements Function {
-    public Void process(String input, Context context) {
-        Logger LOG = context.getLogger();
-        String inputTopics = context.getInputTopics().stream().collect(Collectors.joining(", "));
-        String functionName = context.getFunctionName();
-
-        String logMessage = String.format("A message with a value of \"%s\" has arrived on one of the following topics: %s\n",
-                input,
-                inputTopics);
-
-        LOG.info(logMessage);
-
-        String metricName = String.format("function-%s-messages-received", functionName);
-        context.recordMetric(metricName, 1);
-
-        return null;
-    }
-}
-
-```
-
-### Void functions
-
-Pulsar Functions can publish results to an output topic, but this isn't required. You can also have functions that simply produce a log, write results to a database, etc. Here's a function that writes a simple log every time a message is received:
-
-```java
-
-import org.slf4j.Logger;
-
-public class LogFunction implements PulsarFunction {
-    public String apply(String input, Context context) {
-        Logger LOG = context.getLogger();
-        LOG.info("The following message was received: {}", input);
-        return null;
-    }
-}
-
-```
-
-> When using Java functions in which the output type is `Void`, the function must *always* return `null`.
-
-### Java SerDe
-
-Pulsar Functions use [SerDe](#serialization-and-deserialization-serde) when publishing data to and consuming data from Pulsar topics. When you're writing Pulsar Functions in Java, the following basic Java types are built in and supported by default:
-
-* `String`
-* `Double`
-* `Integer`
-* `Float`
-* `Long`
-* `Short`
-* `Byte`
-
-Built-in vs. custom. For custom, you need to implement this interface:
-
-```java
-
-public interface SerDe {
-    T deserialize(byte[] input);
-    byte[] serialize(T input);
-}
-
-```
-
-#### Java SerDe example
-
-Imagine that you're writing Pulsar Functions in Java that are processing tweet objects. Here's a simple example `Tweet` class:
-
-```java
-
-public class Tweet {
-    private String username;
-    private String tweetContent;
-
-    public Tweet(String username, String tweetContent) {
-        this.username = username;
-        this.tweetContent = tweetContent;
-    }
-
-    // Standard setters and getters
-}
-
-```
-
-In order to be able to pass `Tweet` objects directly between Pulsar Functions, you'll need to provide a custom SerDe class. In the example below, `Tweet` objects are basically strings in which the username and tweet content are separated by a `|`.
-
-```java
-
-package com.example.serde;
-
-import org.apache.pulsar.functions.api.SerDe;
-
-import java.util.regex.Pattern;
-
-public class TweetSerde implements SerDe {
-    public Tweet deserialize(byte[] input) {
-        String s = new String(input);
-        String[] fields = s.split(Pattern.quote("|"));
-        return new Tweet(fields[0], fields[1]);
-    }
-
-    public byte[] serialize(Tweet input) {
-        return "%s|%s".format(input.getUsername(), input.getTweetContent()).getBytes();
-    }
-}
-
-```
-
-To apply this custom SerDe to a particular Pulsar Function, you would need to:
-
-* Package the `Tweet` and `TweetSerde` classes into a JAR
-* Specify a path to the JAR and SerDe class name when deploying the function
-
-Here's an example [`create`](reference-pulsar-admin.md#create-1) operation:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar /path/to/your.jar \
-  --outputSerdeClassName com.example.serde.TweetSerde \
-  # Other function attributes
-
-```
-
-> #### Custom SerDe classes must be packaged with your function JARs
-> Pulsar does not store your custom SerDe classes separately from your Pulsar Functions. That means that you'll need to always include your SerDe classes in your function JARs. If not, Pulsar will return an error.
-
-### Java logging
-
-Pulsar Functions that use the [Java SDK](#java-sdk-functions) have access to an [SLF4j](https://www.slf4j.org/) [`Logger`](https://www.slf4j.org/api/org/apache/log4j/Logger.html) object that can be used to produce logs at the chosen log level. Here's a simple example function that logs either a `WARNING`- or `INFO`-level log based on whether the incoming string contains the word `danger`:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-public class LoggingFunction implements Function {
-    @Override
-    public void apply(String input, Context context) {
-        Logger LOG = context.getLogger();
-        String messageId = new String(context.getMessageId());
-
-        if (input.contains("danger")) {
-            LOG.warn("A warning was received in message {}", messageId);
-        } else {
-            LOG.info("Message {} received\nContent: {}", messageId, input);
-        }
-
-        return null;
-    }
-}
-
-```
-
-If you want your function to produce logs, you need to specify a log topic when creating or running the function. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar my-functions.jar \
-  --className my.package.LoggingFunction \
-  --logTopic persistent://public/default/logging-function-logs \
-  # Other function configs
-
-```
-
-Now, all logs produced by the `LoggingFunction` above can be accessed via the `persistent://public/default/logging-function-logs` topic.
-
-### Java user config
-
-The Java SDK's [`Context`](#context) object enables you to access key/value pairs provided to the Pulsar Function via the command line (as JSON). Here's an example function creation command that passes a key/value pair:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  # Other function configs
-  --userConfig '{"word-of-the-day":"verdure"}'
-
-```
-
-To access that value in a Java function:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-import java.util.Optional;
-
-public class UserConfigFunction implements Function {
-    @Override
-    public void apply(String input, Context context) {
-        Logger LOG = context.getLogger();
-        Optional wotd = context.getUserConfigValue("word-of-the-day");
-        if (wotd.isPresent()) {
-            LOG.info("The word of the day is {}", wotd);
-        } else {
-            LOG.warn("No word of the day provided");
-        }
-        return null;
-    }
-}
-
-```
-
-The `UserConfigFunction` function will log the string `"The word of the day is verdure"` every time the function is invoked (i.e. every time a message arrives). The `word-of-the-day` user config will be changed only when the function is updated with a new config value via the command line.
-
-You can also access the entire user config map or set a default value in case no value is present:
-
-```java
-
-// Get the whole config map
-Map allConfigs = context.getUserConfigMap();
-
-// Get value or resort to default
-String wotd = context.getUserConfigValueOrDefault("word-of-the-day", "perspicacious");
-
-```
-
-> For all key/value pairs passed to Java Pulsar Functions, both the key *and* the value are `String`s. If you'd like the value to be of a different type, you will need to deserialize from the `String` type.
-
-### Java metrics
-
-You can record metrics using the [`Context`](#context) object on a per-key basis. You can, for example, set a metric for the key `process-count` and a different metric for the key `elevens-count` every time the function processes a message. Here's an example:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-
-public class MetricRecorderFunction implements Function {
-    @Override
-    public void apply(Integer input, Context context) {
-        // Records the metric 1 every time a message arrives
-        context.recordMetric("hit-count", 1);
-
-        // Records the metric only if the arriving number equals 11
-        if (input == 11) {
-            context.recordMetric("elevens-count", 1);
-        }
-
-        return null;
-    }
-}
-
-```
-
-> For instructions on reading and using metrics, see the [Monitoring](deploy-monitoring.md) guide.
-
-
-## Functions for Python
-
-Writing Pulsar Functions in Python entails implementing one of two things:
-
-* A `process` function that takes an input (message data from the function's input topic(s)), applies some kind of logic to it, and either returns an object (to be published to the function's output topic) or `pass`es and thus doesn't produce a message
-* A `Function` class that has a `process` method that provides a message input to process and a [context](#context) object
-
-### Getting started
-
-Regardless of which [deployment mode](functions-deploying.md) you're using, you'll need to install the following Python libraries on any machine that's running Pulsar Functions written in Python:
-
-That could be your local machine for [local run mode](functions-deploying.md#local-run-mode) or a machine running a Pulsar [broker](reference-terminology.md#broker) for [cluster mode](functions-deploying.md#cluster-mode). To install those libraries using pip:
-
-```bash
-
-$ pip install pulsar-client
-
-```
-
-### Packaging
-
-At the moment, the code for Pulsar Functions written in Python must be contained within a single Python file. In the future, Pulsar Functions may support other packaging formats, such as [**P**ython **EX**ecutables](https://github.com/pantsbuild/pex) (PEXes).
-
-### Python native functions
-
-If your function doesn't require access to its [context](#context), you can create a Pulsar Function by implementing a `process` function, which provides a single input object that you can process however you wish. Here's an example function that takes a string as its input, adds an exclamation point at the end of the string, and then publishes the resulting string:
-
-```python
-
-def process(input):
-    return "{0}!".format(input)
-
-```
-
-In general, you should use native functions when you don't need access to the function's [context](#context). If you *do* need access to the function's context, then we recommend using the [Pulsar Functions Python SDK](#python-sdk-functions).
-
-#### Python native examples
-
-There is one example Python native function in this {@inject: github:folder:/pulsar-functions/python-examples}:
-
-* {@inject: github:`native_exclamation_function.py`:/pulsar-functions/python-examples/native_exclamation_function.py}
-
-### Python SDK functions
-
-To get started developing Pulsar Functions using the Python SDK, you'll need to install the [`pulsar-client`](/api/python) library using the instructions [above](#getting-started).
-
-#### Python SDK examples
-
-There are several example Python functions in this {@inject: github:folder:/pulsar-functions/python-examples}:
-
-Function file | Description
-:-------------|:-----------
-[`exclamation_function.py`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/python-examples/exclamation_function.py) | Adds an exclamation point at the end of each incoming string [`logging_function.py`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/python-examples/logging_function.py) | Logs each incoming message [`thumbnailer.py`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-functions/python-examples/thumbnailer.py) | Takes image data as input and outputs a 128x128 thumbnail of each image
-
-#### Python context object
-
-The [`Context`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/context.py) class provides a number of methods that you can use to access the function's [context](#context). The various methods for the `Context` class are listed below:
-
-Method | What it provides
-:------|:----------------
-`get_message_id` | The message ID of the message being processed
-`get_topic_name` | The input topic of the message being processed
-`get_function_name` | The name of the current Pulsar Function
-`get_function_id` | The ID of the current Pulsar Function
-`get_instance_id` | The ID of the current Pulsar Functions instance
-`get_function_version` | The version of the current Pulsar Function
-`get_logger` | A logger object that can be used for [logging](#python-logging)
-`get_user_config_value` | Returns the value of a [user-defined config](#python-user-config) (or `None` if the config doesn't exist)
-`get_user_config_map` | Returns the entire user-defined config as a dict
-`record_metric` | Records a per-key [metric](#python-metrics)
-`publish` | Publishes a message to the specified Pulsar topic
-`get_output_serde_class_name` | The name of the output [SerDe](#python-serde) class
-`ack` | [Acks](reference-terminology.md#acknowledgment-ack) the message being processed to Pulsar
-
-### Python SerDe
-
-Pulsar Functions use [SerDe](#serialization-and-deserialization-serde) when publishing data to and consuming data from Pulsar topics (this is true of both [native](#python-native-functions) functions and [SDK](#python-sdk-functions) functions). You can specify the SerDe when [creating](functions-deploying.md#cluster-mode) or [running](functions-deploying.md#local-run-mode) functions. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --tenant public \
-  --namespace default \
-  --name my_function \
-  --py my_function.py \
-  --className my_function.MyFunction \
-  --customSerdeInputs '{"input-topic-1":"Serde1","input-topic-2":"Serde2"}' \
-  --outputSerdeClassName Serde3 \
-  --output output-topic-1
-
-```
-
-In this case, there are two input topics, `input-topic-1` and `input-topic-2`, each of which is mapped to a different SerDe class (the map must be specified as a JSON string). The output topic, `output-topic-1`, uses the `Serde3` class for SerDe. At the moment, all Pulsar Function logic, include processing function and SerDe classes, must be contained within a single Python file.
-
-When using Pulsar Functions for Python, you essentially have three SerDe options:
-
-1. You can use the [`IdentitySerde`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L70), which leaves the data unchanged. The `IdentitySerDe` is the **default**. Creating or running a function without explicitly specifying SerDe will mean that this option is used.
-2. You can use the [`PickeSerDe`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L62), which uses Python's [`pickle`](https://docs.python.org/3/library/pickle.html) for SerDe.
-3. You can create a custom SerDe class by implementing the baseline [`SerDe`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L50) class, which has just two methods: [`serialize`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L53) for converting the object into bytes, and [`deserialize`](https://github.com/apache/incubator-pulsar/blob/master/pulsar-client-cpp/python/pulsar/functions/serde.py#L58) for converting bytes into an object of the required application-specific type.
-
-The table below shows when you should use each SerDe:
-
-SerDe option | When to use
-:------------|:-----------
-`IdentitySerde` | When you're working with simple types like strings, Booleans, integers, and the like
-`PickleSerDe` | When you're working with complex, application-specific types and are comfortable with `pickle`'s "best effort" approach
-Custom SerDe | When you require explicit control over SerDe, potentially for performance or data compatibility purposes
-
-#### Python SerDe example
-
-Imagine that you're writing Pulsar Functions in Python that are processing tweet objects. Here's a simple `Tweet` class:
-
-```python
-
-class Tweet(object):
-    def __init__(self, username, tweet_content):
-        self.username = username
-        self.tweet_content = tweet_content
-
-```
-
-In order to use this class in Pulsar Functions, you'd have two options:
-
-1. You could specify `PickleSerDe`, which would apply the [`pickle`](https://docs.python.org/3/library/pickle.html) library's SerDe
-1. You could create your own SerDe class. Here's a simple example:
-
-  ```python
-  
-  from pulsar import SerDe
-
-  class TweetSerDe(SerDe):
-     def __init__(self, tweet):
-         self.tweet = tweet
-
-     def serialize(self, input):
-         return bytes("{0}|{1}".format(self.tweet.username, self.tweet.tweet_content))
-
-     def deserialize(self, input_bytes):
-         tweet_components = str(input_bytes).split('|')
-         return Tweet(tweet_components[0], tweet_componentsp[1])
-  
-  ```
-
-### Python logging
-
-Pulsar Functions that use the [Python SDK](#python-sdk-functions) have access to a logging object that can be used to produce logs at the chosen log level. Here's a simple example function that logs either a `WARNING`- or `INFO`-level log based on whether the incoming string contains the word `danger`:
-
-```python
-
-from pulsar import Function
-
-class LoggingFunction(Function):
-    def process(self, input, context):
-        logger = context.get_logger()
-        msg_id = context.get_message_id()
-        if 'danger' in input:
-            logger.warn("A warning was received in message {0}".format(context.get_message_id()))
-        else:
-            logger.info("Message {0} received\nContent: {1}".format(msg_id, input))
-
-```
-
-If you want your function to produce logs on a Pulsar topic, you need to specify a **log topic** when creating or running the function. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py logging_function.py \
-  --className logging_function.LoggingFunction \
-  --logTopic logging-function-logs \
-  # Other function configs
-
-```
-
-Now, all logs produced by the `LoggingFunction` above can be accessed via the `logging-function-logs` topic.
-
-### Python user config
-
-The Python SDK's [`Context`](#context) object enables you to access key/value pairs provided to the Pulsar Function via the command line (as JSON). Here's an example function creation command that passes a key/value pair:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  # Other function configs \
-  --userConfig '{"word-of-the-day":"verdure"}'
-
-```
-
-To access that value in a Python function:
-
-```python
-
-from pulsar import Function
-
-class UserConfigFunction(Function):
-    def process(self, input, context):
-        logger = context.get_logger()
-        wotd = context.get_user_config_value('word-of-the-day')
-        if wotd is None:
-            logger.warn('No word of the day provided')
-        else:
-            logger.info("The word of the day is {0}".format(wotd))
-
-```
-
-### Python metrics
-
-You can record metrics using the [`Context`](#context) object on a per-key basis. You can, for example, set a metric for the key `process-count` and a different metric for the key `elevens-count` every time the function processes a message. Here's an example:
-
-```python
-
-from pulsar import Function
-
-class MetricRecorderFunction(Function):
-    def process(self, input, context):
-        context.record_metric('hit-count', 1)
-
-        if input == 11:
-            context.record_metric('elevens-count', 1)
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-deploying.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-deploying.md
deleted file mode 100644
index dfc6dd6795dd2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-deploying.md
+++ /dev/null
@@ -1,261 +0,0 @@
----
-id: functions-deploying
-title: Deploying and managing Pulsar Functions
-sidebar_label: "Deploying functions"
-original_id: functions-deploying
----
-
-At the moment, there are two deployment modes available for Pulsar Functions:
-
-Mode | Description
-:----|:-----------
-Local run mode | The function runs in your local environment, for example on your laptop
-Cluster mode | The function runs *inside of* your Pulsar cluster, on the same machines as your Pulsar brokers
-
-> #### Contributing new deployment modes
-> The Pulsar Functions feature was designed, however, with extensibility in mind. Other deployment options will be available in the future. If you'd like to add a new deployment option, we recommend getting in touch with the Pulsar developer community at [dev@pulsar.incubator.apache.org](mailto:dev@pulsar.incubator.apache.org).
-
-## Requirements
-
-In order to deploy and manage Pulsar Functions, you need to have a Pulsar cluster running. There are several options for this:
-
-* You can run a [standalone cluster](getting-started-standalone.md) locally on your own machine
-* You can deploy a Pulsar cluster on [Kubernetes](deploy-kubernetes.md), [Amazon Web Services](deploy-aws.md), [bare metal](deploy-bare-metal.md), [DC/OS](https://dcos.io/), and more
-
-If you're running a non-[standalone](reference-terminology.md#standalone) cluster, you'll need to obtain the service URL for the cluster. How you obtain the service URL will depend on how you deployed your Pulsar cluster.
-
-If you're going to deploy and trigger python user-defined functions, you should install [the pulsar python client](http://pulsar.apache.org/docs/en/client-libraries-python/) first.
-
-## Command-line interface
-
-Pulsar Functions are deployed and managed using the [`pulsar-admin functions`](reference-pulsar-admin.md#functions) interface, which contains commands such as [`create`](reference-pulsar-admin.md#functions-create) for deploying functions in [cluster mode](#cluster-mode), [`trigger`](reference-pulsar-admin.md#trigger) for [triggering](#triggering-pulsar-functions) functions, [`list`](reference-pulsar-admin.md#list-2) for listing deployed functions, and several others.
-
-### Fully Qualified Function Name (FQFN)
-
-Each Pulsar Function has a **Fully Qualified Function Name** (FQFN) that consists of three elements: the function's tenant, namespace, and function name. FQFN's look like this:
-
-```http
-
-tenant/namespace/name
-
-```
-
-FQFNs enable you to, for example, create multiple functions with the same name provided that they're in different namespaces.
-
-### Default arguments
-
-When managing Pulsar Functions, you'll need to specify a variety of information about those functions, including tenant, namespace, input and output topics, etc. There are some parameters, however, that have default values that will be supplied if omitted. The table below lists the defaults:
-
-Parameter | Default
-:---------|:-------
-Function name | Whichever value is specified for the class name (minus org, library, etc.). The flag `--className org.example.MyFunction`, for example, would give the function a name of `MyFunction`.
-Tenant | Derived from the input topics' names. If the input topics are under the `marketing` tenant---i.e. the topic names have the form `persistent://marketing/{namespace}/{topicName}`---then the tenant will be `marketing`.
-Namespace | Derived from the input topics' names. If the input topics are under the `asia` namespace under the `marketing` tenant---i.e. the topic names have the form `persistent://marketing/asia/{topicName}`, then the namespace will be `asia`.
-Output topic | `{input topic}-{function name}-output`. A function with an input topic name of `incoming` and a function name of `exclamation`, for example, would have an output topic of `incoming-exclamation-output`.
-Subscription type | For at-least-once and at-most-once [processing guarantees](functions-guarantees.md), the [`SHARED`](concepts-messaging.md#shared) is applied by default; for effectively-once guarantees, [`FAILOVER`](concepts-messaging.md#failover) is applied
-Processing guarantees | [`ATLEAST_ONCE`](functions-guarantees.md)
-Pulsar service URL | `pulsar://localhost:6650`
-
-#### Example use of defaults
-
-Take this `create` command:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar my-pulsar-functions.jar \
-  --className org.example.MyFunction \
-  --inputs my-function-input-topic1,my-function-input-topic2
-
-```
-
-The created function would have default values supplied for the function name (`MyFunction`), tenant (`public`), namespace (`default`), subscription type (`SHARED`), processing guarantees (`ATLEAST_ONCE`), and Pulsar service URL (`pulsar://localhost:6650`).
-
-## Local run mode
-
-If you run a Pulsar Function in **local run** mode, it will run on the machine from which the command is run (this could be your laptop, an [AWS EC2](https://aws.amazon.com/ec2/) instance, etc.). Here's an example [`localrun`](reference-pulsar-admin.md#localrun) command:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-By default, the function will connect to a Pulsar cluster running on the same machine, via a local [broker](reference-terminology.md#broker) service URL of `pulsar://localhost:6650`. If you'd like to use local run mode to run a function but connect it to a non-local Pulsar cluster, you can specify a different broker URL using the `--brokerServiceUrl` flag. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --brokerServiceUrl pulsar://my-cluster-host:6650 \
-  # Other function parameters
-
-```
-
-## Cluster mode
-
-When you run a Pulsar Function in **cluster mode**, the function code will be uploaded to a Pulsar broker and run *alongside the broker* rather than in your [local environment](#local-run-mode). You can run a function in cluster mode using the [`create`](reference-pulsar-admin.md#create-1) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-### Updating cluster mode functions
-
-You can use the [`update`](reference-pulsar-admin.md#update-1) command to update a Pulsar Function running in cluster mode. This command, for example, would update the function created in the section [above](#cluster-mode):
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/new-input-topic \
-  --output persistent://public/default/new-output-topic
-
-```
-
-### Parallelism
-
-Pulsar Functions run as processes called **instances**. When you run a Pulsar Function, it runs as a single instance by default (and in [local run mode](#local-run-mode) you can *only* run a single instance of a function).
-
-You can also specify the *parallelism* of a function, i.e. the number of instances to run, when you create the function. You can set the parallelism factor using the `--parallelism` flag of the [`create`](reference-pulsar-admin.md#functions-create) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --parallelism 3 \
-  # Other function info
-
-```
-
-You can adjust the parallelism of an already created function using the [`update`](reference-pulsar-admin.md#update-1) interface.
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --parallelism 5 \
-  # Other function
-
-```
-
-If you're specifying a function's configuration via YAML, use the `parallelism` parameter. Here's an example config file:
-
-```yaml
-
-# function-config.yaml
-parallelism: 3
-inputs:
-- persistent://public/default/input-1
-output: persistent://public/default/output-1
-# other parameters
-
-```
-
-And here's the corresponding update command:
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --functionConfigFile function-config.yaml
-
-```
-
-### Function instance resources
-
-When you run Pulsar Functions in [cluster run](#cluster-mode) mode, you can specify the resources that are assigned to each function [instance](#parallelism):
-
-Resource | Specified as... | Runtimes
-:--------|:----------------|:--------
-CPU | The number of cores | Docker (coming soon)
-RAM | The number of bytes | Process, Docker
-Disk space | The number of bytes | Docker
-
-Here's an example function creation command that allocates 8 cores, 8 GB of RAM, and 10 GB of disk space to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar target/my-functions.jar \
-  --className org.example.functions.MyFunction \
-  --cpu 8 \
-  --ram 8589934592 \
-  --disk 10737418240
-
-```
-
-> #### Resources are *per instance*
-> The resources that you apply to a given Pulsar Function are applied to each [instance](#parallelism) of the function. If you apply 8 GB of RAM to a function with a parallelism of 5, for example, then you are applying 40 GB of RAM total for the function. You should always make sure to factor parallelism---i.e. the number of instances---into your resource calculations
-
-## Triggering Pulsar Functions
-
-If a Pulsar Function is running in [cluster mode](#cluster-mode), you can **trigger** it at any time using the command line. Triggering a function means that you send a message with a specific value to the function and get the function's output (if any) via the command line.
-
-> Triggering a function is ultimately no different from invoking a function by producing a message on one of the function's input topics. The [`pulsar-admin functions trigger`](reference-pulsar-admin.md#trigger) command is essentially a convenient mechanism for sending messages to functions without needing to use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool or a language-specific client library.
-
-To show an example of function triggering, let's start with a simple [Python function](functions-api.md#functions-for-python) that returns a simple string based on the input:
-
-```python
-
-# myfunc.py
-def process(input):
-    return "This function has been triggered with a value of {0}".format(input)
-
-```
-
-Let's run that function in [local run mode](functions-deploying.md#local-run-mode):
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --tenant public \
-  --namespace default \
-  --name myfunc \
-  --py myfunc.py \
-  --className myfunc \
-  --inputs persistent://public/default/in \
-  --output persistent://public/default/out
-
-```
-
-Now let's make a consumer listen on the output topic for messages coming from the `myfunc` function using the [`pulsar-client consume`](reference-cli-tools.md#consume) command:
-
-```bash
-
-$ bin/pulsar-client consume persistent://public/default/out \
-  --subscription-name my-subscription
-  --num-messages 0 # Listen indefinitely
-
-```
-
-Now let's trigger that function:
-
-```bash
-
-$ bin/pulsar-admin functions trigger \
-  --tenant public \
-  --namespace default \
-  --name myfunc \
-  --triggerValue "hello world"
-
-```
-
-The consumer listening on the output topic should then produce this in its logs:
-
-```
-
------ got message -----
-This function has been triggered with a value of hello world
-
-```
-
-> #### Topic info not required
-> In the `trigger` command above, you may have noticed that you only need to specify basic information about the function (tenant, namespace, and name). To trigger the function, you didn't need to know the function's input topic(s).
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-guarantees.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-guarantees.md
deleted file mode 100644
index 14abfe72b98ae..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-guarantees.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-id: functions-guarantees
-title: Processing guarantees
-sidebar_label: "Processing guarantees"
-original_id: functions-guarantees
----
-
-Pulsar Functions provides three different messaging semantics that you can apply to any function:
-
-Delivery semantics | Description
-:------------------|:-------
-**At-most-once** delivery | Each message that is sent to the function will most likely be processed but also may not be (hence the "at most")
-**At-least-once** delivery | Each message that is sent to the function could be processed more than once (hence the "at least")
-**Effectively-once** delivery | Each message that is sent to the function will have one output associated with it
-
-## Applying processing guarantees to a function
-
-You can set the processing guarantees for a Pulsar Function when you create the Function. This [`pulsar-function create`](reference-pulsar-admin.md#create-1) command, for example, would apply effectively-once guarantees to the Function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --processingGuarantees EFFECTIVELY_ONCE \
-  # Other function configs
-
-```
-
-The available options are:
-
-* `ATMOST_ONCE`
-* `ATLEAST_ONCE`
-* `EFFECTIVELY_ONCE`
-
-> By default, Pulsar Functions provide at-most-once delivery guarantees. So if you create a function without supplying a value for the `--processingGuarantees` flag, then the function will provide at-most-once guarantees.
-
-## Updating the processing guarantees of a function
-
-You can change the processing guarantees applied to a function once it's already been created using the [`update`](reference-pulsar-admin.md#update-1) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --processingGuarantees ATMOST_ONCE \
-  # Other function configs
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-metrics.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-metrics.md
deleted file mode 100644
index e76c55658b574..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-metrics.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-id: functions-metrics
-title: Metrics for Pulsar Functions
-sidebar_label: "Metrics"
----
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-overview.md
deleted file mode 100644
index 5dbc04204c2b5..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-overview.md
+++ /dev/null
@@ -1,499 +0,0 @@
----
-id: functions-overview
-title: Pulsar Functions overview
-sidebar_label: "Overview"
-original_id: functions-overview
----
-
-**Pulsar Functions** are lightweight compute processes that
-
-* consume messages from one or more Pulsar topics,
-* apply a user-supplied processing logic to each message,
-* publish the results of the computation to another topic
-
-Here's an example Pulsar Function for Java (using the [native interface](functions-api.md#java-native-functions)):
-
-```java
-
-import java.util.Function;
-
-public class ExclamationFunction implements Function {
-    @Override
-    public String apply(String input) { return String.format("%s!", input); }
-}
-
-```
-
-Here's an equivalent function in Python (also using the [native interface](functions-api.md#python-native-functions)):
-
-```python
-
-def process(input):
-    return "{0}!".format(input)
-
-```
-
-Functions are executed each time a message is published to the input topic. If a function is listening on the topic `tweet-stream`, for example, then the function would be run each time a message is published to that topic.
-
-## Goals
-
-The core goal behind Pulsar Functions is to enable you to easily create processing logic of any level of complexity without needing to deploy a separate neighboring system (such as [Apache Storm](http://storm.apache.org/), [Apache Heron](https://apache.github.io/incubator-heron), [Apache Flink](https://flink.apache.org/), etc.). Pulsar Functions is essentially ready-made compute infrastructure at your disposal as part of your Pulsar messaging system. This core goal is tied to a series of other goals:
-
-* Developer productivity ([language-native](#language-native-functions) vs. [Pulsar Functions SDK](#the-pulsar-functions-sdk) functions)
-* Easy troubleshooting
-* Operational simplicity (no need for an external processing system)
-
-## Inspirations
-
-The Pulsar Functions feature was inspired by (and takes cues from) several systems and paradigms:
-
-* Stream processing engines such as [Apache Storm](http://storm.apache.org/), [Apache Heron](https://apache.github.io/incubator-heron), and [Apache Flink](https://flink.apache.org)
-* "Serverless" and "Function as a Service" (FaaS) cloud platforms like [Amazon Web Services Lambda](https://aws.amazon.com/lambda/), [Google Cloud Functions](https://cloud.google.com/functions/), and [Azure Cloud Functions](https://azure.microsoft.com/en-us/services/functions/)
-
-Pulsar Functions could be described as
-
-* [Lambda](https://aws.amazon.com/lambda/)-style functions that are
-* specifically designed to use Pulsar as a message bus
-
-## Programming model
-
-The core programming model behind Pulsar Functions is very simple:
-
-* Functions receive messages from one or more **input [topics](reference-terminology.md#topic)**. Every time a message is received, the function can do a variety of things:
-  * Apply some processing logic to the input and write output to:
-  * An **output topic** in Pulsar
-  * [Apache BookKeeper](#state-storage)
-  * Write logs to a **log topic** (potentially for debugging purposes)
-  * Increment a [counter](#word-count-example)
-
-![Pulsar Functions core programming model](/assets/pulsar-functions-overview.png)
-
-### Word count example
-
-If you were to implement the classic word count example using Pulsar Functions, it might look something like this:
-
-![Pulsar Functions word count example](/assets/pulsar-functions-word-count.png)
-
-If you were writing the function in [Java](functions-api.md#functions-for-java) using the [Pulsar Functions SDK for Java](functions-api.md#java-sdk-functions), you could write the function like this...
-
-```java
-
-package org.example.functions;
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-
-import java.util.Arrays;
-
-public class WordCountFunction implements Function {
-    // This function is invoked every time a message is published to the input topic
-    @Override
-    public Void process(String input, Context context) {
-        Arrays.asList(input.split(" ")).forEach(word -> {
-            String counterKey = word.toLowerCase();
-            context.incrCounter(counterKey, 1)
-        });
-        return null;
-    }
-}
-
-```
-
-...and then [deploy it](#cluster-run-mode) in your Pulsar cluster using the [command line](#command-line-interface) like this:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar target/my-jar-with-dependencies.jar \
-  --className org.example.functions.WordCountFunction \
-  --tenant public \
-  --namespace default \
-  --name word-count \
-  --inputs persistent://public/default/sentences \
-  --output persistent://public/default/count
-
-```
-
-### Content-based routing example
-
-The use cases for Pulsar Functions are essentially endless, but let's dig into a more sophisticated example that involves content-based routing.
-
-Imagine a function that takes items (strings) as input and publishes them to either a fruits or vegetables topic, depending on the item. Or, if an item is neither a fruit nor a vegetable, a warning is logged to a [log topic](#logging). Here's a visual representation:
-
-![Pulsar Functions routing example](/assets/pulsar-functions-routing-example.png)
-
-If you were implementing this routing functionality in Python, it might look something like this:
-
-```python
-
-from pulsar import Function
-
-class RoutingFunction(Function):
-    def __init__(self):
-        self.fruits_topic = "persistent://public/default/fruits"
-        self.vegetables_topic = "persistent://public/default/vegetables"
-
-    @staticmethod
-    def is_fruit(item):
-        return item in ["apple", "orange", "pear", "other fruits..."]
-
-    @staticmethod
-    def is_vegetable(item):
-        return item in ["carrot", "lettuce", "radish", "other vegetables..."]
-
-    def process(self, item, context):
-        if self.is_fruit(item):
-            context.publish(self.fruits_topic, item)
-        elif self.is_vegetable(item):
-            context.publish(self.vegetables_topic, item)
-        else:
-            warning = "The item {0} is neither a fruit nor a vegetable".format(item)
-            context.get_logger().warn(warning)
-
-```
-
-## Command-line interface
-
-Pulsar Functions are managed using the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool (in particular the [`functions`](reference-pulsar-admin.md#functions) command). Here's an example command that would run a function in [local run mode](#local-run-mode):
-
-```bash
-
-$ bin/pulsar-functions localrun \
-  --inputs persistent://public/default/test_src \
-  --output persistent://public/default/test_result \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction
-
-```
-
-## Fully Qualified Function Name (FQFN)
-
-Each Pulsar Function has a **Fully Qualified Function Name** (FQFN) that consists of three elements: the function's tenant, namespace, and function name. FQFN's look like this:
-
-```http
-
-tenant/namespace/name
-
-```
-
-FQFNs enable you to, for example, create multiple functions with the same name provided that they're in different namespaces.
-
-## Configuration
-
-Pulsar Functions can be configured in two ways:
-
-* Via [command-line arguments](#command-line-interface) passed to the [`pulsar-admin functions`](reference-pulsar-admin.md#functions) interface
-* Via [YAML](http://yaml.org/) configuration files
-
-If you're supplying a YAML configuration, you must specify a path to the file on the command line. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --functionConfigFile ./my-function.yaml
-
-```
-
-And here's an example `my-function.yaml` file:
-
-```yaml
-
-name: my-function
-tenant: public
-namespace: default
-jar: ./target/my-functions.jar
-className: org.example.pulsar.functions.MyFunction
-inputs:
-- persistent://public/default/test_src
-output: persistent://public/default/test_result
-
-```
-
-You can also mix and match configuration methods by specifying some function attributes via the CLI and others via YAML configuration.
-
-## Supported languages
-
-Pulsar Functions can currently be written in [Java](functions-api.md#functions-for-java) and [Python](functions-api.md#functions-for-python). Support for additional languages is coming soon.
-
-## The Pulsar Functions API
-
-The Pulsar Functions API enables you to create processing logic that is:
-
-* Type safe. Pulsar Functions can process raw bytes or more complex, application-specific types.
-* Based on SerDe (**Ser**ialization/**De**serialization). A variety of types are supported "out of the box" but you can also create your own custom SerDe logic.
-
-### Function context
-
-Each Pulsar Function created using the [Pulsar Functions SDK](#the-pulsar-functions-sdk) has access to a context object that both provides:
-
-1. A wide variety of information about the function, including:
-  * The name of the function
-  * The tenant and namespace of the function
-  * [User-supplied configuration](#user-configuration) values
-2. Special functionality, including:
-  * The ability to produce [logs](#logging) to a specified logging topic
-  * The ability to produce [metrics](#metrics)
-
-### Language-native functions
-
-Both Java and Python support writing "native" functions, i.e. Pulsar Functions with no dependencies.
-
-The benefit of native functions is that they don't have any dependencies beyond what's already available in Java/Python "out of the box." The downside is that they don't provide access to the function's [context](#function-context), which is necessary for a variety of functionality, including [logging](#logging), [user configuration](#user-configuration), and more.
-
-## The Pulsar Functions SDK
-
-If you'd like a Pulsar Function to have access to a [context object](#function-context), you can use the **Pulsar Functions SDK**, available for both [Java](functions-api.md#functions-for-java) and [Pythnon](functions-api.md#functions-for-python).
-
-### Java
-
-Here's an example Java function that uses information about its context:
-
-```java
-
-import org.apache.pulsar.functions.api.Context;
-import org.apache.pulsar.functions.api.Function;
-import org.slf4j.Logger;
-
-public class ContextAwareFunction implements Function {
-    @Override
-    public Void process(String input, Context, context) {
-        Logger LOG = context.getLogger();
-        String functionTenant = context.getTenant();
-        String functionNamespace = context.getNamespace();
-        String functionName = context.getName();
-        LOG.info("Function tenant/namespace/name: {}/{}/{}", functionTenant, functionNamespace, functionName);
-        return null;
-    }
-}
-
-```
-
-### Python
-
-Here's an example Python function that uses information about its context:
-
-```python
-
-from pulsar import Function
-
-class ContextAwareFunction(Function):
-    def process(self, input, context):
-        log = context.get_logger()
-        function_tenant = context.get_function_tenant()
-        function_namespace = context.get_function_namespace()
-        function_name = context.get_function_name()
-        log.info("Function tenant/namespace/name: {0}/{1}/{2}".format(function_tenant, function_namespace, function_name))
-
-```
-
-## Deployment
-
-The Pulsar Functions feature was built to support a variety of deployment options. At the moment, there are two ways to run Pulsar Functions:
-
-Deployment mode | Description
-:---------------|:-----------
-[Local run mode](#local-run-mode) | The function runs in your local environment, for example on your laptop [Cluster mode](#cluster-run-mode) | The function runs *inside of* your Pulsar cluster, on the same machines as your Pulsar [brokers](reference-terminology.md#broker)
-
-### Local run mode
-
-If you run a Pulsar Function in **local run** mode, it will run on the machine from which the command is run (this could be your laptop, an [AWS EC2](https://aws.amazon.com/ec2/) instance, etc.). Here's an example [`localrun`](reference-pulsar-admin.md#localrun) command:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-By default, the function will connect to a Pulsar cluster running on the same machine, via a local broker service URL of `pulsar://localhost:6650`. If you'd like to use local run mode to run a function but connect it to a non-local Pulsar cluster, you can specify a different broker URL using the `--brokerServiceUrl` flag. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --brokerServiceUrl pulsar://my-cluster-host:6650 \
-  # Other function parameters
-
-```
-
-### Cluster run mode
-
-When you run a Pulsar Function in **cluster mode**, the function code will be uploaded to a Pulsar broker and run *alongside the broker* rather than in your [local environment](#local-run-mode). You can run a function in cluster mode using the [`create`](reference-pulsar-admin.md#create-1) command. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py myfunc.py \
-  --className myfunc.SomeFunction \
-  --inputs persistent://public/default/input-1 \
-  --output persistent://public/default/output-1
-
-```
-
-This command will upload `myfunc.py` to Pulsar, which will use the code to start one [or more](#parallelism) instances of the function.
-
-### Parallelism
-
-By default, only one **instance** of a Pulsar Function runs when you create and run it in [cluster run mode](#cluster-run-mode). You can also, however, run multiple instances in parallel. You can specify the number of instances when you create the function, or update an existing single-instance function with a new parallelism factor.
-
-This command, for example, would create and run a function with a parallelism of 5 (i.e. 5 instances):
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name parallel-fun \
-  --tenant public \
-  --namespace default \
-  --py func.py \
-  --className func.ParallelFunction \
-  --parallelism 5
-
-```
-
-### Function instance resources
-
-When you run Pulsar Functions in [cluster run](#cluster-run-mode) mode, you can specify the resources that are assigned to each function [instance](#parallelism):
-
-Resource | Specified as... | Runtimes
-:--------|:----------------|:--------
-CPU | The number of cores | Docker (coming soon)
-RAM | The number of bytes | Process, Docker
-Disk space | The number of bytes | Docker
-
-Here's an example function creation command that allocates 8 cores, 8 GB of RAM, and 10 GB of disk space to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar target/my-functions.jar \
-  --className org.example.functions.MyFunction \
-  --cpu 8 \
-  --ram 8589934592 \
-  --disk 10737418240
-
-```
-
-For more information on resources, see the [Deploying and Managing Pulsar Functions](functions-deploying.md#resources) documentation.
-
-### Logging
-
-Pulsar Functions created using the [Pulsar Functions SDK](#the-pulsar-functions-sdk) can send logs to a log topic that you specify as part of the function's configuration. The function created using the command below, for example, would produce all logs on the `persistent://public/default/my-func-1-log` topic:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name my-func-1 \
-  --logTopic persistent://public/default/my-func-1-log \
-  # Other configs
-
-```
-
-Here's an example [Java function](functions-api.md#java-logging) that logs at different log levels based on the function's input:
-
-```java
-
-public class LoggerFunction implements Function {
-    @Override
-    public Void process(String input, Context context) {
-        Logger LOG = context.getLogger();
-        if (input.length() <= 100) {
-            LOG.info("This string has a length of {}", input);
-        } else {
-            LOG.warn("This string is getting too long! It has {} characters", input);
-        }
-    }
-}
-
-```
-
-### User configuration
-
-Pulsar Functions can be passed arbitrary key-values via the command line (both keys and values must be strings). This set of key-values is called the functions **user configuration**. User configurations must consist of JSON strings.
-
-Here's an example of passing a user configuration to a function:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --userConfig '{"key-1":"value-1","key-2","value-2"}' \
-  # Other configs
-
-```
-
-Here's an example of a function that accesses that config map:
-
-```java
-
-public class ConfigMapFunction implements Function {
-    @Override
-    public Void process(String input, Context context) {
-        String val1 = context.getUserConfigValue("key1").get();
-        String val2 = context.getUserConfigValue("key2").get();
-        context.getLogger().info("The user-supplied values are {} and {}", val1, val2);
-        return null;
-    }
-}
-
-```
-
-### Triggering Pulsar Functions
-
-Pulsar Functions running in [cluster mode](#cluster-run-mode) can be [triggered](functions-deploying.md#triggering-pulsar-functions) via the [command line](#command-line-interface). With triggering you can easily pass a specific value to a function and get the function's return value *without* needing to worry about creating a client, sending a message to the right input topic, etc. Triggering can be very useful for---but is by no means limited to---testing and debugging purposes.
-
-> Triggering a function is ultimately no different from invoking a function by producing a message on one of the function's input topics. The [`pulsar-admin functions trigger`](reference-pulsar-admin.md#trigger) command is essentially a convenient mechanism for sending messages to functions without needing to use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool or a language-specific client library.
-
-Let's take an example Pulsar Function written in Python (using the [native interface](functions-api.md#python-native-functions)) that simply reverses string inputs:
-
-```python
-
-def process(input):
-    return input[::-1]
-
-```
-
-If that function were running in a Pulsar cluster, it could be triggered like this:
-
-```bash
-
-$ bin/pulsar-admin functions trigger \
-  --tenant public \
-  --namespace default \
-  --name reverse-func \
-  --triggerValue "snoitcnuf raslup ot emoclew"
-
-```
-
-That should return `welcome to pulsar functions` as the console output.
-
-> Instead of passing in a string via the CLI, you can also trigger a Pulsar Function with the contents of a file using the `--triggerFile` flag.
-
-## Processing guarantees
-
-The Pulsar Functions feature provides three different messaging semantics that you can apply to any function:
-
-Delivery semantics | Description
-:------------------|:-------
-**At-most-once** delivery | Each message that is sent to the function will most likely be processed but also may not be (hence the "at most")
-**At-least-once** delivery | Each message that is sent to the function could be processed more than once (hence the "at least")
-**Effectively-once** delivery | Each message that is sent to the function will have one output associated with it
-
-This command, for example, would run a function in [cluster mode](#cluster-run-mode) with effectively-once guarantees applied:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --name my-effectively-once-function \
-  --processingGuarantees EFFECTIVELY_ONCE \
-  # Other function configs
-
-```
-
-## Metrics
-
-Pulsar Functions that use the [Pulsar Functions SDK](#the-pulsar-functions-sdk) can publish metrics to Pulsar. For more information, see [Metrics for Pulsar Functions](functions-metrics.md).
-
-## State storage
-
-Pulsar Functions use [Apache BookKeeper](https://bookkeeper.apache.org) as a state storage interface. All Pulsar installations, including local standalone installations, include a deployment of BookKeeper bookies.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-quickstart.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-quickstart.md
deleted file mode 100644
index 3ccc0e531f9ed..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-quickstart.md
+++ /dev/null
@@ -1,316 +0,0 @@
----
-id: functions-quickstart
-title: Getting started with Pulsar Functions
-sidebar_label: "Getting started"
-original_id: functions-quickstart
----
-
-This tutorial will walk you through running a [standalone](reference-terminology.md#standalone) Pulsar [cluster](reference-terminology.md#cluster) on your machine and then running your first Pulsar Functions using that cluster. The first function will run in local run mode (outside your Pulsar [cluster](reference-terminology.md#cluster)), while the second will run in cluster mode (inside your cluster).
-
-> In local run mode, your Pulsar Function will communicate with your Pulsar cluster but will run outside of the cluster.
-
-## Prerequisites
-
-In order to follow along with this tutorial, you'll need to have [Maven](https://maven.apache.org/download.cgi) installed on your machine.
-
-## Run a standalone Pulsar cluster
-
-In order to run our Pulsar Functions, we'll need to run a Pulsar cluster locally first. The easiest way to do that is to run Pulsar in [standalone](reference-terminology.md#standalone) mode. Follow these steps to start up a standalone cluster:
-
-```bash
-
-$ wget pulsar:binary_release_url
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-$ bin/pulsar standalone \
-  --advertised-address 127.0.0.1
-
-```
-
-When running Pulsar in standalone mode, the `public` tenant and `default` namespace will be created automatically for you. That tenant and namespace will be used throughout this tutorial.
-
-## Run a Pulsar Function in local run mode
-
-Let's start with a simple function that takes a string as input from a Pulsar topic, adds an exclamation point to the end of the string, and then publishes that new string to another Pulsar topic. Here's the code for the function:
-
-```java
-
-package org.apache.pulsar.functions.api.examples;
-
-import java.util.function.Function;
-
-public class ExclamationFunction implements Function {
-    @Override
-    public String apply(String input) {
-        return String.format("%s!", input);
-    }
-}
-
-```
-
-A JAR file containing this and several other functions (written in Java) is included with the binary distribution you downloaded above (in the `examples` folder). To run the function in local mode, i.e. on our laptop but outside our Pulsar cluster:
-
-```bash
-
-$ bin/pulsar-admin functions localrun \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --name exclamation
-
-```
-
-> #### Multiple input topics allowed
->
-> In the example above, a single topic was specified using the `--inputs` flag. You can also specify multiple input topics as a comma-separated list using the same flag. Here's an example:
->
-
-> ```bash
-> 
-> --inputs topic1,topic2
->
-> 
-> ```
-
-
-We can open up another shell and use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) tool to listen for messages on the output topic:
-
-```bash
-
-$ bin/pulsar-client consume persistent://public/default/exclamation-output \
-  --subscription-name my-subscription \
-  --num-messages 0
-
-```
-
-> Setting the `--num-messages` flag to 0 means that the consumer will listen on the topic indefinitely (rather than only accepting a certain number of messages).
-
-With a listener up and running, we can open up another shell and produce a message on the input topic that we specified:
-
-```bash
-
-$ bin/pulsar-client produce persistent://public/default/exclamation-input \
-  --num-produce 1 \
-  --messages "Hello world"
-
-```
-
-In the output, you should see the following:
-
-```
-
------ got message -----
-Hello world!
-
-```
-
-Success! As you can see, the message has been successfully processed by the exclamation function. To shut down the function, simply hit **Ctrl+C**.
-
-Here's what happened:
-
-* The `Hello world` message that we published to the input topic (`persistent://public/default/exclamation-input`) was passed to the exclamation function that we ran on our machine
-* The exclamation function processed the message (providing a result of `Hello world!`) and published the result to the output topic (`persistent://public/default/exclamation-output`).
-* If our exclamation function *hadn't* been running, Pulsar would have durably stored the message data published to the input topic in [Apache BookKeeper](https://bookkeeper.apache.org) until a consumer consumed and acknowledged the message
-
-## Run a Pulsar Function in cluster mode
-
-[Local run mode](#run-a-pulsar-function-in-local-run-mode) is useful for development and experimentation, but if you want to use Pulsar Functions in a real Pulsar deployment, you'll want to run them in **cluster mode**. In this mode, Pulsar Functions run *inside* your Pulsar cluster and are managed using the same [`pulsar-admin functions`](reference-pulsar-admin.md#functions) interface that we've been using thus far.
-
-This command, for example, would deploy the same exclamation function we ran locally above *in our Pulsar cluster* (rather than outside it):
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --name exclamation
-
-```
-
-You should see `Created successfully` in the output. Now, let's see a list of functions running in our cluster:
-
-```bash
-
-$ bin/pulsar-admin functions list \
-  --tenant public \
-  --namespace default
-
-```
-
-We should see just the `exclamation` function listed there. We can also check the status of our deployed function using the `getstatus` command:
-
-```bash
-
-$ bin/pulsar-admin functions getstatus \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-You should see this JSON output:
-
-```json
-
-{
-  "functionStatusList": [
-    {
-      "running": true,
-      "instanceId": "0"
-    }
-  ]
-}
-
-```
-
-As we can see, (a) the instance is currently running and (b) there is one instance, with an ID of 0, running. We can get other information about the function (topics, tenant, namespace, etc.) using the `get` command instead of `getstatus`:
-
-```bash
-
-$ bin/pulsar-admin functions get \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-You should see this JSON output:
-
-```json
-
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "exclamation",
-  "className": "org.apache.pulsar.functions.api.examples.ExclamationFunction",
-  "output": "persistent://public/default/exclamation-output",
-  "autoAck": true,
-  "inputs": [
-    "persistent://public/default/exclamation-input"
-  ],
-  "parallelism": 1
-}
-
-```
-
-As we can see, the parallelism of the function is 1, meaning that only one instance of the function is running in our cluster. Let's update our function to a parallelism of 3 using the `update` command:
-
-```bash
-
-$ bin/pulsar-admin functions update \
-  --jar examples/api-examples.jar \
-  --className org.apache.pulsar.functions.api.examples.ExclamationFunction \
-  --inputs persistent://public/default/exclamation-input \
-  --output persistent://public/default/exclamation-output \
-  --tenant public \
-  --namespace default \
-  --name exclamation \
-  --parallelism 3
-
-```
-
-You should see `Updated successfully` in the output. If you run the `get` command from above for the function, you can see that the parallelism has increased to 3, meaning that there are now three instances of the function running in our cluster:
-
-```json
-
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "exclamation",
-  "className": "org.apache.pulsar.functions.api.examples.ExclamationFunction",
-  "output": "persistent://public/default/exclamation-output",
-  "autoAck": true,
-  "inputs": [
-    "persistent://public/default/exclamation-input"
-  ],
-  "parallelism": 3
-}
-
-```
-
-Finally, we can shut down our running function using the `delete` command:
-
-```bash
-
-$ bin/pulsar-admin functions delete \
-  --tenant public \
-  --namespace default \
-  --name exclamation
-
-```
-
-If you see `Deleted successfully` in the output, then you've successfully run, updated, and shut down a Pulsar Function running in cluster mode. Congrats! Now, let's go even further and run a brand new function in the next section.
-
-## Writing and running a new function
-
-> In order to write and run the [Python](functions-api.md#functions-for-python) function below, you'll need to install a few dependencies:
-
-> ```bash
-> 
-> $ pip install pulsar-client
->
-> 
-> ```
-
-
-In the above examples, we ran and managed a pre-written Pulsar Function and saw how it worked. To really get our hands dirty, let's write and our own function from scratch, using the Python API. This simple function will also take a string as input but it will reverse the string and publish the resulting, reversed string to the specified topic.
-
-First, create a new Python file:
-
-```bash
-
-$ touch reverse.py
-
-```
-
-In that file, add the following:
-
-```python
-
-def process(input):
-    return input[::-1]
-
-```
-
-Here, the `process` method defines the processing logic of the Pulsar Function. It simply uses some Python slice magic to reverse each incoming string. Now, we can deploy the function using `create`:
-
-```bash
-
-$ bin/pulsar-admin functions create \
-  --py reverse.py \
-  --className reverse \
-  --inputs persistent://public/default/backwards \
-  --output persistent://public/default/forwards \
-  --tenant public \
-  --namespace default \
-  --name reverse
-
-```
-
-If you see `Created successfully`, the function is ready to accept incoming messages. Because the function is running in cluster mode, we can **trigger** the function using the [`trigger`](reference-pulsar-admin.md#trigger) command. This command will send a message that we specify to the function and also give us the function's output. Here's an example:
-
-```bash
-
-$ bin/pulsar-admin functions trigger \
-  --name reverse \
-  --tenant public \
-  --namespace default \
-  --triggerValue "sdrawrof won si tub sdrawkcab saw gnirts sihT"
-
-```
-
-You should get this output:
-
-```
-
-This string was backwards but is now forwards
-
-```
-
-Once again, success! We created a brand new Pulsar Function, deployed it in our Pulsar standalone cluster in [cluster mode](#run-a-pulsar-function-in-cluster-mode) and successfully triggered the function. If you're ready for more, check out one of these docs:
-
-* [The Pulsar Functions API](functions-api.md)
-* [Deploying Pulsar Functions](functions-deploying.md)
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/functions-state.md b/site2/website/versioned_docs/version-2.1.1-incubating/functions-state.md
deleted file mode 100644
index a858759b2e7b4..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/functions-state.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-id: functions-state
-title: Pulsar Functions State Storage (Developer Preview)
-sidebar_label: "State Storage"
----
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/getting-started-docker.md b/site2/website/versioned_docs/version-2.1.1-incubating/getting-started-docker.md
deleted file mode 100644
index 904d67401668a..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/getting-started-docker.md
+++ /dev/null
@@ -1,211 +0,0 @@
----
-id: getting-started-docker
-title: Set up a standalone Pulsar in Docker
-sidebar_label: "Run Pulsar in Docker"
----
-
-For local development and testing, you can run Pulsar in standalone mode on your own machine within a Docker container. 
-
-If you have not installed Docker, download the [Community edition](https://www.docker.com/community-edition) and follow the instructions for your OS.
-
-## Start Pulsar in Docker
-
-* For MacOS, Linux, and Windows:
-
-  ```shell
-  
-  $ docker run -it -p 6650:6650  -p 8080:8080 --mount source=pulsardata,target=/pulsar/data --mount source=pulsarconf,target=/pulsar/conf apachepulsar/pulsar:@pulsar:version@ bin/pulsar standalone
-  
-  ```
-
-A few things to note about this command:
- * The data, metadata, and configuration are persisted on Docker volumes in order to not start "fresh" every 
-time the container is restarted. For details on the volumes you can use `docker volume inspect `
- * For Docker on Windows make sure to configure it to use Linux containers
- * The docker container will run as UID 10000 and GID 0, by default. You'll need to ensure the mounted volumes give write permission to either UID 10000 or GID 0. Note that UID 10000 is arbitrary, so it is recommended to make these mounts writable for the root group (GID 0).
-
-If you start Pulsar successfully, you will see `INFO`-level log messages like this:
-
-```
-
-08:18:30.970 [main] INFO  org.apache.pulsar.broker.web.WebService - HTTP Service started at http://0.0.0.0:8080
-...
-07:53:37.322 [main] INFO  org.apache.pulsar.broker.PulsarService - messaging service is ready, bootstrap service port = 8080, broker url= pulsar://localhost:6650, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@98b63c1
-...
-
-```
-
-:::tip
-
-When you start a local standalone cluster, a `public/default` namespace is created automatically. The namespace is used for development purposes. All Pulsar topics are managed within namespaces. For more information, see [Topics](concepts-messaging.md#topics).
-
-:::
-
-## Use Pulsar in Docker
-
-Pulsar offers client libraries for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md) 
-and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can
-use one of these root URLs to interact with your cluster:
-
-* `pulsar://localhost:6650`
-* `http://localhost:8080`
-
-The following example will guide you get started with Pulsar quickly by using the [Python client API](client-libraries-python.md)
-client API.
-
-Install the Pulsar Python client library directly from [PyPI](https://pypi.org/project/pulsar-client/):
-
-```shell
-
-$ pip install pulsar-client
-
-```
-
-### Consume a message
-
-Create a consumer and subscribe to the topic:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-consumer = client.subscribe('my-topic',
-                            subscription_name='my-sub')
-
-while True:
-    msg = consumer.receive()
-    print("Received message: '%s'" % msg.data())
-    consumer.acknowledge(msg)
-
-client.close()
-
-```
-
-### Produce a message
-
-Now start a producer to send some test messages:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-producer = client.create_producer('my-topic')
-
-for i in range(10):
-    producer.send(('hello-pulsar-%d' % i).encode('utf-8'))
-
-client.close()
-
-```
-
-## Get the topic statistics
-
-In Pulsar, you can use REST, Java, or command-line tools to control every aspect of the system.
-For details on APIs, refer to [Admin API Overview](admin-api-overview.md).
-
-In the simplest example, you can use curl to probe the stats for a particular topic:
-
-```shell
-
-$ curl http://localhost:8080/admin/v2/persistent/public/default/my-topic/stats | python -m json.tool
-
-```
-
-The output is something like this:
-
-```json
-
-{
-    "msgRateIn": 0.0,
-    "msgThroughputIn": 0.0,
-    "msgRateOut": 1.8332950480217471,
-    "msgThroughputOut": 91.33142602871978,
-    "bytesInCounter": 7097,
-    "msgInCounter": 143,
-    "bytesOutCounter": 6607,
-    "msgOutCounter": 133,
-    "averageMsgSize": 0.0,
-    "msgChunkPublished": false,
-    "storageSize": 7097,
-    "backlogSize": 0,
-    "offloadedStorageSize": 0,
-    "publishers": [
-        {
-            "accessMode": "Shared",
-            "msgRateIn": 0.0,
-            "msgThroughputIn": 0.0,
-            "averageMsgSize": 0.0,
-            "chunkedMessageRate": 0.0,
-            "producerId": 0,
-            "metadata": {},
-            "address": "/127.0.0.1:35604",
-            "connectedSince": "2021-07-04T09:05:43.04788Z",
-            "clientVersion": "2.8.0",
-            "producerName": "standalone-2-5"
-        }
-    ],
-    "waitingPublishers": 0,
-    "subscriptions": {
-        "my-sub": {
-            "msgRateOut": 1.8332950480217471,
-            "msgThroughputOut": 91.33142602871978,
-            "bytesOutCounter": 6607,
-            "msgOutCounter": 133,
-            "msgRateRedeliver": 0.0,
-            "chunkedMessageRate": 0,
-            "msgBacklog": 0,
-            "backlogSize": 0,
-            "msgBacklogNoDelayed": 0,
-            "blockedSubscriptionOnUnackedMsgs": false,
-            "msgDelayed": 0,
-            "unackedMessages": 0,
-            "type": "Exclusive",
-            "activeConsumerName": "3c544f1daa",
-            "msgRateExpired": 0.0,
-            "totalMsgExpired": 0,
-            "lastExpireTimestamp": 0,
-            "lastConsumedFlowTimestamp": 1625389101290,
-            "lastConsumedTimestamp": 1625389546070,
-            "lastAckedTimestamp": 1625389546162,
-            "lastMarkDeleteAdvancedTimestamp": 1625389546163,
-            "consumers": [
-                {
-                    "msgRateOut": 1.8332950480217471,
-                    "msgThroughputOut": 91.33142602871978,
-                    "bytesOutCounter": 6607,
-                    "msgOutCounter": 133,
-                    "msgRateRedeliver": 0.0,
-                    "chunkedMessageRate": 0.0,
-                    "consumerName": "3c544f1daa",
-                    "availablePermits": 867,
-                    "unackedMessages": 0,
-                    "avgMessagesPerEntry": 6,
-                    "blockedConsumerOnUnackedMsgs": false,
-                    "lastAckedTimestamp": 1625389546162,
-                    "lastConsumedTimestamp": 1625389546070,
-                    "metadata": {},
-                    "address": "/127.0.0.1:35472",
-                    "connectedSince": "2021-07-04T08:58:21.287682Z",
-                    "clientVersion": "2.8.0"
-                }
-            ],
-            "isDurable": true,
-            "isReplicated": false,
-            "allowOutOfOrderDelivery": false,
-            "consumersAfterMarkDeletePosition": {},
-            "nonContiguousDeletedMessagesRanges": 0,
-            "nonContiguousDeletedMessagesRangesSerializedSize": 0,
-            "durable": true,
-            "replicated": false
-        }
-    },
-    "replication": {},
-    "deduplicationStatus": "Disabled",
-    "nonContiguousDeletedMessagesRanges": 0,
-    "nonContiguousDeletedMessagesRangesSerializedSize": 0
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/getting-started-standalone.md b/site2/website/versioned_docs/version-2.1.1-incubating/getting-started-standalone.md
deleted file mode 100644
index ed437a88361a3..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/getting-started-standalone.md
+++ /dev/null
@@ -1,222 +0,0 @@
----
-id: getting-started-standalone
-title: Setting up a local standalone cluster
-sidebar_label: "Run Pulsar locally"
-original_id: getting-started-standalone
----
-
-For the purposes of local development and testing, you can run Pulsar in standalone mode on your own machine. Standalone mode includes a Pulsar broker as well as the necessary ZooKeeper and BookKeeper components running inside of a single Java Virtual Machine (JVM) process.
-
-> #### Pulsar in production? 
-> If you're looking to run a full production Pulsar installation, see the [Deploying a Pulsar instance](deploy-bare-metal.md) guide.
-
-## Run Pulsar Standalone Manually
-
-### System requirements
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-
-### Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:binary_release_url
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-### What your package contains
-
-The Pulsar binary package initially contains the following directories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's command-line tools, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar
-`licenses` | License files, in `.txt` form, for various components of the Pulsar [codebase](https://github.com/apache/pulsar)
-
-These directories will be created once you begin running Pulsar:
-
-Directory | Contains
-:---------|:--------
-`data` | The data storage directory used by ZooKeeper and BookKeeper
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
-`logs` | Logs created by the installation
-
-
-### Installing Builtin Connectors
-
-Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-If you would like to enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz /path/to/apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ cd apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-> #### NOTES
->
-> If you are running Pulsar in a bare metal cluster, you need to make sure `connectors` tarball is unzipped in every broker's pulsar directory
-> (or in every function-worker's pulsar directory if you are running a separate worker cluster for Pulsar functions).
-> 
-> If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DC/OS](https://dcos.io/)),
-> you can use `apachepulsar/pulsar-all` image instead of `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
-
-### Starting the cluster
-
-Once you have an up-to-date local copy of the release, you can start up a local cluster using the [`pulsar`](reference-cli-tools.md#pulsar) command, which is stored in the `bin` directory, and specifying that you want to start up Pulsar in standalone mode:
-
-```bash
-
-$ bin/pulsar standalone
-
-```
-
-If Pulsar has been successfully started, you should see `INFO`-level log messages like this:
-
-```bash
-
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@95] - Configuration Store cache started
-2017-06-01 14:46:29,192 - INFO  - [main:AuthenticationService@61] - Authentication is disabled
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@108] - Pulsar WebSocket Service started
-
-```
-
-> #### Automatically created namespace
-> When you start a local standalone cluster, Pulsar will automatically create a `public/default` [namespace](concepts-messaging.md#namespaces) that you can use for development purposes. All Pulsar topics are managed within namespaces. For more info, see [Topics](concepts-messaging.md#topics).
-
-## Run Pulsar Standalone in Docker
-
-Alternatively, you can run pulsar standalone locally in docker.
-
-```bash
-
-docker run -it -p 80:80 -p 8080:8080 -p 6650:6650 apachepulsar/pulsar-standalone
-
-```
-
-The command forwards following port to localhost:
-
-- 80: the port for pulsar dashboard
-- 8080: the http service url for pulsar service
-- 6650: the binary protocol service url for pulsar service
-
-After the docker container is running, you can access the dashboard under http://localhost .
-
-## Testing your cluster setup
-
-Pulsar provides a CLI tool called [`pulsar-client`](reference-cli-tools.md#pulsar-client) that enables you to do things like send messages to a Pulsar topic in a running cluster. This command will send a simple message saying `hello-pulsar` to the `my-topic` topic:
-
-```bash
-
-$ bin/pulsar-client produce my-topic --messages "hello-pulsar"
-
-```
-
-If the message has been successfully published to the topic, you should see a confirmation like this in the `pulsar-client` logs:
-
-```
-
-13:09:39.356 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 1 messages successfully produced
-
-```
-
-> #### No need to explicitly create new topics
-> You may have noticed that we did not explicitly create the `my-topic` topic to which we sent the `hello-pulsar` message. If you attempt to write a message to a topic that does not yet exist, Pulsar will automatically create that topic for you.
-
-## Using Pulsar clients locally
-
-Pulsar currently offers client libraries for [Java](client-libraries-java.md), [Python](client-libraries-python.md), and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can use one of these root URLs for interacting with your cluster:
-
-* `http://localhost:8080`
-* `pulsar://localhost:6650`
-
-Here's an example producer for a Pulsar topic using the [Java](client-libraries-java.md) client:
-
-```java
-
-String localClusterUrl = "pulsar://localhost:6650";
-
-PulsarClient client = PulsarClient.builder().serviceUrl(localClusterUrl).build();
-Producer producer = client.newProducer().topic("my-topic").create();
-
-```
-
-Here's an example [Python](client-libraries-python.md) producer:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-producer = client.create_producer('my-topic')
-
-```
-
-Finally, here's an example [C++](client-libraries-cpp.md) producer:
-
-```cpp
-
-Client client("pulsar://localhost:6650");
-Producer producer;
-Result result = client.createProducer("my-topic", producer);
-if (result != ResultOk) {
-    LOG_ERROR("Error creating producer: " << result);
-    return -1;
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-aerospike.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-aerospike.md
deleted file mode 100644
index 29f9ab4095c0d..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-aerospike.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-id: io-aerospike
-title: Aerospike Sink Connector
-sidebar_label: "Aerospike Sink Connector"
-original_id: io-aerospike
----
-
-The Aerospike Sink connector is used to write messages to an Aerospike Cluster.
-
-## Sink Configuration Options
-
-The following configuration options are specific to the Aerospike Connector:
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| `seedHosts` | `true` | `null` | Comma separated list of one or more Aerospike cluster hosts; each host can be specified as a valid IP address or hostname followed by an optional port number (default is 3000). | 
-| `keyspace` | `true` | `null` | Aerospike namespace to use. |
-| `keySet` | `false` | `null` | Aerospike set name to use. |
-| `columnName` | `true` | `null` | Aerospike bin name to use. |
-| `maxConcurrentRequests` | `false` | `100` | Maximum number of concurrent Aerospike transactions that a Sink can open. |
-| `timeoutMs` | `false` | `100` | A single timeout value controls `socketTimeout` and `totalTimeout` for Aerospike transactions.  |
-| `retries` | `false` | `1` | Maximum number of retries before aborting a write transaction to Aerospike. |
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-cassandra.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-cassandra.md
deleted file mode 100644
index 9c46f73da3718..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-cassandra.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-id: io-cassandra
-title: Cassandra Sink Connector
-sidebar_label: "Cassandra Sink Connector"
-original_id: io-cassandra
----
-
-The Cassandra Sink connector is used to write messages to a Cassandra Cluster.
-
-The tutorial [Connecting Pulsar with Apache Cassandra](io-quickstart) shows an example how to use Cassandra Sink
-connector to write messages to a Cassandra table.
-
-## Sink Configuration Options
-
-All the Cassandra sink settings are listed as below. All the settings are required to run a Cassandra sink.
-
-| Name | Default | Required | Description |
-|------|---------|----------|-------------|
-| `roots` | `null` | `true` | Cassandra Contact Points. A list of one or many node address. It is a comma separated `String`. |
-| `keyspace` | `null` | `true` | Cassandra Keyspace name. The keyspace should be created prior to creating the sink. |
-| `columnFamily` | `null` | `true` | Cassandra ColumnFamily name. The column family should be created prior to creating the sink. |
-| `keyname` | `null` | `true` | Key column name. The key column is used for storing Pulsar message keys. If a Pulsar message doesn't have any key associated, the message value will be used as the key. |
-| `columnName` | `null` | `true` | Value column name. The value column is used for storing Pulsar message values. |
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-connectors.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-connectors.md
deleted file mode 100644
index 70a2734106acc..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-connectors.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-id: io-connectors
-title: Builtin Connectors
-sidebar_label: "Builtin Connectors"
-original_id: io-connectors
----
-
-Pulsar distribution includes a set of common connectors that have been packaged and tested with the rest of Apache Pulsar.
-These connectors import and export data from some of the most commonly used data systems. Using any of these connectors is
-as easy as writing a simple connector configuration and running the connector locally or submitting the connector to a
-Pulsar Functions cluster.
-
-- [Aerospike Sink Connector](io-aerospike.md)
-- [Cassandra Sink Connector](io-cassandra.md)
-- [Kafka Sink Connector](io-kafka.md#sink)
-- [Kafka Source Connector](io-kafka.md#source)
-- [Kinesis Sink Connector](io-kinesis.md#sink)
-- [RabbitMQ Source Connector](io-rabbitmq.md#source)
-- [Twitter Firehose Source Connector](io-twitter.md)
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-develop.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-develop.md
deleted file mode 100644
index d361a302b2529..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-develop.md
+++ /dev/null
@@ -1,422 +0,0 @@
----
-id: io-develop
-title: How to develop Pulsar connectors
-sidebar_label: "Develop"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-This guide describes how to develop Pulsar connectors to move data
-between Pulsar and other systems. 
-
-Pulsar connectors are special [Pulsar Functions](functions-overview.md), so creating
-a Pulsar connector is similar to creating a Pulsar function. 
-
-Pulsar connectors come in two types: 
-
-| Type | Description | Example
-|---|---|---
-{@inject: github:Source:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java}|Import data from another system to Pulsar.|[RabbitMQ source connector](io-rabbitmq.md) imports the messages of a RabbitMQ queue to a Pulsar topic.
-{@inject: github:Sink:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java}|Export data from Pulsar to another system.|[Kinesis sink connector](io-kinesis.md) exports the messages of a Pulsar topic to a Kinesis stream.
-
-## Develop
-
-You can develop Pulsar source connectors and sink connectors.
-
-### Source
-
-Developing a source connector is to implement the {@inject: github:Source:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java}
-interface, which means you need to implement the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method and the {@inject: github:read:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method.
-
-1. Implement the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method. 
-
-   ```java
-   
-   /**
-   * Open connector with configuration
-   *
-   * @param config initialization config
-   * @param sourceContext
-   * @throws Exception IO type exceptions when opening a connector
-   */
-   void open(final Map config, SourceContext sourceContext) throws Exception;
-   
-   ```
-
-   This method is called when the source connector is initialized. 
-
-   In this method, you can retrieve all connector specific settings through the passed-in `config` parameter and initialize all necessary resources. 
-   
-   For example, a Kafka connector can create a Kafka client in this `open` method.
-
-   Besides, Pulsar runtime also provides a `SourceContext` for the 
-   connector to access runtime resources for tasks like collecting metrics. The implementation can save the `SourceContext` for future use.
-
-2. Implement the {@inject: github:read:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method.
-
-   ```java
-   
-       /**
-       * Reads the next message from source.
-       * If source does not have any new messages, this call should block.
-       * @return next message from source.  The return result should never be null
-       * @throws Exception
-       */
-       Record read() throws Exception;
-   
-   ```
-
-   If nothing to return, the implementation should be blocking rather than returning `null`. 
-
-   The returned {@inject: github:Record:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should encapsulate the following information, which is needed by Pulsar IO runtime. 
-
-   * {@inject: github:Record:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should provide the following variables:
-
-     |Variable|Required|Description
-     |---|---|---
-     `TopicName`|No|Pulsar topic name from which the record is originated from.
-     `Key`|No| Messages can optionally be tagged with keys.

    For more information, see [Routing modes](concepts-messaging.md#routing-modes).|
-     `Value`|Yes|Actual data of the record.
-     `EventTime`|No|Event time of the record from the source.
-     `PartitionId`|No| If the record is originated from a partitioned source, it returns its `PartitionId`. 

    `PartitionId` is used as a part of the unique identifier by Pulsar IO runtime to deduplicate messages and achieve exactly-once processing guarantee.
-     `RecordSequence`|No|If the record is originated from a sequential source, it returns its `RecordSequence`.

    `RecordSequence` is used as a part of the unique identifier by Pulsar IO runtime to deduplicate messages and achieve exactly-once processing guarantee.
-     `Properties` |No| If the record carries user-defined properties, it returns those properties.
-     `DestinationTopic`|No|Topic to which message should be written.
-     `Message`|No|A class which carries data sent by users.

    For more information, see [Message.java](https://github.com/apache/pulsar/blob/master/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java).|
-
-    * {@inject: github:Record:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should provide the following methods:
-
-       Method|Description
-       |---|---
-       `ack` |Acknowledge that the record is fully processed.
-       `fail`|Indicate that the record fails to be processed.
-
-## Handle schema information
-
-Pulsar IO automatically handles the schema and provides a strongly typed API based on Java generics.
-If you know the schema type that you are producing, you can declare the Java class relative to that type in your sink declaration.
-
-```
-
-public class MySource implements Source {
-    public Record read() {}
-}
-
-```
-
-If you want to implement a source that works with any schema, you can go with `byte[]` (of `ByteBuffer`) and use Schema.AUTO_PRODUCE_BYTES().
-
-```
-
-public class MySource implements Source {
-    public Record read() {
-        
-        Schema wantedSchema = ....
-        Record myRecord = new MyRecordImplementation(); 
-        ....
-    }
-    class MyRecordImplementation implements Record {
-         public byte[] getValue() {
-            return ....encoded byte[]...that represents the value 
-         }
-         public Schema getSchema() {
-             return Schema.AUTO_PRODUCE_BYTES(wantedSchema);
-         }
-    }
-}
-
-```
-
-To handle the `KeyValue` type properly, follow the guidelines for your record implementation:
-- It must implement {@inject: github:Record:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/KVRecord.java} interface and implement `getKeySchema`,`getValueSchema`, and `getKeyValueEncodingType`
-- It must return a `KeyValue` object as `Record.getValue()`
-- It may return null in `Record.getSchema()`
-
-When Pulsar IO runtime encounters a `KVRecord`, it brings the following changes automatically:
-- Set properly the `KeyValueSchema`
-- Encode the Message Key and the Message Value according to the `KeyValueEncoding` (SEPARATED or INLINE)
-
-:::tip
-
-For more information about **how to create a source connector**, see {@inject: github:KafkaSource:/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java}.
-
-:::
-
-### Sink
-
-Developing a sink connector **is similar to** developing a source connector, that is, you need to implement the {@inject: github:Sink:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} interface, which means implementing the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method and the {@inject: github:write:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
-
-1. Implement the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
-
-   ```java
-   
-       /**
-       * Open connector with configuration
-       *
-       * @param config initialization config
-       * @param sinkContext
-       * @throws Exception IO type exceptions when opening a connector
-       */
-       void open(final Map config, SinkContext sinkContext) throws Exception;
-   
-   ```
-
-2. Implement the {@inject: github:write:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
-
-   ```java
-   
-       /**
-       * Write a message to Sink
-       * @param record record to write to sink
-       * @throws Exception
-       */
-       void write(Record record) throws Exception;
-   
-   ```
-
-   During the implementation, you can decide how to write the `Value` and
-   the `Key` to the actual source, and leverage all the provided information such as
-   `PartitionId` and `RecordSequence` to achieve different processing guarantees. 
-
-   You also need to ack records (if messages are sent successfully) or fail records (if messages fail to send). 
-
-## Handling Schema information
-
-Pulsar IO handles automatically the Schema and provides a strongly typed API based on Java generics.
-If you know the Schema type that you are consuming from you can declare the Java class relative to that type in your Sink declaration.
-
-```
-
-public class MySink implements Sink {
-    public void write(Record record) {}
-}
-
-```
-
-If you want to implement a sink that works with any schema, you can you go with the special GenericObject interface.
-
-```
-
-public class MySink implements Sink {
-    public void write(Record record) {
-        Schema schema = record.getSchema();
-        GenericObject genericObject = record.getValue();
-        if (genericObject != null) {
-            SchemaType type = genericObject.getSchemaType();
-            Object nativeObject = genericObject.getNativeObject();
-            ...
-        }
-        ....
-    }
-}
-
-```
-
-In the case of AVRO, JSON, and Protobuf records (schemaType=AVRO,JSON,PROTOBUF_NATIVE), you can cast the
-`genericObject` variable to `GenericRecord` and use `getFields()` and `getField()` API.
-You are able to access the native AVRO record using  `genericObject.getNativeObject()`.
-
-In the case of KeyValue type, you can access both the schema for the key and the schema for the value using this code.
-
-```
-
-public class MySink implements Sink {
-    public void write(Record record) {
-        Schema schema = record.getSchema();
-        GenericObject genericObject = record.getValue();
-        SchemaType type = genericObject.getSchemaType();
-        Object nativeObject = genericObject.getNativeObject();
-        if (type == SchemaType.KEY_VALUE) {
-            KeyValue keyValue = (KeyValue) nativeObject;
-            Object key = keyValue.getKey();
-            Object value = keyValue.getValue();
-        
-            KeyValueSchema keyValueSchema = (KeyValueSchema) schema;
-            Schema keySchema = keyValueSchema.getKeySchema();
-            Schema valueSchema = keyValueSchema.getValueSchema();
-        }
-        ....
-    }
-}
-
-```
-
-## Test
-
-Testing connectors can be challenging because Pulsar IO connectors interact with two systems
-that may be difficult to mock—Pulsar and the system to which the connector is connecting. 
-
-It is
-recommended writing special tests to test the connector functionalities as below
-while mocking the external service. 
-
-### Unit test
-
-You can create unit tests for your connector.
-
-### Integration test
-
-Once you have written sufficient unit tests, you can add
-separate integration tests to verify end-to-end functionality. 
-
-Pulsar uses [testcontainers](https://www.testcontainers.org/) **for all integration tests**. 
-
-:::tip
-
-For more information about **how to create integration tests for Pulsar connectors**, see {@inject: github:IntegrationTests:/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io}.
-
-:::
-
-## Package
-
-Once you've developed and tested your connector, you need to package it so that it can be submitted
-to a [Pulsar Functions](functions-overview.md) cluster. 
-
-There are two methods to
-work with Pulsar Functions' runtime, that is, [NAR](#nar) and [uber JAR](#uber-jar).
-
-:::note
-
-If you plan to package and distribute your connector for others to use, you are obligated to
-
-:::
-
-license and copyright your own code properly. Remember to add the license and copyright to
-all libraries your code uses and to your distribution. 
->
-> If you use the [NAR](#nar) method, the NAR plugin 
-automatically creates a `DEPENDENCIES` file in the generated NAR package, including the proper
-licensing and copyrights of all libraries of your connector.
->
-> For the runtime Java version, please refer to [Pulsar Runtime Java Version Recommendation](https://github.com/apache/pulsar/blob/master/README.md#pulsar-runtime-java-version-recommendation) according to your target Pulsar version.
-
-### NAR 
-
-**NAR** stands for NiFi Archive, which is a custom packaging mechanism used by Apache NiFi, to provide
-a bit of Java ClassLoader isolation. 
-
-:::tip
-
-For more information about **how NAR works**, see [here](https://medium.com/hashmapinc/nifi-nar-files-explained-14113f7796fd). 
-
-:::
-
-Pulsar uses the same mechanism for packaging **all** [built-in connectors](io-connectors.md). 
-
-The easiest approach to package a Pulsar connector is to create a NAR package using [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin).
-
-Include this [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin) in your maven project for your connector as below. 
-
-```xml
-
-
-  
-    org.apache.nifi
-    nifi-nar-maven-plugin
-    1.2.0
-  
-
-
-```
-
-You must also create a `resources/META-INF/services/pulsar-io.yaml` file with the following contents:
-
-```yaml
-
-name: connector name
-description: connector description
-sourceClass: fully qualified class name (only if source connector)
-sinkClass: fully qualified class name (only if sink connector)
-
-```
-
-For Gradle users, there is a [Gradle Nar plugin available on the Gradle Plugin Portal](https://plugins.gradle.org/plugin/io.github.lhotari.gradle-nar-plugin).
-
-:::tip
-
-For more information about an **how to use NAR for Pulsar connectors**, see {@inject: github:TwitterFirehose:/pulsar-io/twitter/pom.xml}.
-
-:::
-
-### Uber JAR
-
-An alternative approach is to create an **uber JAR** that contains all of the connector's JAR files
-and other resource files. No directory internal structure is necessary.
-
-You can use [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html) to create a uber JAR as below:
-
-```xml
-
-
-  org.apache.maven.plugins
-  maven-shade-plugin
-  3.1.1
-  
-    
-      package
-      
-        shade
-      
-      
-        
-          
-            *:*
-          
-        
-      
-    
-  
-
-
-```
-
-## Monitor
-
-Pulsar connectors enable you to move data in and out of Pulsar easily. It is important to ensure that the running connectors are healthy at any time. You can monitor Pulsar connectors that have been deployed with the following methods:
-
-- Check the metrics provided by Pulsar.
-
-  Pulsar connectors expose the metrics that can be collected and used for monitoring the health of **Java** connectors. You can check the metrics by following the [monitoring](deploy-monitoring.md) guide.
-
-- Set and check your customized metrics.
-
-  In addition to the metrics provided by Pulsar, Pulsar allows you to customize metrics for **Java** connectors. Function workers collect user-defined metrics to Prometheus automatically and you can check them in Grafana.
-
-Here is an example of how to customize metrics for a Java connector.
-
-````mdx-code-block
-
-
-
-```
-
-public class TestMetricSink implements Sink {
-
-        @Override
-        public void open(Map config, SinkContext sinkContext) throws Exception {
-            sinkContext.recordMetric("foo", 1);
-        }
-
-        @Override
-        public void write(Record record) throws Exception {
-
-        }
-
-        @Override
-        public void close() throws Exception {
-
-        }
-    }
-
-```
-
-
-
-
-````
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-kafka.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-kafka.md
deleted file mode 100644
index fa1a30ec1b35b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-kafka.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-id: io-kafka
-title: Kafka Connector
-sidebar_label: "Kafka Connector"
-original_id: io-kafka
----
-
-## Source
-
-The Kafka Source Connector is used to pull messages from Kafka topics and persist the messages
-to a Pulsar topic.
-
-### Source Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| bootstrapServers | `true` | `null` | A list of host/port pairs to use for establishing the initial connection to the Kafka cluster. |
-| groupId | `true` | `null` | A unique string that identifies the consumer group this consumer belongs to. |
-| fetchMinBytes | `false` | `null` | Minimum bytes expected for each fetch response. |
-| autoCommitEnabled | `false` | `false` | If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer. This committed offset will be used when the process fails as the position from which the new consumer will begin. | 
-| autoCommitIntervalMs | `false` | `null` | The frequency in ms that the consumer offsets are committed to zookeeper. |
-| sessionTimeoutMs | `false` | `null` | The timeout used to detect consumer failures when using Kafka's group management facility. |
-| topic | `true` | `null` | Topic name to receive records from Kafka |
-| keySerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for key that implements the org.apache.kafka.common.serialization.Serializer interface. |
-| valueSerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for value that implements the org.apache.kafka.common.serialization.Serializer interface. |
-
-## Sink
-
-The Kafka Sink Connector is used to pull messages from Pulsar topics and persist the messages
-to a Kafka topic.
-
-### Sink Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| acks | `true` | `null` | The kafka producer acks mode |
-| batchSize | `true` | `null` | The kafka producer batch size. |
-| maxRequestSize | `true` | `null` | The maximum size of a request in bytes. |
-| topic | `true` | `null` | Topic name to receive records from Kafka |
-| keySerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for value that implements the org.apache.kafka.common.serialization.Serializer interface. |
-| valueSerializerClass | false | org.apache.kafka.common.serialization.StringSerializer | Serializer class for value that implements the org.apache.kafka.common.serialization.Serializer interface. |
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-kinesis.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-kinesis.md
deleted file mode 100644
index abc2267175895..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-kinesis.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-id: io-kinesis
-title: AWS Kinesis Connector
-sidebar_label: "AWS Kinesis Connector"
-original_id: io-kinesis
----
-
-## Sink
-
-The Kinesis Sink connector is used to pull data from Pulsar topics and persist the data into
-AWS Kinesis.
-
-### Sink Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| awsEndpoint | `true` | null | kinesis end-point url can be found at : https://docs.aws.amazon.com/general/latest/gr/rande.html |
-| awsRegion | `true` | null | appropriate aws region eg: us-west-1, us-west-2 |
-| awsKinesisStreamName | `true` | null | kinesis stream name |
-| awsCredentialPluginName | `false` | null | Fully-Qualified class name of implementation of {@inject: github:AwsCredentialProviderPlugin:/pulsar-io/kinesis/src/main/java/org/apache/pulsar/io/kinesis/AwsCredentialProviderPlugin.java}. It is a factory class which creates an AWSCredentialsProvider that will be used by Kinesis Sink. If it is empty then KinesisSink will create a default AWSCredentialsProvider which accepts json-map of credentials in `awsCredentialPluginParam` |
-| awsCredentialPluginParam | `false` | null | json-parameters to initialize `AwsCredentialsProviderPlugin` |
-| messageFormat | `true` | `ONLY_RAW_PAYLOAD` | Message format in which kinesis sink converts pulsar messages and publishes to kinesis streams |
-
-### Message Formats
-
-The available message formats are listed as below:
-
-#### **ONLY_RAW_PAYLOAD**
-
-Kinesis sink directly publishes pulsar message payload as a message into the configured kinesis stream.
-
-#### **FULL_MESSAGE_IN_JSON**
-
-Kinesis sink creates a json payload with pulsar message payload, properties and encryptionCtx, and publishes json payload into the configured kinesis stream.
-
-#### **FULL_MESSAGE_IN_FB**
-
-Kinesis sink creates a flatbuffer serialized paylaod with pulsar message payload, properties and encryptionCtx, and publishes flatbuffer payload into the configured kinesis stream.
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-managing.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-managing.md
deleted file mode 100644
index c25e15641efb8..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-managing.md
+++ /dev/null
@@ -1,193 +0,0 @@
----
-id: io-managing
-title: Managing Connectors
-sidebar_label: "Managing Connectors"
-original_id: io-managing
----
-
-This section describes how to manage Pulsar IO connectors in a Pulsar cluster. You will learn how to:
-
-- Deploy builtin connectors
-- Monitor and update running connectors with Pulsar Admin CLI
-- Deploy customized connectors
-- Upgrade a connector
-
-## Using Builtin Connectors
-
-Pulsar bundles several [builtin connectors](io-overview.md#working-with-connectors) that should be used for moving data in and out
-of commonly used systems such as databases, messaging systems. Getting set up to use these builtin connectors is simple. You can follow
-the [instructions](getting-started-standalone.md#installing-builtin-connectors) on installing builtin connectors. After setup, all
-the builtin connectors will be automatically discovered by Pulsar brokers (or function-workers), so no additional installation steps are
-required.
-
-## Configuring Connectors
-
-Configuring Pulsar IO connectors is straightforward. What you need to do is to provide a yaml configuration file when your [run connectors](#running-connectors).
-The yaml configuration file basically tells Pulsar where to locate the sources and sinks and how to connect those sources and sinks with Pulsar topics.
-
-Below is an example yaml configuration file for Cassandra Sink:
-
-```shell
-
-tenant: public
-namespace: default
-name: cassandra-test-sink
-...
-# cassandra specific config
-configs:
-    roots: "localhost:9042"
-    keyspace: "pulsar_test_keyspace"
-    columnFamily: "pulsar_test_table"
-    keyname: "key"
-    columnName: "col"
-
-```
-
-The example yaml basically tells Pulsar which Cassandra cluster to connect, what is the `keyspace` and `columnFamily` to be used in Cassandra for collecting data,
-and how to map a Pulsar message into Cassandra table key and columns.
-
-For details, consult the documentation for [individual connectors](io-overview.md#working-with-connectors).
-
-## Running Connectors
-
-Pulsar connectors can be managed using the [`source`](reference-pulsar-admin.md#source) and [`sink`](reference-pulsar-admin.md#sink) commands of the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool.
-
-### Running sources
-
-You can submit a source to be run in an existing Pulsar cluster using a command of this form:
-
-```bash
-
-$ ./bin/pulsar-admin source create --className   --jar  --tenant  --namespace  --name  --destinationTopicName 
-
-```
-
-Here’s an example command:
-
-```bash
-
-bin/pulsar-admin source create --className org.apache.pulsar.io.twitter.TwitterFireHose --jar ~/application.jar --tenant test --namespace ns1 --name twitter-source --destinationTopicName twitter_data
-
-```
-
-Instead of submitting a source to run on an existing Pulsar cluster, you alternatively can run a source as a process on your local machine:
-
-```bash
-
-bin/pulsar-admin source localrun --className  org.apache.pulsar.io.twitter.TwitterFireHose --jar ~/application.jar --tenant test --namespace ns1 --name twitter-source --destinationTopicName twitter_data
-
-```
-
-If you are submitting a built-in source, you don't need to specify `--className` and `--jar`.
-You can simply specify the source type `--source-type`. The command to submit a built-in source is
-in following form:
-
-```bash
-
-./bin/pulsar-admin source create \
-    --tenant  \
-    --namespace  \
-    --name  \
-    --destinationTopicName  \
-    --source-type 
-
-```
-
-Here's an example to submit a Kafka source:
-
-```bash
-
-./bin/pulsar-admin source create \
-    --tenant test-tenant \
-    --namespace test-namespace \
-    --name test-kafka-source \
-    --destinationTopicName pulsar_sink_topic \
-    --source-type kafka
-
-```
-
-### Running Sinks
-
-You can submit a sink to be run in an existing Pulsar cluster using a command of this form:
-
-```bash
-
-./bin/pulsar-admin sink create --className   --jar  --tenant test --namespace  --name  --inputs 
-
-```
-
-Here’s an example command:
-
-```bash
-
-./bin/pulsar-admin sink create --className  org.apache.pulsar.io.cassandra --jar ~/application.jar --tenant test --namespace ns1 --name cassandra-sink --inputs test_topic
-
-```
-
-Instead of submitting a sink to run on an existing Pulsar cluster, you alternatively can run a sink as a process on your local machine:
-
-```bash
-
-./bin/pulsar-admin sink localrun --className  org.apache.pulsar.io.cassandra --jar ~/application.jar --tenant test --namespace ns1 --name cassandra-sink --inputs test_topic
-
-```
-
-If you are submitting a built-in sink, you don't need to specify `--className` and `--jar`.
-You can simply specify the sink type `--sink-type`. The command to submit a built-in sink is
-in following form:
-
-#### Note
-
-> The `sink-type` parameter of the currently built-in connectors is determined by the setting of the `name` parameter specified in the pulsar-io.yaml file.
-
-```bash
-
-./bin/pulsar-admin sink create \
-    --tenant  \
-    --namespace  \
-    --name  \
-    --inputs  \
-    --sink-type 
-
-```
-
-Here's an example to submit a Cassandra sink:
-
-```bash
-
-./bin/pulsar-admin sink create \
-    --tenant test-tenant \
-    --namespace test-namespace \
-    --name test-cassandra-sink \
-    --inputs pulsar_input_topic \
-    --sink-type cassandra
-
-```
-
-## Monitoring Connectors
-
-Since Pulsar IO connectors are running as [Pulsar Functions](functions-overview.md), so you can use [`functions`](reference-pulsar-admin.md#source) commands
-available in the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool.
-
-### Retrieve Connector Metadata
-
-```
-
-bin/pulsar-admin functions get \
-    --tenant  \
-    --namespace  \
-    --name 
-
-```
-
-### Retrieve Connector Running Status
-
-```
-
-bin/pulsar-admin functions getstatus \
-    --tenant  \
-    --namespace  \
-    --name 
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-overview.md
deleted file mode 100644
index ea49e4b042e8c..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-overview.md
+++ /dev/null
@@ -1,163 +0,0 @@
----
-id: io-overview
-title: Pulsar connector overview
-sidebar_label: "Overview"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-Messaging systems are most powerful when you can easily use them with external systems like databases and other messaging systems.
-
-**Pulsar IO connectors** enable you to easily create, deploy, and manage connectors that interact with external systems, such as [Apache Cassandra](https://cassandra.apache.org), [Aerospike](https://www.aerospike.com), and many others.
-
-
-## Concept
-
-Pulsar IO connectors come in two types: **source** and **sink**.
-
-This diagram illustrates the relationship between source, Pulsar, and sink:
-
-![Pulsar IO diagram](/assets/pulsar-io.png "Pulsar IO connectors (sources and sinks)")
-
-
-### Source
-
-> Sources **feed data from external systems into Pulsar**.
-
-Common sources include other messaging systems and firehose-style data pipeline APIs.
-
-For the complete list of Pulsar built-in source connectors, see [source connector](io-connectors.md#source-connector).
-
-### Sink
-
-> Sinks **feed data from Pulsar into external systems**.
-
-Common sinks include other messaging systems and SQL and NoSQL databases.
-
-For the complete list of Pulsar built-in sink connectors, see [sink connector](io-connectors.md#sink-connector).
-
-## Processing guarantee
-
-Processing guarantees are used to handle errors when writing messages to Pulsar topics.
-  
-> Pulsar connectors and Functions use the **same** processing guarantees as below.
-
-Delivery semantic | Description
-:------------------|:-------
-`at-most-once` | Each message sent to a connector is to be **processed once** or **not to be processed**.
-`at-least-once`  | Each message sent to a connector is to be **processed once** or **more than once**.
-`effectively-once` | Each message sent to a connector has **one output associated** with it.
-
-> Processing guarantees for connectors not just rely on Pulsar guarantee but also **relate to external systems**, that is, **the implementation of source and sink**.
-
-* Source: Pulsar ensures that writing messages to Pulsar topics respects to the processing guarantees. It is within Pulsar's control.
-
-* Sink: the processing guarantees rely on the sink implementation. If the sink implementation does not handle retries in an idempotent way, the sink does not respect to the processing guarantees.
-
-### Set
-
-When creating a connector, you can set the processing guarantee with the following semantics:
-
-* ATLEAST_ONCE
-  
-* ATMOST_ONCE
-  
-* EFFECTIVELY_ONCE
-
-> If `--processing-guarantees` is not specified when creating a connector, the default semantic is `ATLEAST_ONCE`.
-
-Here takes **Admin CLI** as an example. For more information about **REST API** or **JAVA Admin API**, see [here](io-use.md#create). 
-
-````mdx-code-block
-
-
-
-
-```bash
-
-$ bin/pulsar-admin sources create \
-  --processing-guarantees ATMOST_ONCE \
-  # Other source configs
-
-```
-
-For more information about the options of `pulsar-admin sources create`, see [here](reference-connector-admin.md#create).
-
-
-
-
-```bash
-
-$ bin/pulsar-admin sinks create \
-  --processing-guarantees EFFECTIVELY_ONCE \
-  # Other sink configs
-
-```
-
-For more information about the options of `pulsar-admin sinks create`, see [here](reference-connector-admin.md#create-1).
-
-
-
-
-````
-
-### Update 
-
-After creating a connector, you can update the processing guarantee with the following semantics:
-
-* ATLEAST_ONCE
-  
-* ATMOST_ONCE
-  
-* EFFECTIVELY_ONCE
-  
-Here takes **Admin CLI** as an example. For more information about **REST API** or **JAVA Admin API**, see [here](io-use.md#create). 
-
-````mdx-code-block
-
-
-
-
-```bash
-
-$ bin/pulsar-admin sources update \
-  --processing-guarantees EFFECTIVELY_ONCE \
-  # Other source configs
-
-```
-
-For more information about the options of `pulsar-admin sources update`, see [here](reference-connector-admin.md#update).
-
-
-
-
-```bash
-
-$ bin/pulsar-admin sinks update \
-  --processing-guarantees ATMOST_ONCE \
-  # Other sink configs
-
-```
-
-For more information about the options of `pulsar-admin sinks update`, see [here](reference-connector-admin.md#update-1).
-
-
-
-
-````
-
-
-## Work with connector
-
-You can manage Pulsar connectors (for example, create, update, start, stop, restart, reload, delete and perform other operations on connectors) via the [Connector Admin CLI](reference-connector-admin.md) with [sources](io-cli.md#sources) and [sinks](io-cli.md#sinks) subcommands.
-
-Connectors (sources and sinks) and Functions are components of instances, and they all run on Functions workers. When managing a source, sink or function via [Connector Admin CLI](reference-connector-admin.md) or [Functions Admin CLI](functions-cli.md), an instance is started on a worker. For more information, see [Functions worker](functions-worker.md#run-functions-worker-separately).
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-quickstart.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-quickstart.md
deleted file mode 100644
index 178d70d0a8b63..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-quickstart.md
+++ /dev/null
@@ -1,473 +0,0 @@
----
-id: io-quickstart
-title: "Tutorial: Connecting Pulsar with Apache Cassandra"
-sidebar_label: "Getting started"
-original_id: io-quickstart
----
-
-This tutorial provides a hands-on look at how you can move data out of Pulsar without writing a single line of code.
-It is helpful to review the [concepts](io-overview.md) for Pulsar I/O in tandem with running the steps in this guide
-to gain a deeper understanding. At the end of this tutorial, you will be able to:
-
-- Connect your Pulsar cluster with your Cassandra cluster
-
-:::tip
-
-1. These instructions assume you are running Pulsar in [standalone mode](getting-started-standalone.md). However all
-the commands used in this tutorial should be able to be used in a multi-nodes Pulsar cluster without any changes.
-2. All the instructions are assumed to run at the root directory of a Pulsar binary distribution.
-
-:::
-
-## Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:binary_release_url
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-## Installing Builtin Connectors
-
-Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-If you would like to enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz /path/to/apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ cp -r apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-## Start Pulsar Service
-
-```bash
-
-bin/pulsar standalone
-
-```
-
-All the components of a Pulsar service will start in order. You can curl those pulsar service endpoints to make sure Pulsar service is up running correctly.
-
-1. Check pulsar binary protocol port.
-
-```bash
-
-telnet localhost 6650
-
-```
-
-2. Check pulsar function cluster
-
-```bash
-
-curl -s http://localhost:8080/admin/v2/functions/cluster
-
-```
-
-Example output:
-
-```shell
-
-[{"workerId":"c-standalone-fw-localhost-6750","workerHostname":"localhost","port":6750}]
-
-```
-
-3. Make sure public tenant and default namespace exist
-
-```bash
-
-curl -s http://localhost:8080/admin/v2/namespaces/public
-
-```
-
-Example outoupt:
-
-```shell
-
-["public/default","public/functions"]
-
-```
-
-4. All builtin connectors should be listed as available.
-
-```bash
-
-curl -s http://localhost:8080/admin/v2/functions/connectors
-
-```
-
-Example output:
-
-```json
-
-[{"name":"aerospike","description":"Aerospike database sink","sinkClass":"org.apache.pulsar.io.aerospike.AerospikeStringSink"},{"name":"cassandra","description":"Writes data into Cassandra","sinkClass":"org.apache.pulsar.io.cassandra.CassandraStringSink"},{"name":"kafka","description":"Kafka source and sink connector","sourceClass":"org.apache.pulsar.io.kafka.KafkaStringSource","sinkClass":"org.apache.pulsar.io.kafka.KafkaStringSink"},{"name":"kinesis","description":"Kinesis sink connector","sinkClass":"org.apache.pulsar.io.kinesis.KinesisSink"},{"name":"rabbitmq","description":"RabbitMQ source connector","sourceClass":"org.apache.pulsar.io.rabbitmq.RabbitMQSource"},{"name":"twitter","description":"Ingest data from Twitter firehose","sourceClass":"org.apache.pulsar.io.twitter.TwitterFireHose"}]
-
-```
-
-If an error occurred while starting Pulsar service, you may be able to seen exception at the terminal you are running `pulsar/standalone`,
-or you can navigate the `logs` directory under the Pulsar directory to view the logs.
-
-## Connect Pulsar to Apache Cassandra
-
-> Make sure you have docker available at your laptop. If you don't have docker installed, you can follow the [instructions](https://docs.docker.com/docker-for-mac/install/).
-
-We are using `cassandra` docker image to start a single-node cassandra cluster in Docker.
-
-### Setup the Cassandra Cluster
-
-#### Start a Cassandra Cluster
-
-```bash
-
-docker run -d --rm --name=cassandra -p 9042:9042 cassandra
-
-```
-
-Before moving to next steps, make sure the cassandra cluster is up running.
-
-1. Make sure the docker process is running.
-
-```bash
-
-docker ps
-
-```
-
-2. Check the cassandra logs to make sure cassandra process is running as expected.
-
-```bash
-
-docker logs cassandra
-
-```
-
-3. Check the cluster status
-
-```bash
-
-docker exec cassandra nodetool status
-
-```
-
-Example output:
-
-```
-
-Datacenter: datacenter1
-=======================
-Status=Up/Down
-|/ State=Normal/Leaving/Joining/Moving
---  Address     Load       Tokens       Owns (effective)  Host ID                               Rack
-UN  172.17.0.2  103.67 KiB  256          100.0%            af0e4b2f-84e0-4f0b-bb14-bd5f9070ff26  rack1
-
-```
-
-#### Create keyspace and table
-
-We are using `cqlsh` to connect to the cassandra cluster to create keyspace and table.
-
-```bash
-
-$ docker exec -ti cassandra cqlsh localhost
-Connected to Test Cluster at localhost:9042.
-[cqlsh 5.0.1 | Cassandra 3.11.2 | CQL spec 3.4.4 | Native protocol v4]
-Use HELP for help.
-cqlsh>
-
-```
-
-All the following commands are executed in `cqlsh`.
-
-##### Create keyspace `pulsar_test_keyspace`
-
-```bash
-
-cqlsh> CREATE KEYSPACE pulsar_test_keyspace WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};
-
-```
-
-#### Create table `pulsar_test_table`
-
-```bash
-
-cqlsh> USE pulsar_test_keyspace;
-cqlsh:pulsar_test_keyspace> CREATE TABLE pulsar_test_table (key text PRIMARY KEY, col text);
-
-```
-
-### Configure a Cassandra Sink
-
-Now that we have a Cassandra cluster running locally. In this section, we will configure a Cassandra sink connector.
-The Cassandra sink connector will read messages from a Pulsar topic and write the messages into a Cassandra table.
-
-In order to run a Cassandra sink connector, you need to prepare a yaml config file including informations that Pulsar IO
-runtime needs to know. For example, how Pulsar IO can find the cassandra cluster, what is the keyspace and table that
-Pulsar IO will be using for writing Pulsar messages to.
-
-Create a file `examples/cassandra-sink.yml` and edit it to fill in following content:
-
-```
-
-configs:
-    roots: "localhost:9042"
-    keyspace: "pulsar_test_keyspace"
-    columnFamily: "pulsar_test_table"
-    keyname: "key"
-    columnName: "col"
-
-```
-
-To learn more about Cassandra Connector, see [Cassandra Connector](io-cassandra.md).
-
-### Submit a Cassandra Sink
-
-Pulsar provides the [CLI](reference-cli-tools.md) for running and managing Pulsar I/O connectors.
-
-We can run following command to sink a sink connector with type `cassandra` and config file `examples/cassandra-sink.yml`.
-
-#### Note
-
-> The `sink-type` parameter of the currently built-in connectors is determined by the setting of the `name` parameter specified in the pulsar-io.yaml file.
-
-```shell
-
-bin/pulsar-admin sink create \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink \
-    --sink-type cassandra \
-    --sinkConfigFile examples/cassandra-sink.yml \
-    --inputs test_cassandra
-
-```
-
-Once the command is executed, Pulsar will create a sink connector named `cassandra-test-sink` and the sink connector will be running
-as a Pulsar Function and write the messages produced in topic `test_cassandra` to Cassandra table `pulsar_test_table`.
-
-### Inspect the Cassandra Sink
-
-Since an IO connector is running as [Pulsar Functions](functions-overview.md), you can use [functions CLI](reference-pulsar-admin.md#functions)
-for inspecting and managing the IO connectors.
-
-#### Retrieve Sink Info
-
-```bash
-
-bin/pulsar-admin functions get \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
-Example output:
-
-```shell
-
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "cassandra-test-sink",
-  "className": "org.apache.pulsar.functions.api.utils.IdentityFunction",
-  "autoAck": true,
-  "parallelism": 1,
-  "source": {
-    "topicsToSerDeClassName": {
-      "test_cassandra": ""
-    }
-  },
-  "sink": {
-    "configs": "{\"roots\":\"cassandra\",\"keyspace\":\"pulsar_test_keyspace\",\"columnFamily\":\"pulsar_test_table\",\"keyname\":\"key\",\"columnName\":\"col\"}",
-    "builtin": "cassandra"
-  },
-  "resources": {}
-}
-
-```
-
-#### Check Sink Running Status
-
-```bash
-
-bin/pulsar-admin functions getstatus \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
-Example output:
-
-```shell
-
-{
-  "functionStatusList": [
-    {
-      "running": true,
-      "instanceId": "0",
-      "metrics": {
-        "metrics": {
-          "__total_processed__": {},
-          "__total_successfully_processed__": {},
-          "__total_system_exceptions__": {},
-          "__total_user_exceptions__": {},
-          "__total_serialization_exceptions__": {},
-          "__avg_latency_ms__": {}
-        }
-      },
-      "workerId": "c-standalone-fw-localhost-6750"
-    }
-  ]
-}
-
-```
-
-### Verify the Cassandra Sink
-
-Now lets produce some messages to the input topic of the Cassandra sink `test_cassandra`.
-
-```bash
-
-for i in {0..9}; do bin/pulsar-client produce -m "key-$i" -n 1 test_cassandra; done
-
-```
-
-Inspect the sink running status again. You should be able to see 10 messages are processed by the Cassandra sink.
-
-```bash
-
-bin/pulsar-admin functions getstatus \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
-Example output:
-
-```shell
-
-{
-  "functionStatusList": [
-    {
-      "running": true,
-      "numProcessed": "11",
-      "numSuccessfullyProcessed": "11",
-      "lastInvocationTime": "1532031040117",
-      "instanceId": "0",
-      "metrics": {
-        "metrics": {
-          "__total_processed__": {
-            "count": 5.0,
-            "sum": 5.0,
-            "max": 5.0
-          },
-          "__total_successfully_processed__": {
-            "count": 5.0,
-            "sum": 5.0,
-            "max": 5.0
-          },
-          "__total_system_exceptions__": {},
-          "__total_user_exceptions__": {},
-          "__total_serialization_exceptions__": {},
-          "__avg_latency_ms__": {}
-        }
-      },
-      "workerId": "c-standalone-fw-localhost-6750"
-    }
-  ]
-}
-
-```
-
-Finally, lets inspect the results in Cassandra using `cqlsh`
-
-```bash
-
-docker exec -ti cassandra cqlsh localhost
-
-```
-
-Select the rows from the Cassandra table `pulsar_test_table`:
-
-```bash
-
-cqlsh> use pulsar_test_keyspace;
-cqlsh:pulsar_test_keyspace> select * from pulsar_test_table;
-
- key    | col
---------+--------
-  key-5 |  key-5
-  key-0 |  key-0
-  key-9 |  key-9
-  key-2 |  key-2
-  key-1 |  key-1
-  key-3 |  key-3
-  key-6 |  key-6
-  key-7 |  key-7
-  key-4 |  key-4
-  key-8 |  key-8
-
-```
-
-### Delete the Cassandra Sink
-
-```shell
-
-bin/pulsar-admin sink delete \
-    --tenant public \
-    --namespace default \
-    --name cassandra-test-sink
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-rabbitmq.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-rabbitmq.md
deleted file mode 100644
index b99ba35e81a39..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-rabbitmq.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-id: io-rabbitmq
-title: RabbitMQ Connector
-sidebar_label: "RabbitMQ Connector"
-original_id: io-rabbitmq
----
-
-## Source
-
-The RabbitMQ Source connector is used for receiving messages from a RabbitMQ cluster and writing
-messages to Pulsar topics.
-
-### Source Configuration Options
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| `connectionName` | `true` | `null` | A new broker connection name. |
-| `amqUri` | `true` | `null` | An AMQP URI: host, port, username, password and virtual host. |
-| `queueName` | `true` | `null` | RabbitMQ queue name. |
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/io-twitter.md b/site2/website/versioned_docs/version-2.1.1-incubating/io-twitter.md
deleted file mode 100644
index b326ce8dc7433..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/io-twitter.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-id: io-twitter
-title: Twitter Firehose Connector
-sidebar_label: "Twitter Firehose Connector"
-original_id: io-twitter
----
-
-The Twitter Firehose connector is used for receiving tweets from Twitter Firehose and writing
-the tweets to Pulsar topics.
-
-## Source Configuration Options
-
-You can get the OAuth credentials from [Twitter Developers Portal](https://developer.twitter.com/en.html).
-
-| Name | Required | Default | Description |
-|------|----------|---------|-------------|
-| consumerKey | true | null | Twitter OAuth Consumer Key |
-| consumerSecret | true | null | Twitter OAuth Consumer Secret |
-| token | true | null | Twitter OAuth Token |
-| tokenSecret | true | null | Twitter OAuth Secret |
-| clientName | false | `openconnector-twitter-source"`| Client name |
-| clientHosts | false | `https://stream.twitter.com` | Twitter Firehose hosts that client connects to |
-| clientBufferSize | false | `50000` | The buffer size for buffering tweets fetched from Twitter Firehose |
-
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/pulsar-2.0.md b/site2/website/versioned_docs/version-2.1.1-incubating/pulsar-2.0.md
deleted file mode 100644
index 07fba365e9ff2..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/pulsar-2.0.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-id: pulsar-2.0
-title: Pulsar 2.0
-sidebar_label: "Pulsar 2.0"
----
-
-Pulsar 2.0 is a major new release for Pulsar that brings some bold changes to the platform, including [simplified topic names](#topic-names), the addition of the [Pulsar Functions](functions-overview.md) feature, some terminology changes, and more.
-
-## New features in Pulsar 2.0
-
-Feature | Description
-:-------|:-----------
-[Pulsar Functions](functions-overview.md) | A lightweight compute option for Pulsar
-
-## Major changes
-
-There are a few major changes that you should be aware of, as they may significantly impact your day-to-day usage.
-
-### Properties versus tenants
-
-Previously, Pulsar had a concept of properties. A property is essentially the exact same thing as a tenant, so the "property" terminology has been removed in version 2.0. The [`pulsar-admin properties`](reference-pulsar-admin.md#pulsar-admin) command-line interface, for example, has been replaced with the [`pulsar-admin tenants`](reference-pulsar-admin.md#pulsar-admin-tenants) interface. In some cases the properties terminology is still used but is now considered deprecated and will be removed entirely in a future release.
-
-### Topic names
-
-Prior to version 2.0, *all* Pulsar topics had the following form:
-
-```http
-
-{persistent|non-persistent}://property/cluster/namespace/topic
-
-```
-
-Two important changes have been made in Pulsar 2.0:
-
-* There is no longer a [cluster component](#no-cluster)
-* Properties have been [renamed to tenants](#tenants)
-* You can use a [flexible](#flexible-topic-naming) naming system to shorten many topic names
-* `/` is not allowed in topic name
-
-#### No cluster component
-
-The cluster component has been removed from topic names. Thus, all topic names now have the following form:
-
-```http
-
-{persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-> Existing topics that use the legacy name format will continue to work without any change, and there are no plans to change that.
-
-
-#### Flexible topic naming
-
-All topic names in Pulsar 2.0 internally have the form shown [above](#no-cluster-component) but you can now use shorthand names in many cases (for the sake of simplicity). The flexible naming system stems from the fact that there is now a default topic type, tenant, and namespace:
-
-Topic aspect | Default
-:------------|:-------
-topic type | `persistent`
-tenant | `public`
-namespace | `default`
-
-The table below shows some example topic name translations that use implicit defaults:
-
-Input topic name | Translated topic name
-:----------------|:---------------------
-`my-topic` | `persistent://public/default/my-topic`
-`my-tenant/my-namespace/my-topic` | `persistent://my-tenant/my-namespace/my-topic`
-
-> For [non-persistent topics](concepts-messaging.md#non-persistent-topics) you'll need to continue to specify the entire topic name, as the default-based rules for persistent topic names don't apply. Thus you cannot use a shorthand name like `non-persistent://my-topic` and would need to use `non-persistent://public/default/my-topic` instead
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/pulsar-admin.md b/site2/website/versioned_docs/version-2.1.1-incubating/pulsar-admin.md
deleted file mode 100644
index ff0c575b31596..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/pulsar-admin.md
+++ /dev/null
@@ -1,3394 +0,0 @@
----
-id: pulsar-admin
-title: Pulsar admin CLI
-sidebar_label: "Pulsar Admin CLI"
-original_id: pulsar-admin
----
-
-> **Important**
->
-> This page is deprecated and not updated anymore. For the latest and complete information about `Pulsar admin`, including commands, flags, descriptions, and more, see [Pulsar admin doc](https://pulsar.apache.org/tools/pulsar-admin/)
-
-The `pulsar-admin` tool enables you to manage Pulsar installations, including clusters, brokers, namespaces, tenants, and more.
-
-Usage
-
-```bash
-
-$ pulsar-admin command
-
-```
-
-Commands
-* `broker-stats`
-* `brokers`
-* `clusters`
-* `functions`
-* `functions-worker`
-* `namespaces`
-* `ns-isolation-policy`
-* `sources`
-
-  For more information, see [here](io-cli.md#sources)
-* `sinks`
-  
-  For more information, see [here](io-cli.md#sinks)
-* `topics`
-* `tenants`
-* `resource-quotas`
-* `schemas`
-
-## `broker-stats`
-
-Operations to collect broker statistics
-
-```bash
-
-$ pulsar-admin broker-stats subcommand
-
-```
-
-Subcommands
-* `allocator-stats`
-* `topics(destinations)`
-* `mbeans`
-* `monitoring-metrics`
-* `load-report`
-
-
-### `allocator-stats`
-
-Dump allocator stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats allocator-stats allocator-name
-
-```
-
-### `topics(destinations)`
-
-Dump topic stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats topics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-### `mbeans`
-
-Dump Mbean stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats mbeans options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `monitoring-metrics`
-
-Dump metrics for monitoring
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats monitoring-metrics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `load-report`
-
-Dump broker load-report
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats load-report
-
-```
-
-## `brokers`
-
-Operations about brokers
-
-```bash
-
-$ pulsar-admin brokers subcommand
-
-```
-
-Subcommands
-* `list`
-* `namespaces`
-* `update-dynamic-config`
-* `list-dynamic-config`
-* `get-all-dynamic-config`
-* `get-internal-config`
-* `get-runtime-config`
-* `healthcheck`
-
-### `list`
-List active brokers of the cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list cluster-name
-
-```
-
-### `leader-broker`
-Get the information of the leader broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers leader-broker
-
-```
-
-### `namespaces`
-List namespaces owned by the broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers namespaces cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--url`|The URL for the broker||
-
-
-### `update-dynamic-config`
-Update a broker's dynamic service configuration
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers update-dynamic-config options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--config`|Service configuration parameter name||
-|`--value`|Value for the configuration parameter value specified using the `--config` flag||
-
-
-### `list-dynamic-config`
-Get list of updatable configuration name
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list-dynamic-config
-
-```
-
-### `delete-dynamic-config`
-Delete dynamic-serviceConfiguration of broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers delete-dynamic-config options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--config`|Service configuration parameter name||
-
-
-### `get-all-dynamic-config`
-Get all overridden dynamic-configuration values
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-all-dynamic-config
-
-```
-
-### `get-internal-config`
-Get internal configuration information
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-internal-config
-
-```
-
-### `get-runtime-config`
-Get runtime configuration values
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-runtime-config
-
-```
-
-### `healthcheck`
-Run a health check against the broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers healthcheck
-
-```
-
-## `clusters`
-Operations about clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters subcommand
-
-```
-
-Subcommands
-* `get`
-* `create`
-* `update`
-* `delete`
-* `list`
-* `update-peer-clusters`
-* `get-peer-clusters`
-* `get-failure-domain`
-* `create-failure-domain`
-* `update-failure-domain`
-* `delete-failure-domain`
-* `list-failure-domains`
-
-
-### `get`
-Get the configuration data for the specified cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get cluster-name
-
-```
-
-### `create`
-Provisions a new cluster. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters create cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `update`
-Update the configuration for a cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `delete`
-Deletes an existing cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters delete cluster-name
-
-```
-
-### `list`
-List the existing clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters list
-
-```
-
-### `update-peer-clusters`
-Update peer cluster names
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update-peer-clusters cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--peer-clusters`|Comma separated peer cluster names (Pass empty string "" to delete list)||
-
-### `get-peer-clusters`
-Get list of peer clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get-peer-clusters
-
-```
-
-### `get-failure-domain`
-Get the configuration brokers of a failure domain
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `create-failure-domain`
-Create a new failure domain for a cluster (updates it if already created)
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters create-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-list`|Comma separated broker list||
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `update-failure-domain`
-Update failure domain for a cluster (creates a new one if not exist)
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-list`|Comma separated broker list||
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `delete-failure-domain`
-Delete an existing failure domain
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters delete-failure-domain cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--domain-name`|The failure domain name, which is a logical domain under a Pulsar cluster||
-
-### `list-failure-domains`
-List the existing failure domains for a cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters list-failure-domains cluster-name
-
-```
-
-## `functions`
-
-A command-line interface for Pulsar Functions
-
-Usage
-
-```bash
-
-$ pulsar-admin functions subcommand
-
-```
-
-Subcommands
-* `localrun`
-* `create`
-* `delete`
-* `update`
-* `get`
-* `restart`
-* `stop`
-* `start`
-* `status`
-* `stats`
-* `list`
-* `querystate`
-* `putstate`
-* `trigger`
-
-
-### `localrun`
-Run the Pulsar Function locally (rather than deploying it to the Pulsar cluster)
-
-
-Usage
-
-```bash
-
-$ pulsar-admin functions localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The cpu in cores that need to be allocated per function instance(applicable only to docker runtime)||
-|`--ram`|The ram in bytes that need to be allocated per function instance(applicable only to process/docker runtime)||
-|`--disk`|The disk in bytes that need to be allocated per function instance(applicable only to docker runtime)||
-|`--auto-ack`|Whether or not the framework will automatically acknowledge messages||
-|`--subs-name`|Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer||
-|`--broker-service-url `|The URL of the Pulsar broker||
-|`--classname`|The function's class name||
-|`--custom-serde-inputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--custom-schema-inputs`|The map of input topics to Schema class names (as a JSON string)||
-|`--client-auth-params`|Client authentication param||
-|`--client-auth-plugin`|Client authentication plugin using which function-process can connect to broker||
-|`--function-config-file`|The path to a YAML config file specifying the function's configuration||
-|`--hostname-verification-enabled`|Enable hostname verification|false|
-|`--instance-id-offset`|Start the instanceIds from this offset|0|
-|`--inputs`|The function's input topic or topics (multiple topics can be specified as a comma-separated list)||
-|`--log-topic`|The topic to which the function's logs are produced||
-|`--jar`|Path to the jar file for the function (if the function is written in Java). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--output`|The function's output topic (If none is specified, no output is written)||
-|`--output-serde-classname`|The SerDe class to be used for messages output by the function||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processing-guarantees`|The processing guarantees (aka delivery semantics) applied to the function. Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]|ATLEAST_ONCE|
-|`--py`|Path to the main Python file/Python Wheel file for the function (if the function is written in Python). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--go`|Path to the main Go executable binary for the function (if the function is written in Go). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--schema-type`|The builtin schema type or custom schema class name to be used for messages output by the function||
-|`--sliding-interval-count`|The number of messages after which the window slides||
-|`--sliding-interval-duration-ms`|The time duration after which the window slides||
-|`--state-storage-service-url`|The URL for the state storage service. By default, it it set to the service URL of the Apache BookKeeper. This service URL must be added manually when the Pulsar Function runs locally. ||
-|`--tenant`|The function’s tenant||
-|`--topics-pattern`|The topic pattern to consume from list of topics under a namespace that match the pattern. [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a pattern in --custom-serde-inputs (supported for java fun only)||
-|`--user-config`|User-defined config key/values||
-|`--window-length-count`|The number of messages per window||
-|`--window-length-duration-ms`|The time duration of the window in milliseconds||
-|`--dead-letter-topic`|The topic where all messages which could not be processed successfully are sent||
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--max-message-retries`|How many times should we try to process a message before giving up||
-|`--retain-ordering`|Function consumes and processes messages in order||
-|`--retain-key-ordering`|Function consumes and processes messages in key order||
-|`--timeout-ms`|The message timeout in milliseconds||
-|`--tls-allow-insecure`|Allow insecure tls connection|false|
-|`--tls-trust-cert-path`|The tls trust cert file path||
-|`--use-tls`|Use tls connection|false|
-|`--producer-config`| The custom producer configuration (as a JSON string) | |
-
-
-### `create`
-Create a Pulsar Function in cluster mode (i.e. deploy it on a Pulsar cluster)
-
-Usage
-
-```
-
-$ pulsar-admin functions create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The cpu in cores that need to be allocated per function instance(applicable only to docker runtime)||
-|`--ram`|The ram in bytes that need to be allocated per function instance(applicable only to process/docker runtime)||
-|`--disk`|The disk in bytes that need to be allocated per function instance(applicable only to docker runtime)||
-|`--auto-ack`|Whether or not the framework will automatically acknowledge messages||
-|`--subs-name`|Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer||
-|`--classname`|The function's class name||
-|`--custom-serde-inputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--custom-schema-inputs`|The map of input topics to Schema class names (as a JSON string)||
-|`--function-config-file`|The path to a YAML config file specifying the function's configuration||
-|`--inputs`|The function's input topic or topics (multiple topics can be specified as a comma-separated list)||
-|`--log-topic`|The topic to which the function's logs are produced||
-|`--jar`|Path to the jar file for the function (if the function is written in Java). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--name`|The function's name||
-|`--namespace`|The function’s namespace||
-|`--output`|The function's output topic (If none is specified, no output is written)||
-|`--output-serde-classname`|The SerDe class to be used for messages output by the function||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processing-guarantees`|The processing guarantees (aka delivery semantics) applied to the function. Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]|ATLEAST_ONCE|
-|`--py`|Path to the main Python file/Python Wheel file for the function (if the function is written in Python). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--go`|Path to the main Go executable binary for the function (if the function is written in Go). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--schema-type`|The builtin schema type or custom schema class name to be used for messages output by the function||
-|`--sliding-interval-count`|The number of messages after which the window slides||
-|`--sliding-interval-duration-ms`|The time duration after which the window slides||
-|`--tenant`|The function’s tenant||
-|`--topics-pattern`|The topic pattern to consume from list of topics under a namespace that match the pattern. [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a pattern in --custom-serde-inputs (supported for java fun only)||
-|`--user-config`|User-defined config key/values||
-|`--window-length-count`|The number of messages per window||
-|`--window-length-duration-ms`|The time duration of the window in milliseconds||
-|`--dead-letter-topic`|The topic where all messages which could not be processed||
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--max-message-retries`|How many times should we try to process a message before giving up||
-|`--retain-ordering`|Function consumes and processes messages in order||
-|`--retain-key-ordering`|Function consumes and processes messages in key order||
-|`--timeout-ms`|The message timeout in milliseconds||
-|`--producer-config`| The custom producer configuration (as a JSON string) | |
-
-
-### `delete`
-Delete a Pulsar Function that's running on a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `update`
-Update a Pulsar Function that's been deployed to a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions update options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The cpu in cores that need to be allocated per function instance(applicable only to docker runtime)||
-|`--ram`|The ram in bytes that need to be allocated per function instance(applicable only to process/docker runtime)||
-|`--disk`|The disk in bytes that need to be allocated per function instance(applicable only to docker runtime)||
-|`--auto-ack`|Whether or not the framework will automatically acknowledge messages||
-|`--subs-name`|Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer||
-|`--classname`|The function's class name||
-|`--custom-serde-inputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--custom-schema-inputs`|The map of input topics to Schema class names (as a JSON string)||
-|`--function-config-file`|The path to a YAML config file specifying the function's configuration||
-|`--inputs`|The function's input topic or topics (multiple topics can be specified as a comma-separated list)||
-|`--log-topic`|The topic to which the function's logs are produced||
-|`--jar`|Path to the jar file for the function (if the function is written in Java). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--name`|The function's name||
-|`--namespace`|The function’s namespace||
-|`--output`|The function's output topic (If none is specified, no output is written)||
-|`--output-serde-classname`|The SerDe class to be used for messages output by the function||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processing-guarantees`|The processing guarantees (aka delivery semantics) applied to the function. Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]|ATLEAST_ONCE|
-|`--py`|Path to the main Python file/Python Wheel file for the function (if the function is written in Python). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--go`|Path to the main Go executable binary for the function (if the function is written in Go). It also supports URL path [http/https/file (file protocol assumes that file already exists on worker host)/function (package URL from packages management service)] from which worker can download the package.||
-|`--schema-type`|The builtin schema type or custom schema class name to be used for messages output by the function||
-|`--sliding-interval-count`|The number of messages after which the window slides||
-|`--sliding-interval-duration-ms`|The time duration after which the window slides||
-|`--tenant`|The function’s tenant||
-|`--topics-pattern`|The topic pattern to consume from list of topics under a namespace that match the pattern. [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a pattern in --custom-serde-inputs (supported for java fun only)||
-|`--user-config`|User-defined config key/values||
-|`--window-length-count`|The number of messages per window||
-|`--window-length-duration-ms`|The time duration of the window in milliseconds||
-|`--dead-letter-topic`|The topic where all messages which could not be processed||
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--max-message-retries`|How many times should we try to process a message before giving up||
-|`--retain-ordering`|Function consumes and processes messages in order||
-|`--retain-key-ordering`|Function consumes and processes messages in key order||
-|`--timeout-ms`|The message timeout in milliseconds||
-|`--producer-config`| The custom producer configuration (as a JSON string) | |
-
-
-### `get`
-Fetch information about a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `restart`
-Restart function instance
-
-Usage
-
-```bash
-
-$ pulsar-admin functions restart options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (restart all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `stop`
-Stops function instance
-
-Usage
-
-```bash
-
-$ pulsar-admin functions stop options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (stop all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `start`
-Starts a stopped function instance
-
-Usage
-
-```bash
-
-$ pulsar-admin functions start options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (start all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `status`
-Check the current status of a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions status options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (Get-status of all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `stats`
-Get the current stats of a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions stats options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--instance-id`|The function instanceId (Get-stats of all instances if instance-id is not provided)||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-### `list`
-List all of the Pulsar Functions running under a specific tenant and namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin functions list options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-
-
-### `querystate`
-Fetch the current state associated with a Pulsar Function running in cluster mode
-
-Usage
-
-```bash
-
-$ pulsar-admin functions querystate options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`-k`, `--key`|The key for the state you want to fetch||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-|`-w`, `--watch`|Watch for changes in the value associated with a key for a Pulsar Function|false|
-
-### `putstate`
-Put a key/value pair to the state associated with a Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions putstate options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the Pulsar Function||
-|`--name`|The name of a Pulsar Function||
-|`--namespace`|The namespace of a Pulsar Function||
-|`--tenant`|The tenant of a Pulsar Function||
-|`-s`, `--state`|The FunctionState that needs to be put||
-
-### `trigger`
-Triggers the specified Pulsar Function with a supplied value
-
-Usage
-
-```bash
-
-$ pulsar-admin functions trigger options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--fqfn`|The Fully Qualified Function Name (FQFN) for the function||
-|`--name`|The function's name||
-|`--namespace`|The function's namespace||
-|`--tenant`|The function's tenant||
-|`--topic`|The specific topic name that the function consumes from that you want to inject the data to||
-|`--trigger-file`|The path to the file that contains the data with which you'd like to trigger the function||
-|`--trigger-value`|The value with which you want to trigger the function||
-
-
-## `functions-worker`
-Operations to collect function-worker statistics
-
-```bash
-
-$ pulsar-admin functions-worker subcommand
-
-```
-
-Subcommands
-
-* `function-stats`
-* `get-cluster`
-* `get-cluster-leader`
-* `get-function-assignments`
-* `monitoring-metrics`
-
-### `function-stats`
-
-Dump all functions stats running on this broker
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker function-stats
-
-```
-
-### `get-cluster`
-
-Get all workers belonging to this cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker get-cluster
-
-```
-
-### `get-cluster-leader`
-
-Get the leader of the worker cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker get-cluster-leader
-
-```
-
-### `get-function-assignments`
-
-Get the assignments of the functions across the worker cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker get-function-assignments
-
-```
-
-### `monitoring-metrics`
-
-Dump metrics for Monitoring
-
-Usage
-
-```bash
-
-$ pulsar-admin functions-worker monitoring-metrics
-
-```
-
-## `namespaces`
-
-Operations for managing namespaces
-
-```bash
-
-$ pulsar-admin namespaces subcommand
-
-```
-
-Subcommands
-* `list`
-* `topics`
-* `policies`
-* `create`
-* `delete`
-* `set-deduplication`
-* `set-auto-topic-creation`
-* `remove-auto-topic-creation`
-* `set-auto-subscription-creation`
-* `remove-auto-subscription-creation`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `grant-subscription-permission`
-* `revoke-subscription-permission`
-* `set-clusters`
-* `get-clusters`
-* `get-backlog-quotas`
-* `set-backlog-quota`
-* `remove-backlog-quota`
-* `get-persistence`
-* `set-persistence`
-* `get-message-ttl`
-* `set-message-ttl`
-* `remove-message-ttl`
-* `get-anti-affinity-group`
-* `set-anti-affinity-group`
-* `get-anti-affinity-namespaces`
-* `delete-anti-affinity-group`
-* `get-retention`
-* `set-retention`
-* `unload`
-* `split-bundle`
-* `set-dispatch-rate`
-* `get-dispatch-rate`
-* `set-replicator-dispatch-rate`
-* `get-replicator-dispatch-rate`
-* `set-subscribe-rate`
-* `get-subscribe-rate`
-* `set-subscription-dispatch-rate`
-* `get-subscription-dispatch-rate`
-* `clear-backlog`
-* `unsubscribe`
-* `set-encryption-required`
-* `set-delayed-delivery`
-* `get-delayed-delivery`
-* `set-subscription-auth-mode`
-* `get-max-producers-per-topic`
-* `set-max-producers-per-topic`
-* `get-max-consumers-per-topic`
-* `set-max-consumers-per-topic`
-* `get-max-consumers-per-subscription`
-* `set-max-consumers-per-subscription`
-* `get-max-unacked-messages-per-subscription`
-* `set-max-unacked-messages-per-subscription`
-* `get-max-unacked-messages-per-consumer`
-* `set-max-unacked-messages-per-consumer`
-* `get-compaction-threshold`
-* `set-compaction-threshold`
-* `get-offload-threshold`
-* `set-offload-threshold`
-* `get-offload-deletion-lag`
-* `set-offload-deletion-lag`
-* `clear-offload-deletion-lag`
-* `get-schema-autoupdate-strategy`
-* `set-schema-autoupdate-strategy`
-* `set-offload-policies`
-* `get-offload-policies`
-* `set-max-subscriptions-per-topic`
-* `get-max-subscriptions-per-topic`
-* `remove-max-subscriptions-per-topic`
-
-
-### `list`
-Get the namespaces for a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces list tenant-name
-
-```
-
-### `topics`
-Get the list of topics for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces topics tenant/namespace
-
-```
-
-### `policies`
-Get the configuration policies of a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces policies tenant/namespace
-
-```
-
-### `create`
-Create a new namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces create tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-b`, `--bundles`|The number of bundles to activate|0|
-|`-c`, `--clusters`|List of clusters this namespace will be assigned||
-
-
-### `delete`
-Deletes a namespace. The namespace needs to be empty
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces delete tenant/namespace
-
-```
-
-### `set-deduplication`
-Enable or disable message deduplication on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-deduplication tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable message deduplication on the specified namespace|false|
-|`--disable`, `-d`|Disable message deduplication on the specified namespace|false|
-
-### `set-auto-topic-creation`
-Enable or disable autoTopicCreation for a namespace, overriding broker settings
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-auto-topic-creation tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable allowAutoTopicCreation on namespace|false|
-|`--disable`, `-d`|Disable allowAutoTopicCreation on namespace|false|
-|`--type`, `-t`|Type of topic to be auto-created. Possible values: (partitioned, non-partitioned)|non-partitioned|
-|`--num-partitions`, `-n`|Default number of partitions of topic to be auto-created, applicable to partitioned topics only||
-
-### `remove-auto-topic-creation`
-Remove override of autoTopicCreation for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-auto-topic-creation tenant/namespace
-
-```
-
-### `set-auto-subscription-creation`
-Enable autoSubscriptionCreation for a namespace, overriding broker settings
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-auto-subscription-creation tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable allowAutoSubscriptionCreation on namespace|false|
-
-### `remove-auto-subscription-creation`
-Remove override of autoSubscriptionCreation for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-auto-subscription-creation tenant/namespace
-
-```
-
-### `permissions`
-Get the permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces permissions tenant/namespace
-
-```
-
-### `grant-permission`
-Grant permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces grant-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces revoke-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--role`|The client role to which to revoke the permissions||
-
-### `grant-subscription-permission`
-Grant permissions to access subscription admin-api
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces grant-subscription-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--roles`|The client roles to which to grant the permissions (comma separated roles)||
-|`--subscription`|The subscription name for which permission will be granted to roles||
-
-### `revoke-subscription-permission`
-Revoke permissions to access subscription admin-api
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces revoke-subscription-permission tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--role`|The client role to which to revoke the permissions||
-|`--subscription`|The subscription name for which permission will be revoked to roles||
-
-### `set-clusters`
-Set replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-clusters tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--clusters`|Replication clusters ID list (comma-separated values)||
-
-
-### `get-clusters`
-Get replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-clusters tenant/namespace
-
-```
-
-### `get-backlog-quotas`
-Get the backlog quota policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-backlog-quotas tenant/namespace
-
-```
-
-### `set-backlog-quota`
-Set a backlog quota policy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--limit`|The backlog size limit (for example `10M` or `16G`)||
-|`-lt`, `--limitTime`|Time limit in second, non-positive number for disabling time limit. (for example 3600 for 1 hour)||
-|`-p`, `--policy`|The retention policy to enforce when the limit is reached. The valid options are: `producer_request_hold`, `producer_exception` or `consumer_backlog_eviction`|
-|`-t`, `--type`|Backlog quota type to set. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Example
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns \
---limit 2G \
---policy producer_request_hold
-
-```
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns \
---limitTime 3600 \
---policy producer_request_hold \
---type message_age
-
-```
-
-### `remove-backlog-quota`
-Remove a backlog quota policy from a namespace
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--type`|Backlog quota type to remove. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-backlog-quota tenant/namespace
-
-```
-
-### `get-persistence`
-Get the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-persistence tenant/namespace
-
-```
-
-### `set-persistence`
-Set the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-persistence tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-a`, `--bookkeeper-ack-quorum`|The number of acks (guaranteed copies) to wait for each entry|0|
-|`-e`, `--bookkeeper-ensemble`|The number of bookies to use for a topic|0|
-|`-w`, `--bookkeeper-write-quorum`|How many writes to make of each entry|0|
-|`-r`, `--ml-mark-delete-max-rate`|Throttling rate of mark-delete operation (0 means no throttle)||
-
-
-### `get-message-ttl`
-Get the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-message-ttl tenant/namespace
-
-```
-
-### `set-message-ttl`
-Set the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-message-ttl tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-ttl`, `--messageTTL`|Message TTL in seconds. When the value is set to `0`, TTL is disabled. TTL is disabled by default. |0|
-
-### `remove-message-ttl`
-Remove the message TTL for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-message-ttl tenant/namespace
-
-```
-
-### `get-anti-affinity-group`
-Get Anti-affinity group name for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-anti-affinity-group tenant/namespace
-
-```
-
-### `set-anti-affinity-group`
-Set Anti-affinity group name for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-anti-affinity-group tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-g`, `--group`|Anti-affinity group name||
-
-### `get-anti-affinity-namespaces`
-Get Anti-affinity namespaces grouped with the given anti-affinity group name
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-anti-affinity-namespaces options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--cluster`|Cluster name||
-|`-g`, `--group`|Anti-affinity group name||
-|`-p`, `--tenant`|Tenant is only used for authorization. Client has to be admin of any of the tenant to access this api||
-
-### `delete-anti-affinity-group`
-Remove Anti-affinity group name for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces delete-anti-affinity-group tenant/namespace
-
-```
-
-### `get-retention`
-Get the retention policy that is applied to each topic within the specified namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-retention tenant/namespace
-
-```
-
-### `set-retention`
-Set the retention policy for each topic within the specified namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-retention tenant/namespace
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|The retention size limits (for example 10M, 16G or 3T) for each topic in the namespace. 0 means no retention and -1 means infinite size retention||
-|`-t`, `--time`|The retention time in minutes, hours, days, or weeks. Examples: 100m, 13h, 2d, 5w. 0 means no retention and -1 means infinite time retention||
-
-
-### `unload`
-Unload a namespace or namespace bundle from the current serving broker.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unload tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-
-### `split-bundle`
-Split a namespace-bundle from the current serving broker
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces split-bundle tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-|`-u`, `--unload`|Unload newly split bundles after splitting old bundle|false|
-
-### `set-dispatch-rate`
-Set message-dispatch-rate for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-dispatch-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bd`, `--byte-dispatch-rate`|The byte dispatch rate (default -1 will be overwrite if not passed)|-1|
-|`-dt`, `--dispatch-rate-period`|The dispatch rate period in second type (default 1 second will be overwrite if not passed)|1|
-|`-md`, `--msg-dispatch-rate`|The message dispatch rate (default -1 will be overwrite if not passed)|-1|
-
-### `get-dispatch-rate`
-Get configured message-dispatch-rate for all topics of the namespace (Disabled if value < 0)
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-dispatch-rate tenant/namespace
-
-```
-
-### `set-replicator-dispatch-rate`
-Set replicator message-dispatch-rate for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-replicator-dispatch-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bd`, `--byte-dispatch-rate`|The byte dispatch rate (default -1 will be overwrite if not passed)|-1|
-|`-dt`, `--dispatch-rate-period`|The dispatch rate period in second type (default 1 second will be overwrite if not passed)|1|
-|`-md`, `--msg-dispatch-rate`|The message dispatch rate (default -1 will be overwrite if not passed)|-1|
-
-### `get-replicator-dispatch-rate`
-Get replicator configured message-dispatch-rate for all topics of the namespace (Disabled if value < 0)
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-replicator-dispatch-rate tenant/namespace
-
-```
-
-### `set-subscribe-rate`
-Set subscribe-rate per consumer for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-subscribe-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-sr`, `--subscribe-rate`|The subscribe rate (default -1 will be overwrite if not passed)|-1|
-|`-st`, `--subscribe-rate-period`|The subscribe rate period in second type (default 30 second will be overwrite if not passed)|30|
-
-### `get-subscribe-rate`
-Get configured subscribe-rate per consumer for all topics of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-subscribe-rate tenant/namespace
-
-```
-
-### `set-subscription-dispatch-rate`
-Set subscription message-dispatch-rate for all subscription of the namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-subscription-dispatch-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bd`, `--byte-dispatch-rate`|The byte dispatch rate (default -1 will be overwrite if not passed)|-1|
-|`-dt`, `--dispatch-rate-period`|The dispatch rate period in second type (default 1 second will be overwrite if not passed)|1|
-|`-md`, `--sub-msg-dispatch-rate`|The message dispatch rate (default -1 will be overwrite if not passed)|-1|
-
-### `get-subscription-dispatch-rate`
-Get subscription configured message-dispatch-rate for all topics of the namespace (Disabled if value < 0)
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-subscription-dispatch-rate tenant/namespace
-
-```
-
-### `clear-backlog`
-Clear the backlog for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces clear-backlog tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-|`-force`, `--force`|Whether to force a clear backlog without prompt|false|
-|`-s`, `--sub`|The subscription name||
-
-
-### `unsubscribe`
-Unsubscribe the given subscription on all destinations on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unsubscribe tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|{start-boundary}_{end-boundary} (e.g. 0x00000000_0xffffffff)||
-|`-s`, `--sub`|The subscription name||
-
-### `set-encryption-required`
-Enable or disable message encryption required for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-encryption-required tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-d`, `--disable`|Disable message encryption required|false|
-|`-e`, `--enable`|Enable message encryption required|false|
-
-### `set-delayed-delivery`
-Set the delayed delivery policy on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-delayed-delivery tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-d`, `--disable`|Disable delayed delivery messages|false|
-|`-e`, `--enable`|Enable delayed delivery messages|false|
-|`-t`, `--time`|The tick time for when retrying on delayed delivery messages|1s|
-
-
-### `get-delayed-delivery`
-Get the delayed delivery policy on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-delayed-delivery-time tenant/namespace
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-t`, `--time`|The tick time for when retrying on delayed delivery messages|1s|
-
-
-### `set-subscription-auth-mode`
-Set subscription auth mode on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-subscription-auth-mode tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-m`, `--subscription-auth-mode`|Subscription authorization mode for Pulsar policies. Valid options are: [None, Prefix]||
-
-### `get-max-producers-per-topic`
-Get maxProducersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-producers-per-topic tenant/namespace
-
-```
-
-### `set-max-producers-per-topic`
-Set maxProducersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-producers-per-topic tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-p`, `--max-producers-per-topic`|maxProducersPerTopic for a namespace|0|
-
-### `get-max-consumers-per-topic`
-Get maxConsumersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-consumers-per-topic tenant/namespace
-
-```
-
-### `set-max-consumers-per-topic`
-Set maxConsumersPerTopic for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-consumers-per-topic tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-consumers-per-topic`|maxConsumersPerTopic for a namespace|0|
-
-### `get-max-consumers-per-subscription`
-Get maxConsumersPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-consumers-per-subscription tenant/namespace
-
-```
-
-### `set-max-consumers-per-subscription`
-Set maxConsumersPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-consumers-per-subscription tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-consumers-per-subscription`|maxConsumersPerSubscription for a namespace|0|
-
-### `get-max-unacked-messages-per-subscription`
-Get maxUnackedMessagesPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-unacked-messages-per-subscription tenant/namespace
-
-```
-
-### `set-max-unacked-messages-per-subscription`
-Set maxUnackedMessagesPerSubscription for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-unacked-messages-per-subscription tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-unacked-messages-per-subscription`|maxUnackedMessagesPerSubscription for a namespace|-1|
-
-### `get-max-unacked-messages-per-consumer`
-Get maxUnackedMessagesPerConsumer for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-unacked-messages-per-consumer tenant/namespace
-
-```
-
-### `set-max-unacked-messages-per-consumer`
-Set maxUnackedMessagesPerConsumer for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-unacked-messages-per-consumer tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--max-unacked-messages-per-consumer`|maxUnackedMessagesPerConsumer for a namespace|-1|
-
-
-### `get-compaction-threshold`
-Get compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-compaction-threshold tenant/namespace
-
-```
-
-### `set-compaction-threshold`
-Set compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-compaction-threshold tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-t`, `--threshold`|Maximum number of bytes in a topic backlog before compaction is triggered (eg: 10M, 16G, 3T). 0 disables automatic compaction|0|
-
-
-### `get-offload-threshold`
-Get offloadThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-threshold tenant/namespace
-
-```
-
-### `set-offload-threshold`
-Set offloadThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-offload-threshold tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|Maximum number of bytes stored in the pulsar cluster for a topic before data will start being automatically offloaded to longterm storage (eg: 10M, 16G, 3T, 100). Negative values disable automatic offload. 0 triggers offloading as soon as possible.|-1|
-
-### `get-offload-deletion-lag`
-Get offloadDeletionLag, in minutes, for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-deletion-lag tenant/namespace
-
-```
-
-### `set-offload-deletion-lag`
-Set offloadDeletionLag for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-offload-deletion-lag tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--lag`|Duration to wait after offloading a ledger segment, before deleting the copy of that segment from cluster local storage. (eg: 10m, 5h, 3d, 2w).|-1|
-
-### `clear-offload-deletion-lag`
-Clear offloadDeletionLag for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces clear-offload-deletion-lag tenant/namespace
-
-```
-
-### `get-schema-autoupdate-strategy`
-Get the schema auto-update strategy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-schema-autoupdate-strategy tenant/namespace
-
-```
-
-### `set-schema-autoupdate-strategy`
-Set the schema auto-update strategy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-schema-autoupdate-strategy tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--compatibility`|Compatibility level required for new schemas created via a Producer. Possible values (Full, Backward, Forward, None).|Full|
-|`-d`, `--disabled`|Disable automatic schema updates.|false|
-
-### `get-publish-rate`
-Get the message publish rate for each topic in a namespace, in bytes as well as messages per second 
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-publish-rate tenant/namespace
-
-```
-
-### `set-publish-rate`
-Set the message publish rate for each topic in a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-publish-rate tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-m`, `--msg-publish-rate`|Threshold for number of messages per second per topic in the namespace (-1 implies not set, 0 for no limit).|-1|
-|`-b`, `--byte-publish-rate`|Threshold for number of bytes per second per topic in the namespace (-1 implies not set, 0 for no limit).|-1|
-
-### `set-offload-policies`
-Set the offload policy for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-offload-policies tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-d`, `--driver`|Driver to use to offload old data to long term storage,(Possible values: S3, aws-s3, google-cloud-storage)||
-|`-r`, `--region`|The long term storage region||
-|`-b`, `--bucket`|Bucket to place offloaded ledger into||
-|`-e`, `--endpoint`|Alternative endpoint to connect to||
-|`-i`, `--aws-id`|AWS Credential Id to use when using driver S3 or aws-s3||
-|`-s`, `--aws-secret`|AWS Credential Secret to use when using driver S3 or aws-s3||
-|`-ro`, `--s3-role`|S3 Role used for STSAssumeRoleSessionCredentialsProvider using driver S3 or aws-s3||
-|`-rsn`, `--s3-role-session-name`|S3 role session name used for STSAssumeRoleSessionCredentialsProvider using driver S3 or aws-s3||
-|`-mbs`, `--maxBlockSize`|Max block size|64MB|
-|`-rbs`, `--readBufferSize`|Read buffer size|1MB|
-|`-oat`, `--offloadAfterThreshold`|Offload after threshold size (eg: 1M, 5M)||
-|`-oae`, `--offloadAfterElapsed`|Offload after elapsed in millis (or minutes, hours,days,weeks eg: 100m, 3h, 2d, 5w).||
-
-### `get-offload-policies`
-Get the offload policy for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-policies tenant/namespace
-
-```
-
-### `set-max-subscriptions-per-topic`
-Set the maximum subscription per topic for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-max-subscriptions-per-topic tenant/namespace
-
-```
-
-### `get-max-subscriptions-per-topic`
-Get the maximum subscription per topic for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-max-subscriptions-per-topic tenant/namespace
-
-```
-
-### `remove-max-subscriptions-per-topic`
-Remove the maximum subscription per topic for a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-max-subscriptions-per-topic tenant/namespace
-
-```
-
-## `ns-isolation-policy`
-Operations for managing namespace isolation policies.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy subcommand
-
-```
-
-Subcommands
-* `set`
-* `get`
-* `list`
-* `delete`
-* `brokers`
-* `broker`
-
-### `set`
-Create/update a namespace isolation policy for a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy set cluster-name policy-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--auto-failover-policy-params`|Comma-separated name=value auto failover policy parameters|[]|
-|`--auto-failover-policy-type`|Auto failover policy type name. Currently available options: min_available.|[]|
-|`--namespaces`|Comma-separated namespaces regex list|[]|
-|`--primary`|Comma-separated primary broker regex list|[]|
-|`--secondary`|Comma-separated secondary broker regex list|[]|
-
-
-### `get`
-Get the namespace isolation policy of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy get cluster-name policy-name
-
-```
-
-### `list`
-List all namespace isolation policies of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy list cluster-name
-
-```
-
-### `delete`
-Delete namespace isolation policy of a cluster. This operation requires superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy delete
-
-```
-
-### `brokers`
-List all brokers with namespace-isolation policies attached to it. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy brokers cluster-name
-
-```
-
-### `broker`
-Get broker with namespace-isolation policies attached to it. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy broker cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--broker`|Broker name to get namespace-isolation policies attached to it||
-
-## `topics`
-Operations for managing Pulsar topics (both persistent and non-persistent). 
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subcommand
-
-```
-
-From Pulsar 2.7.0, some namespace-level policies are available on topic level. To enable topic-level policy in Pulsar, you need to configure the following parameters in the `broker.conf` file. 
-
-```shell
-
-systemTopicEnabled=true
-topicLevelPoliciesEnabled=true
-
-```
-
-Subcommands
-* `compact`
-* `compaction-status`
-* `offload`
-* `offload-status`
-* `create-partitioned-topic`
-* `create-missed-partitions`
-* `delete-partitioned-topic`
-* `create`
-* `get-partitioned-topic-metadata`
-* `update-partitioned-topic`
-* `list-partitioned-topics`
-* `list`
-* `terminate`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `lookup`
-* `bundle-range`
-* `delete`
-* `unload`
-* `create-subscription`
-* `subscriptions`
-* `unsubscribe`
-* `stats`
-* `stats-internal`
-* `info-internal`
-* `partitioned-stats`
-* `partitioned-stats-internal`
-* `skip`
-* `clear-backlog`
-* `expire-messages`
-* `expire-messages-all-subscriptions`
-* `peek-messages`
-* `reset-cursor`
-* `get-message-by-id`
-* `last-message-id`
-* `get-backlog-quotas`
-* `set-backlog-quota`
-* `remove-backlog-quota`
-* `get-persistence`
-* `set-persistence`
-* `remove-persistence`
-* `get-message-ttl`
-* `set-message-ttl`
-* `remove-message-ttl`
-* `get-deduplication`
-* `set-deduplication`
-* `remove-deduplication`
-* `get-retention`
-* `set-retention`
-* `remove-retention`
-* `get-dispatch-rate`
-* `set-dispatch-rate`
-* `remove-dispatch-rate`
-* `get-max-unacked-messages-per-subscription`
-* `set-max-unacked-messages-per-subscription`
-* `remove-max-unacked-messages-per-subscription`
-* `get-max-unacked-messages-per-consumer`
-* `set-max-unacked-messages-per-consumer`
-* `remove-max-unacked-messages-per-consumer`
-* `get-delayed-delivery`
-* `set-delayed-delivery`
-* `remove-delayed-delivery`
-* `get-max-producers`
-* `set-max-producers`
-* `remove-max-producers`
-* `get-max-consumers`
-* `set-max-consumers`
-* `remove-max-consumers`
-* `get-compaction-threshold`
-* `set-compaction-threshold`
-* `remove-compaction-threshold`
-* `get-offload-policies`
-* `set-offload-policies`
-* `remove-offload-policies`
-* `get-inactive-topic-policies`
-* `set-inactive-topic-policies`
-* `remove-inactive-topic-policies`
-* `set-max-subscriptions`
-* `get-max-subscriptions`
-* `remove-max-subscriptions`
-
-### `compact`
-Run compaction on the specified topic (persistent topics only)
-
-Usage
-
-```
-
-$ pulsar-admin topics compact persistent://tenant/namespace/topic
-
-```
-
-### `compaction-status`
-Check the status of a topic compaction (persistent topics only)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics compaction-status persistent://tenant/namespace/topic
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `offload`
-Trigger offload of data from a topic to long-term storage (e.g. Amazon S3)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--size-threshold`|The maximum amount of data to keep in BookKeeper for the specific topic||
-
-
-### `offload-status`
-Check the status of data offloading from a topic to long-term storage
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload-status persistent://tenant/namespace/topic op
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `create-partitioned-topic`
-Create a partitioned topic. A partitioned topic must be created before producers can publish to it.
-
-:::note
-
-By default, after 60 seconds of creation, topics are considered inactive and deleted automatically to prevent from generating trash data.
-To disable this feature, set `brokerDeleteInactiveTopicsEnabled` to `false`.
-To change the frequency of checking inactive topics, set `brokerDeleteInactiveTopicsFrequencySeconds` to your desired value.
-For more information about these two parameters, see [here](reference-configuration.md#broker).
-
-:::
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-### `create-missed-partitions`
-Try to create partitions for partitioned topic. The partitions of partition topic has to be created, 
-can be used by repair partitions when topic auto creation is disabled
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-missed-partitions persistent://tenant/namespace/topic
-
-```
-
-### `delete-partitioned-topic`
-Delete a partitioned topic. This will also delete all the partitions of the topic if they exist.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete-partitioned-topic {persistent|non-persistent}
-
-```
-
-### `create`
-Creates a non-partitioned topic. A non-partitioned topic must explicitly be created by the user if allowAutoTopicCreation or createIfMissing is disabled.
-
-:::note
-
-By default, after 60 seconds of creation, topics are considered inactive and deleted automatically to prevent from generating trash data.
-To disable this feature, set `brokerDeleteInactiveTopicsEnabled`  to `false`.
-To change the frequency of checking inactive topics, set `brokerDeleteInactiveTopicsFrequencySeconds` to your desired value.
-For more information about these two parameters, see [here](reference-configuration.md#broker).
-
-:::
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create {persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-### `get-partitioned-topic-metadata`
-Get the partitioned topic metadata. If the topic is not created or is a non-partitioned topic, this will return an empty topic with zero partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-partitioned-topic-metadata {persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-### `update-partitioned-topic`
-Update existing non-global partitioned topic. New updating number of partitions must be greater than existing number of partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics update-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-### `list-partitioned-topics`
-Get the list of partitioned topics under a namespace.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics list-partitioned-topics tenant/namespace
-
-```
-
-### `list`
-Get the list of topics under a namespace
-
-Usage
-
-```
-
-$ pulsar-admin topics list tenant/cluster/namespace
-
-```
-
-### `terminate`
-Terminate a persistent topic (disallow further messages from being published on the topic)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics terminate persistent://tenant/namespace/topic
-
-```
-
-### `partitioned-terminate`
-Terminate a persistent topic (disallow further messages from being published on the topic)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-terminate persistent://tenant/namespace/topic
-
-```
-
-### `permissions`
-Get the permissions on a topic. Retrieve the effective permissions for a destination. These permissions are defined by the permissions set at the namespace level combined (union) with any eventual specific permissions set on the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics permissions topic
-
-```
-
-### `grant-permission`
-Grant a new permission to a client role on a single topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics grant-permission {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions to a client role on a single topic. If the permission was not set at the topic level, but rather at the namespace level, this operation will return an error (HTTP status code 412).
-
-Usage
-
-```bash
-
-$ pulsar-admin topics revoke-permission topic
-
-```
-
-### `lookup`
-Look up a topic from the current serving broker
-
-Usage
-
-```bash
-
-$ pulsar-admin topics lookup topic
-
-```
-
-### `bundle-range`
-Get the namespace bundle which contains the given topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics bundle-range topic
-
-```
-
-### `delete`
-Delete a topic. The topic cannot be deleted if there are any active subscriptions or producers connected to the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete topic
-
-```
-
-### `unload`
-Unload a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unload topic
-
-```
-
-### `create-subscription`
-Create a new subscription on a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-subscription [options] persistent://tenant/namespace/topic
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-m`, `--messageId`|messageId where to create the subscription. It can be either 'latest', 'earliest' or (ledgerId:entryId)|latest|
-|`-s`, `--subscription`|Subscription to reset position on||
-
-### `subscriptions`
-Get the list of subscriptions on the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subscriptions topic
-
-```
-
-### `unsubscribe`
-Delete a durable subscriber from a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unsubscribe topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to delete||
-|`-f`, `--force`|Disconnect and close all consumers and delete subscription forcefully|false|
-
-
-### `stats`
-Get the stats for the topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats topic
-
-```
-
-:::note
-
-The unit of `storageSize` and `averageMsgSize` is Byte.
-
-:::
-
-### `stats-internal`
-Get the internal stats for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats-internal topic
-
-```
-
-### `info-internal`
-Get the internal metadata info for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics info-internal topic
-
-```
-
-### `partitioned-stats`
-Get the stats for the partitioned topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-stats topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--per-partition`|Get per-partition stats|false|
-
-### `partitioned-stats-internal`
-Get the internal stats for the partitioned topic and its connected producers and consumers. All the rates are computed over a 1 minute window and are relative the last completed 1 minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-stats-internal topic
-
-```
-
-### `skip`
-Skip some messages for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics skip topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages to skip|0|
-|`-s`, `--subscription`|The subscription on which to skip messages||
-
-
-### `clear-backlog`
-Clear backlog (skip all the messages) for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics clear-backlog topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to clear||
-
-
-### `expire-messages`
-Expire messages that are older than the given expiry time (in seconds) for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-|`-s`, `--subscription`|The subscription to skip messages on||
-
-
-### `expire-messages-all-subscriptions`
-Expire messages older than the given expiry time (in seconds) for all subscriptions
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages-all-subscriptions topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-
-
-### `peek-messages`
-Peek some messages for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics peek-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages|0|
-|`-s`, `--subscription`|Subscription to get messages from||
-
-
-### `reset-cursor`
-Reset position for subscription to a position that is closest to timestamp or messageId.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics reset-cursor topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|Subscription to reset position on||
-|`-t`, `--time`|The time in minutes to reset back to (or minutes, hours, days, weeks, etc.). Examples: `100m`, `3h`, `2d`, `5w`.||
-|`-m`, `--messageId`| The message ID to reset back to (`ledgerId:entryId` or earliest or latest). ||
-
-### `get-message-by-id`
-Get message by ledger id and entry id
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-message-by-id topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-l`, `--ledgerId`|The ledger id |0|
-|`-e`, `--entryId`|The entry id |0|
-
-### `last-message-id`
-Get the last commit message ID of the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics last-message-id persistent://tenant/namespace/topic
-
-```
-
-### `get-backlog-quotas`
-Get the backlog quota policies for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-backlog-quotas tenant/namespace/topic
-
-```
-
-### `set-backlog-quota`
-Set a backlog quota policy for a topic.
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--limit`|The backlog size limit (for example `10M` or `16G`)||
-|`-lt`, `--limitTime`|Time limit in second, non-positive number for disabling time limit. (for example 3600 for 1 hour)||
-|`-p`, `--policy`|The retention policy to enforce when the limit is reached. The valid options are: `producer_request_hold`, `producer_exception` or `consumer_backlog_eviction`|
-|`-t`, `--type`|Backlog quota type to set. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-backlog-quota tenant/namespace/topic options
-
-```
-
-Example
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns/my-topic \
---limit 2G \
---policy producer_request_hold
-
-```
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-tenant/my-ns/my-topic \
---limitTime 3600 \
---policy producer_request_hold \
---type message_age
-
-```
-
-### `remove-backlog-quota`
-Remove a backlog quota policy from a topic.
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--type`|Backlog quota type to remove. The valid options are: `destination_storage`, `message_age` |destination_storage|
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-backlog-quota tenant/namespace/topic
-
-```
-
-### `get-persistence`
-Get the persistence policies for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-persistence tenant/namespace/topic
-
-```
-
-### `set-persistence`
-Set the persistence policies for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-persistence tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-e`, `--bookkeeper-ensemble`|Number of bookies to use for a topic|0|
-|`-w`, `--bookkeeper-write-quorum`|How many writes to make of each entry|0|
-|`-a`, `--bookkeeper-ack-quorum`|Number of acks (guaranteed copies) to wait for each entry|0|
-|`-r`, `--ml-mark-delete-max-rate`|Throttling rate of mark-delete operation (0 means no throttle)||
-
-### `remove-persistence`
-Remove the persistence policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-persistence tenant/namespace/topic
-
-```
-
-### `get-message-ttl`
-Get the message TTL for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-message-ttl tenant/namespace/topic
-
-```
-
-### `set-message-ttl`
-Set the message TTL for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-message-ttl tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-ttl`, `--messageTTL`|Message TTL for a topic in second, allowed range from 1 to `Integer.MAX_VALUE` |0|
-
-### `remove-message-ttl`
-Remove the message TTL for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-message-ttl tenant/namespace/topic
-
-```
-
-Options 
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable message deduplication on the specified topic.|false|
-|`--disable`, `-d`|Disable message deduplication on the specified topic.|false|
-
-### `get-deduplication`
-Get a deduplication policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-deduplication tenant/namespace/topic
-
-```
-
-### `set-deduplication`
-Set a deduplication policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics set-deduplication tenant/namespace/topic options
-
-```
-
-### `remove-deduplication`
-Remove a deduplication policy for a topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics remove-deduplication tenant/namespace/topic
-
-```
-
-## `tenants`
-Operations for managing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants subcommand
-
-```
-
-Subcommands
-* `list`
-* `get`
-* `create`
-* `update`
-* `delete`
-
-### `list`
-List the existing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants list
-
-```
-
-### `get`
-Gets the configuration of a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants get tenant-name
-
-```
-
-### `create`
-Creates a new tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants create tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-### `update`
-Updates a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants update tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-
-### `delete`
-Deletes an existing tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants delete tenant-name
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-f`, `--force`|Delete a tenant forcefully by deleting all namespaces under it.|false|
-
-
-## `resource-quotas`
-Operations for managing resource quotas
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas subcommand
-
-```
-
-Subcommands
-* `get`
-* `set`
-* `reset-namespace-bundle-quota`
-
-
-### `get`
-Get the resource quota for a specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-### `set`
-Set the resource quota for the specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas set options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bi`, `--bandwidthIn`|The expected inbound bandwidth (in bytes/second)|0|
-|`-bo`, `--bandwidthOut`|Expected outbound bandwidth (in bytes/second)0|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-d`, `--dynamic`|Allow to be dynamically re-calculated (or not)|false|
-|`-mem`, `--memory`|Expectred memory usage (in megabytes)|0|
-|`-mi`, `--msgRateIn`|Expected incoming messages per second|0|
-|`-mo`, `--msgRateOut`|Expected outgoing messages per second|0|
-|`-n`, `--namespace`|The namespace as tenant/namespace, for example my-tenant/my-ns. Must be specified together with -b/--bundle.||
-
-
-### `reset-namespace-bundle-quota`
-Reset the specified namespace bundle's resource quota to a default value.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas reset-namespace-bundle-quota options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-
-## `schemas`
-Operations related to Schemas associated with Pulsar topics.
-
-Usage
-
-```
-
-$ pulsar-admin schemas subcommand
-
-```
-
-Subcommands
-* `upload`
-* `delete`
-* `get`
-* `extract`
-
-
-### `upload`
-Upload the schema definition for a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas upload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--filename`|The path to the schema definition file. An example schema file is available under conf directory.||
-
-
-### `delete`
-Delete the schema definition associated with a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas delete persistent://tenant/namespace/topic
-
-```
-
-### `get`
-Retrieve the schema definition associated with a topic (at a given version if version is supplied).
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas get persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--version`|The version of the schema definition to retrieve for a topic.||
-
-### `extract`
-Provide the schema definition for a topic via Java class name contained in a JAR file
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas extract persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-c`, `--classname`|The Java class name||
-|`-j`, `--jar`|A path to the JAR file which contains the above Java class||
-|`-t`, `--type`|The type of the schema (avro or json)||
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/reference-cli-tools.md b/site2/website/versioned_docs/version-2.1.1-incubating/reference-cli-tools.md
deleted file mode 100644
index dcac11835f4b9..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/reference-cli-tools.md
+++ /dev/null
@@ -1,1038 +0,0 @@
----
-id: reference-cli-tools
-title: Pulsar command-line tools
-sidebar_label: "Pulsar CLI tools"
----
-
-Pulsar offers several command-line tools that you can use for managing Pulsar installations, performance testing, using command-line producers and consumers, and more.
-
-All Pulsar command-line tools can be run from the `bin` directory of your [installed Pulsar package](getting-started-standalone.md). The following tools are currently documented:
-
-* [`pulsar`](#pulsar)
-* [`pulsar-client`](#pulsar-client)
-* [`pulsar-daemon`](#pulsar-daemon)
-* [`pulsar-perf`](#pulsar-perf)
-* [`bookkeeper`](#bookkeeper)
-* [`broker-tool`](#broker-tool)
-
-> **Important** 
->
-> - This page only shows **some frequently used commands**. For the latest information about `pulsar`, `pulsar-client`, and `pulsar-perf`, including commands, flags, descriptions, and more information, see [Pulsar tools](https://pulsar.apache.org/tools/).
->  
-> - You can get help for any CLI tool, command, or subcommand using the `--help` flag, or `-h` for short. Here's an example:
-> 
-
-> ```shell
-> 
-> $ bin/pulsar broker --help
->
-> 
-> ```
-
-
-## `pulsar`
-
-The pulsar tool is used to start Pulsar components, such as bookies and ZooKeeper, in the foreground.
-
-These processes can also be started in the background, using nohup, using the pulsar-daemon tool, which has the same command interface as pulsar.
-
-Usage:
-
-```bash
-
-$ pulsar command
-
-```
-
-Commands:
-* `bookie`
-* `broker`
-* `compact-topic`
-* `configuration-store`
-* `initialize-cluster-metadata`
-* `proxy`
-* `standalone`
-* `websocket`
-* `zookeeper`
-* `zookeeper-shell`
-* `autorecovery`
-
-Example:
-
-```bash
-
-$ PULSAR_BROKER_CONF=/path/to/broker.conf pulsar broker
-
-```
-
-The table below lists the environment variables that you can use to configure the `pulsar` tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|`PULSAR_LOG_CONF`|Log4j configuration file|`conf/log4j2.yaml`|
-|`PULSAR_BROKER_CONF`|Configuration file for broker|`conf/broker.conf`|
-|`PULSAR_BOOKKEEPER_CONF`|description: Configuration file for bookie|`conf/bookkeeper.conf`|
-|`PULSAR_ZK_CONF`|Configuration file for zookeeper|`conf/zookeeper.conf`|
-|`PULSAR_CONFIGURATION_STORE_CONF`|Configuration file for the configuration store|`conf/global_zookeeper.conf`|
-|`PULSAR_WEBSOCKET_CONF`|Configuration file for websocket proxy|`conf/websocket.conf`|
-|`PULSAR_STANDALONE_CONF`|Configuration file for standalone|`conf/standalone.conf`|
-|`PULSAR_EXTRA_OPTS`|Extra options to be passed to the jvm||
-|`PULSAR_EXTRA_CLASSPATH`|Extra paths for Pulsar's classpath||
-|`PULSAR_PID_DIR`|Folder where the pulsar server PID file should be stored||
-|`PULSAR_STOP_TIMEOUT`|Wait time before forcefully killing the Bookie server instance if attempts to stop it are not successful||
-|`PULSAR_GC_LOG`|Gc options to be passed to the jvm||
-
-
-### `bookie`
-
-Starts up a bookie server
-
-Usage:
-
-```bash
-
-$ pulsar bookie options
-
-```
-
-Options
-
-|Option|Description|Default|
-|---|---|---|
-|`-readOnly`|Force start a read-only bookie server|false|
-|`-withAutoRecovery`|Start auto-recover service bookie server|false|
-
-
-Example
-
-```bash
-
-$ PULSAR_BOOKKEEPER_CONF=/path/to/bookkeeper.conf pulsar bookie \
-  -readOnly \
-  -withAutoRecovery
-
-```
-
-### `broker`
-
-Starts up a Pulsar broker
-
-Usage
-
-```bash
-
-$ pulsar broker options
-
-```
-
-Options
-
-|Option|Description|Default|
-|---|---|---|
-|`-bc` , `--bookie-conf`|Configuration file for BookKeeper||
-|`-rb` , `--run-bookie`|Run a BookKeeper bookie on the same host as the Pulsar broker|false|
-|`-ra` , `--run-bookie-autorecovery`|Run a BookKeeper autorecovery daemon on the same host as the Pulsar broker|false|
-
-Example
-
-```bash
-
-$ PULSAR_BROKER_CONF=/path/to/broker.conf pulsar broker
-
-```
-
-### `compact-topic`
-
-Run compaction against a Pulsar topic (in a new process)
-
-Usage
-
-```bash
-
-$ pulsar compact-topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t` , `--topic`|The Pulsar topic that you would like to compact||
-
-Example
-
-```bash
-
-$ pulsar compact-topic --topic topic-to-compact
-
-```
-
-### `configuration-store`
-
-Starts up the Pulsar configuration store
-
-Usage
-
-```bash
-
-$ pulsar configuration-store
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_CONFIGURATION_STORE_CONF=/path/to/configuration_store.conf pulsar configuration-store
-
-```
-
-### `initialize-cluster-metadata`
-
-One-time cluster metadata initialization
-
-Usage
-
-```bash
-
-$ pulsar initialize-cluster-metadata options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-ub` , `--broker-service-url`|The broker service URL for the new cluster||
-|`-tb` , `--broker-service-url-tls`|The broker service URL for the new cluster with TLS encryption||
-|`-c` , `--cluster`|Cluster name||
-|`-cms` , `--configuration-metadata-store`|The configuration metadata store quorum connection string||
-|`--existing-bk-metadata-service-uri`|The metadata service URI of the existing BookKeeper cluster that you want to use||
-|`-h` , `--help`|Help message|false|
-|`--initial-num-stream-storage-containers`|The number of storage containers of BookKeeper stream storage|16|
-|`--initial-num-transaction-coordinators`|The number of transaction coordinators assigned in a cluster|16|
-|`-uw` , `--web-service-url`|The web service URL for the new cluster||
-|`-tw` , `--web-service-url-tls`|The web service URL for the new cluster with TLS encryption||
-|`-md` , `--metadata-store`|The metadata store service url||
-|`--zookeeper-session-timeout-ms`|The local ZooKeeper session timeout. The time unit is in millisecond(ms)|30000|
-
-
-### `proxy`
-
-Manages the Pulsar proxy
-
-Usage
-
-```bash
-
-$ pulsar proxy options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-cms`, `--configuration-metadata-store`|Configuration metadata store connection string||
-|`-md` , `--metadata-store`|Metadata Store service url||
-
-Example
-
-```bash
-
-$ PULSAR_PROXY_CONF=/path/to/proxy.conf pulsar proxy \
-  --metadata-store zk:my-zk-1:2181,my-zk-2:2181,my-zk-3:2181 \
-  --configuration-metadata-store zk:my-zk-1:2181,my-zk-2:2181,my-zk-3:2181
-
-```
-
-### `standalone`
-
-Run a broker service with local bookies and local ZooKeeper
-
-Usage
-
-```bash
-
-$ pulsar standalone options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-a` , `--advertised-address`|The standalone broker advertised address||
-|`--bookkeeper-dir`|Local bookies’ base data directory|data/standalone/bookkeeper|
-|`--bookkeeper-port`|Local bookies’ base port|3181|
-|`--no-broker`|Only start ZooKeeper and BookKeeper services, not the broker|false|
-|`--num-bookies`|The number of local bookies|1|
-|`--only-broker`|Only start the Pulsar broker service (not ZooKeeper or BookKeeper)||
-|`--wipe-data`|Clean up previous ZooKeeper/BookKeeper data||
-|`--zookeeper-dir`|Local ZooKeeper’s data directory|data/standalone/zookeeper|
-|`--zookeeper-port` |Local ZooKeeper’s port|2181|
-
-Example
-
-```bash
-
-$ PULSAR_STANDALONE_CONF=/path/to/standalone.conf pulsar standalone
-
-```
-
-### `websocket`
-
-Usage
-
-```bash
-
-$ pulsar websocket
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_WEBSOCKET_CONF=/path/to/websocket.conf pulsar websocket
-
-```
-
-### `zookeeper`
-
-Starts up a ZooKeeper cluster
-
-Usage
-
-```bash
-
-$ pulsar zookeeper
-
-```
-
-Example
-
-```bash
-
-$ PULSAR_ZK_CONF=/path/to/zookeeper.conf pulsar zookeeper
-
-```
-
-### `zookeeper-shell`
-
-Connects to a running ZooKeeper cluster using the ZooKeeper shell
-
-Usage
-
-```bash
-
-$ pulsar zookeeper-shell options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration file for ZooKeeper||
-|`-server`|Configuration zk address, eg: `127.0.0.1:2181`||
-
-### `autorecovery`
-
-Runs an auto-recovery service.
-
-Usage
-
-```bash
-
-$ pulsar autorecovery options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the autorecovery|N/A|
-
-
-## `pulsar-client`
-
-The pulsar-client tool
-
-Usage
-
-```bash
-
-$ pulsar-client command
-
-```
-
-Commands
-* `produce`
-* `consume`
-
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class, for example "key1:val1,key2:val2" or "{\"key1\":\"val1\",\"key2\":\"val2\"}"|{"saslJaasClientSectionName":"PulsarClient", "serverType":"broker"}|
-|`--auth-plugin`|Authentication plugin class name|org.apache.pulsar.client.impl.auth.AuthenticationSasl|
-|`--listener-name`|Listener name for the broker||
-|`--proxy-protocol`|Proxy protocol to select type of routing at proxy||
-|`--proxy-url`|Proxy-server URL to which to connect||
-|`--url`|Broker URL to which to connect|pulsar://localhost:6650/ 
     ws://localhost:8080 |
-| `-v`, `--version` | Get the version of the Pulsar client
-|`-h`, `--help`|Show this help
-
-
-### `produce`
-Send a message or messages to a specific broker and topic
-
-Usage
-
-```bash
-
-$ pulsar-client produce topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-f`, `--files`|Comma-separated file paths to send; either -m or -f must be specified|[]|
-|`-m`, `--messages`|Comma-separated string of messages to send; either -m or -f must be specified|[]|
-|`-n`, `--num-produce`|The number of times to send the message(s); the count of messages/files * num-produce should be below 1000|1|
-|`-r`, `--rate`|Rate (in messages per second) at which to produce; a value 0 means to produce messages as fast as possible|0.0|
-|`-db`, `--disable-batching`|Disable batch sending of messages|false|
-|`-c`, `--chunking`|Split the message and publish in chunks if the message size is larger than the allowed max size|false|
-|`-s`, `--separator`|Character to split messages string with.|","|
-|`-k`, `--key`|Message key to add|key=value string, like k1=v1,k2=v2.|
-|`-p`, `--properties`|Properties to add. If you want to add multiple properties, use the comma as the separator, e.g. `k1=v1,k2=v2`.| |
-|`-ekn`, `--encryption-key-name`|The public key name to encrypt payload.| |
-|`-ekv`, `--encryption-key-value`|The URI of public key to encrypt payload. For example, `file:///path/to/public.key` or `data:application/x-pem-file;base64,*****`.| |
-
-
-### `consume`
-Consume messages from a specific broker and topic
-
-Usage
-
-```bash
-
-$ pulsar-client consume topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--hex`|Display binary messages in hexadecimal format.|false|
-|`-n`, `--num-messages`|Number of messages to consume, 0 means to consume forever.|1|
-|`-r`, `--rate`|Rate (in messages per second) at which to consume; a value 0 means to consume messages as fast as possible|0.0|
-|`--regex`|Indicate the topic name is a regex pattern|false|
-|`-s`, `--subscription-name`|Subscription name||
-|`-t`, `--subscription-type`|The type of the subscription. Possible values: Exclusive, Shared, Failover, Key_Shared.|Exclusive|
-|`-p`, `--subscription-position`|The position of the subscription. Possible values: Latest, Earliest.|Latest|
-|`-m`, `--subscription-mode`|Subscription mode. Possible values: Durable, NonDurable.|Durable|
-|`-q`, `--queue-size`|The size of consumer's receiver queue.|0|
-|`-mc`, `--max_chunked_msg`|Max pending chunk messages.|0|
-|`-ac`, `--auto_ack_chunk_q_full`|Auto ack for the oldest message in consumer's receiver queue if the queue full.|false|
-|`--hide-content`|Do not print the message to the console.|false|
-|`-st`, `--schema-type`|Set the schema type. Use `auto_consume` to dump AVRO and other structured data types. Possible values: bytes, auto_consume.|bytes|
-|`-ekv`, `--encryption-key-value`|The URI of public key to encrypt payload. For example, `file:///path/to/public.key` or `data:application/x-pem-file;base64,*****`.| |
-|`-pm`, `--pool-messages`|Use the pooled message.|true|
-
-## `pulsar-daemon`
-A wrapper around the pulsar tool that’s used to start and stop processes, such as ZooKeeper, bookies, and Pulsar brokers, in the background using nohup.
-
-pulsar-daemon has a similar interface to the pulsar command but adds start and stop commands for various services. For a listing of those services, run pulsar-daemon to see the help output or see the documentation for the pulsar command.
-
-Usage
-
-```bash
-
-$ pulsar-daemon command
-
-```
-
-Commands
-* `start`
-* `stop`
-* `restart`
-
-
-### `start`
-Start a service in the background using nohup.
-
-Usage
-
-```bash
-
-$ pulsar-daemon start service
-
-```
-
-### `stop`
-Stop a service that’s already been started using start.
-
-Usage
-
-```bash
-
-$ pulsar-daemon stop service options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|-force|Stop the service forcefully if not stopped by normal shutdown.|false|
-
-### `restart`
-Restart a service that has already been started.
-
-```bash
-
-$ pulsar-daemon restart service
-
-```
-
-## `pulsar-perf`
-A tool for performance testing a Pulsar broker.
-
-Usage
-
-```bash
-
-$ pulsar-perf command
-
-```
-
-Commands
-* `consume`
-* `produce`
-* `read`
-* `websocket-producer`
-* `managed-ledger`
-* `monitor-brokers`
-* `simulation-client`
-* `simulation-controller`
-* `transaction`
-* `help`
-
-Environment variables
-
-The table below lists the environment variables that you can use to configure the pulsar-perf tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|`PULSAR_LOG_CONF`|Log4j configuration file|conf/log4j2.yaml|
-|`PULSAR_CLIENT_CONF`|Configuration file for the client|conf/client.conf|
-|`PULSAR_EXTRA_OPTS`|Extra options to be passed to the JVM||
-|`PULSAR_EXTRA_CLASSPATH`|Extra paths for Pulsar's classpath||
-|`PULSAR_GC_LOG`|Gc options to be passed to the jvm||
-
-
-### `consume`
-Run a consumer
-
-Usage
-
-```
-
-$ pulsar-perf consume options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class. For example, `key1:val1,key2:val2` or `{"key1":"val1","key2":"val2"}`.||
-|`--auth-plugin`|Authentication plugin class name||
-|`-ac`, `--auto_ack_chunk_q_full`|Auto ack for the oldest message in consumer's receiver queue if the queue full|false|
-|`--listener-name`|Listener name for the broker||
-|`--acks-delay-millis`|Acknowledgements grouping delay in millis|100|
-|`--batch-index-ack`|Enable or disable the batch index acknowledgment|false|
-|`-bw`, `--busy-wait`|Enable or disable Busy-Wait on the Pulsar client|false|
-|`-v`, `--encryption-key-value-file`|The file which contains the private key to decrypt payload||
-|`-h`, `--help`|Help message|false|
-|`-cf`, `--conf-file`|Configuration file||
-|`-m`, `--num-messages`|Number of messages to consume in total. If the value is equal to or smaller than 0, it keeps consuming messages.|0|
-|`-e`, `--expire_time_incomplete_chunked_messages`|The expiration time for incomplete chunk messages (in milliseconds)|0|
-|`-c`, `--max-connections`|Max number of TCP connections to a single broker|100|
-|`-mc`, `--max_chunked_msg`|Max pending chunk messages|0|
-|`-n`, `--num-consumers`|Number of consumers (per topic)|1|
-|`-ioThreads`, `--num-io-threads`|Set the number of threads to be used for handling connections to brokers|1|
-|`-lt`, `--num-listener-threads`|Set the number of threads to be used for message listeners|1|
-|`-ns`, `--num-subscriptions`|Number of subscriptions (per topic)|1|
-|`-t`, `--num-topics`|The number of topics|1|
-|`-pm`, `--pool-messages`|Use the pooled message|true|
-|`-r`, `--rate`|Simulate a slow message consumer (rate in msg/s)|0|
-|`-q`, `--receiver-queue-size`|Size of the receiver queue|1000|
-|`-p`, `--receiver-queue-size-across-partitions`|Max total size of the receiver queue across partitions|50000|
-|`--replicated`|Whether the subscription status should be replicated|false|
-|`-u`, `--service-url`|Pulsar service URL||
-|`-i`, `--stats-interval-seconds`|Statistics interval seconds. If 0, statistics will be disabled|0|
-|`-s`, `--subscriber-name`|Subscriber name prefix||
-|`-ss`, `--subscriptions`|A list of subscriptions to consume on (e.g. sub1,sub2)|sub|
-|`-st`, `--subscription-type`|Subscriber type. Possible values are Exclusive, Shared, Failover, Key_Shared.|Exclusive|
-|`-sp`, `--subscription-position`|Subscriber position. Possible values are Latest, Earliest.|Latest|
-|`-time`, `--test-duration`|Test duration (in seconds). If this value is less than or equal to 0, it keeps consuming messages.|0|
-|`--trust-cert-file`|Path for the trusted TLS certificate file||
-|`--tls-allow-insecure`|Allow insecure TLS connection||
-
-Below are **transaction** related options.
-
-If you want `--txn-timeout`, `--numMessage-perTransaction`, `-nmt`, `-ntxn`, or `-abort` take effect, set `--txn-enable` to true.
-
-|Flag|Description|Default|
-|---|---|---|
-`-tto`, `--txn-timeout`|Set the time of transaction timeout (in second). |10
-`-nmt`, `--numMessage-perTransaction`|The number of messages acknowledged by a transaction. |50
-`-txn`, `--txn-enable`|Enable or disable a transaction.|false
-`-ntxn`|The number of opened transactions. 0 means the number of transactions is unlimited. |0
-`-abort`|Abort a transaction. |true
-
-### `produce`
-Run a producer
-
-Usage
-
-```bash
-
-$ pulsar-perf produce options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-am`, `--access-mode`|Producer access mode. Valid values are `Shared`, `Exclusive` and `WaitForExclusive`|Shared|
-|`-au`, `--admin-url`|Pulsar admin URL||
-|`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class. For example, `key1:val1,key2:val2` or `{"key1":"val1","key2":"val2"}`.||
-|`--auth-plugin`|Authentication plugin class name||
-|`--listener-name`|Listener name for the broker||
-|`-b`, `--batch-time-window`|Batch messages in a window of the specified number of milliseconds|1|
-|`-bb`, `--batch-max-bytes`|Maximum number of bytes per batch|4194304|
-|`-bm`, `--batch-max-messages`|Maximum number of messages per batch|1000|
-|`-bw`, `--busy-wait`|Enable or disable Busy-Wait on the Pulsar client|false|
-|`-ch`, `--chunking`|Split the message and publish in chunks if the message size is larger than allowed max size|false|
-|`-d`, `--delay`|Mark messages with a given delay in seconds|0s|
-|`-z`, `--compression`|Compress messages’ payload. Possible values are NONE, LZ4, ZLIB, ZSTD or SNAPPY.||
-|`-cf`, `--conf-file`|Configuration file||
-|`-k`, `--encryption-key-name`|The public key name to encrypt payload||
-|`-v`, `--encryption-key-value-file`|The file which contains the public key to encrypt payload||
-|`-ef`, `--exit-on-failure`|Exit from the process on publish failure|false|
-|`-fc`, `--format-class`|Custom Formatter class name|org.apache.pulsar.testclient.DefaultMessageFormatter|
-|`-fp`, `--format-payload`|Format %i as a message index in the stream from producer and/or %t as the timestamp nanoseconds|false|
-|`-h`, `--help`|Help message|false|
-|`-c`, `--max-connections`|Max number of TCP connections to a single broker|100|
-|`-o`, `--max-outstanding`|Max number of outstanding messages|1000|
-|`-p`, `--max-outstanding-across-partitions`|Max number of outstanding messages across partitions|50000|
-|`-m`, `--num-messages`|Number of messages to publish in total. If this value is less than or equal to 0, it keeps publishing messages.|0|
-|`-mk`, `--message-key-generation-mode`|The generation mode of message key. Valid options are `autoIncrement`, `random`||
-|`-ioThreads`, `--num-io-threads`|Set the number of threads to be used for handling connections to brokers|1|
-|`-n`, `--num-producers`|The number of producers (per topic)|1|
-|`-threads`, `--num-test-threads`|Number of test threads|1|
-|`-t`, `--num-topic`|The number of topics|1|
-|`-np`, `--partitions`|Create partitioned topics with the given number of partitions. Setting this value to 0 means not trying to create a topic||
-|`-f`, `--payload-file`|Use payload from an UTF-8 encoded text file and a payload will be randomly selected when publishing messages||
-|`-e`, `--payload-delimiter`|The delimiter used to split lines when using payload from a file|\n|
-|`-pn`, `--producer-name`|Producer Name||
-|`-r`, `--rate`|Publish rate msg/s across topics|100|
-|`--send-timeout`|Set the sendTimeout|0|
-|`--separator`|Separator between the topic and topic number|-|
-|`-u`, `--service-url`|Pulsar service URL||
-|`-s`, `--size`|Message size (in bytes)|1024|
-|`-i`, `--stats-interval-seconds`|Statistics interval seconds. If 0, statistics will be disabled.|0|
-|`-time`, `--test-duration`|Test duration (in seconds). If this value is less than or equal to 0, it keeps publishing messages.|0|
-|`--trust-cert-file`|Path for the trusted TLS certificate file||
-|`--warmup-time`|Warm-up time in seconds|1|
-|`--tls-allow-insecure`|Allow insecure TLS connection||
-
-Below are **transaction** related options.
-
-If you want `--txn-timeout`, `--numMessage-perTransaction`, or `-abort` take effect, set `--txn-enable` to true.
-
-|Flag|Description|Default|
-|---|---|---|
-`-tto`, `--txn-timeout`|Set the time of transaction timeout (in second). |5
-`-nmt`, `--numMessage-perTransaction`|The number of messages acknowledged by a transaction. |50
-`-txn`, `--txn-enable`|Enable or disable a transaction.|true
-`-abort`|Abort a transaction. |true
-
-### `read`
-Run a topic reader
-
-Usage
-
-```bash
-
-$ pulsar-perf read options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class. For example, `key1:val1,key2:val2` or `{"key1":"val1","key2":"val2"}`.||
-|`--auth-plugin`|Authentication plugin class name||
-|`--listener-name`|Listener name for the broker||
-|`-cf`, `--conf-file`|Configuration file||
-|`-h`, `--help`|Help message|false|
-|`-n`, `--num-messages`|Number of messages to consume in total. If the value is equal to or smaller than 0, it keeps consuming messages.|0|
-|`-c`, `--max-connections`|Max number of TCP connections to a single broker|100|
-|`-ioThreads`, `--num-io-threads`|Set the number of threads to be used for handling connections to brokers|1|
-|`-lt`, `--num-listener-threads`|Set the number of threads to be used for message listeners|1|
-|`-t`, `--num-topics`|The number of topics|1|
-|`-r`, `--rate`|Simulate a slow message reader (rate in msg/s)|0|
-|`-q`, `--receiver-queue-size`|Size of the receiver queue|1000|
-|`-u`, `--service-url`|Pulsar service URL||
-|`-m`, `--start-message-id`|Start message id. This can be either 'earliest', 'latest' or a specific message id by using 'lid:eid'|earliest|
-|`-i`, `--stats-interval-seconds`|Statistics interval seconds. If 0, statistics will be disabled.|0|
-|`-time`, `--test-duration`|Test duration (in seconds). If this value is less than or equal to 0, it keeps consuming messages.|0|
-|`--trust-cert-file`|Path for the trusted TLS certificate file||
-|`--use-tls`|Use TLS encryption on the connection|false|
-|`--tls-allow-insecure`|Allow insecure TLS connection||
-
-### `websocket-producer`
-Run a websocket producer
-
-Usage
-
-```bash
-
-$ pulsar-perf websocket-producer options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class. For example, `key1:val1,key2:val2` or `{"key1":"val1","key2":"val2"}`.||
-|`--auth-plugin`|Authentication plugin class name||
-|`-cf`, `--conf-file`|Configuration file||
-|`-h`, `--help`|Help message|false|
-|`-m`, `--num-messages`|Number of messages to publish in total. If this value is less than or equal to 0, it keeps publishing messages.|0|
-|`-t`, `--num-topic`|The number of topics|1|
-|`-f`, `--payload-file`|Use payload from a file instead of empty buffer||
-|`-e`, `--payload-delimiter`|The delimiter used to split lines when using payload from a file|\n|
-|`-fp`, `--format-payload`|Format %i as a message index in the stream from producer and/or %t as the timestamp nanoseconds|false|
-|`-fc`, `--format-class`|Custom formatter class name|`org.apache.pulsar.testclient.DefaultMessageFormatter`|
-|`-u`, `--proxy-url`|Pulsar Proxy URL, e.g., "ws://localhost:8080/"||
-|`-r`, `--rate`|Publish rate msg/s across topics|100|
-|`-s`, `--size`|Message size in byte|1024|
-|`-time`, `--test-duration`|Test duration (in seconds). If this value is less than or equal to 0, it keeps publishing messages.|0|
-
-
-### `managed-ledger`
-Write directly on managed-ledgers
-
-Usage
-
-```bash
-
-$ pulsar-perf managed-ledger options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-a`, `--ack-quorum`|Ledger ack quorum|1|
-|`-dt`, `--digest-type`|BookKeeper digest type. Possible Values: [CRC32, MAC, CRC32C, DUMMY]|CRC32C|
-|`-e`, `--ensemble-size`|Ledger ensemble size|1|
-|`-h`, `--help`|Help message|false|
-|`-c`, `--max-connections`|Max number of TCP connections to a single bookie|1|
-|`-o`, `--max-outstanding`|Max number of outstanding requests|1000|
-|`-m`, `--num-messages`|Number of messages to publish in total. If this value is less than or equal to 0, it keeps publishing messages.|0|
-|`-t`, `--num-topic`|Number of managed ledgers|1|
-|`-r`, `--rate`|Write rate msg/s across managed ledgers|100|
-|`-s`, `--size`|Message size in byte|1024|
-|`-time`, `--test-duration`|Test duration (in seconds). If this value is less than or equal to 0, it keeps publishing messages.|0|
-|`--threads`|Number of threads writing|1|
-|`-w`, `--write-quorum`|Ledger write quorum|1|
-|`-md`, `--metadata-store`|Metadata store service URL. For example: zk:my-zk:2181||
-
-
-### `monitor-brokers`
-Continuously receive broker data and/or load reports
-
-Usage
-
-```bash
-
-$ pulsar-perf monitor-brokers options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--connect-string`|A connection string for one or more ZooKeeper servers||
-|`-h`, `--help`|Help message|false|
-
-
-### `simulation-client`
-Run a simulation server acting as a Pulsar client. Uses the client configuration specified in `conf/client.conf`.
-
-Usage
-
-```bash
-
-$ pulsar-perf simulation-client options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--port`|Port to listen on for controller|0|
-|`--service-url`|Pulsar Service URL||
-|`-h`, `--help`|Help message|false|
-
-### `simulation-controller`
-Run a simulation controller to give commands to servers
-
-Usage
-
-```bash
-
-$ pulsar-perf simulation-controller options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--client-port`|The port that the clients are listening on|0|
-|`--clients`|Comma-separated list of client hostnames||
-|`--cluster`|The cluster to test on||
-|`-h`, `--help`|Help message|false|
-
-### `transaction`
-
-Run a transaction. For more information, see [Pulsar transactions](txn-why.md).
-
-**Usage**
-
-```bash
-
-$ pulsar-perf transaction options
-
-```
-
-**Options**
-
-|Flag|Description|Default|
-|---|---|---|
-`--auth-params`|Authentication parameters, whose format is determined by the implementation of method `configure` in authentication plugin class. For example, `key1:val1,key2:val2` or `{"key1":"val1","key2":"val2"}`.|N/A
-`--auth-plugin`|Authentication plugin class name.|N/A
-`-au`, `--admin-url`|Pulsar admin URL.|N/A
-`-cf`, `--conf-file`|Configuration file.|N/A
-`-h`, `--help`|Help messages.|N/A
-`-c`, `--max-connections`|Maximum number of TCP connections to a single broker.|100
-`-ioThreads`, `--num-io-threads`|Set the number of threads to be used for handling connections to brokers. |1
-`-ns`, `--num-subscriptions`|Number of subscriptions per topic.|1
-`-threads`, `--num-test-threads`|Number of test threads. 

    This thread is for a new transaction to ack messages from consumer topics, produce messages to producer topics, and commit or abort this transaction. 

     Increasing the number of threads increases the parallelism of the performance test, consequently, it increases the intensity of the stress test.|1
-`-nmc`, `--numMessage-perTransaction-consume`|Set the number of messages consumed in a transaction. 

     If transaction is disabled, it means the number of messages consumed in a task instead of in a transaction.|1
-`-nmp`, `--numMessage-perTransaction-produce`|Set the number of messages produced in a transaction. 

    If transaction is disabled, it means the number of messages produced in a task instead of in a transaction.|1
-`-ntxn`, `--number-txn`|Set the number of transactions. 

     0 means the number of transactions is unlimited. 

     If transaction is disabled, it means the number of tasks instead of transactions. |0
-`-np`, `--partitions`|Create partitioned topics with a given number of partitions. 

     0 means not trying to create a topic.
-`-q`, `--receiver-queue-size`|Size of the receiver queue.|1000
-`-u`, `--service-url`|Pulsar service URL.|N/A
-`-sp`, `--subscription-position`|Subscription position.|Earliest
-`-st`, `--subscription-type`|Subscription type.|Shared
-`-ss`, `--subscriptions`|A list of subscriptions to consume. 

     For example, sub1,sub2.|[sub]
-`-time`, `--test-duration`|Test duration (in second). 

     0 means keeping publishing messages.|0
-`--topics-c`|All topics assigned to consumers.|[test-consume]
-`--topics-p`|All topics assigned to producers . |[test-produce]
-`--txn-disEnable`|Disable transaction.|true
-`-tto`, `--txn-timeout`|Set the time of transaction timeout (in second). 

     If you want `--txn-timeout` takes effect, set `--txn-enable` to true.|5
-`-abort`|Abort the transaction. 

     If you want `-abort` takes effect, set `--txn-disEnable` to false.|true
-`-txnRate`|Set the rate of opened transactions or tasks. 

     0 means no limit.|0
-
-### `help`
-This help message
-
-Usage
-
-```bash
-
-$ pulsar-perf help
-
-```
-
-## `bookkeeper`
-A tool for managing BookKeeper.
-
-Usage
-
-```bash
-
-$ bookkeeper command
-
-```
-
-Commands
-* `autorecovery`
-* `bookie`
-* `localbookie`
-* `upgrade`
-* `shell`
-
-
-Environment variables
-
-The table below lists the environment variables that you can use to configure the bookkeeper tool.
-
-|Variable|Description|Default|
-|---|---|---|
-|BOOKIE_LOG_CONF|Log4j configuration file|conf/log4j2.yaml|
-|BOOKIE_CONF|BookKeeper configuration file|conf/bk_server.conf|
-|BOOKIE_EXTRA_OPTS|Extra options to be passed to the JVM||
-|BOOKIE_EXTRA_CLASSPATH|Extra paths for BookKeeper's classpath||
-|ENTRY_FORMATTER_CLASS|The Java class used to format entries||
-|BOOKIE_PID_DIR|Folder where the BookKeeper server PID file should be stored||
-|BOOKIE_STOP_TIMEOUT|Wait time before forcefully killing the Bookie server instance if attempts to stop it are not successful||
-|BOOKIE_GC_LOG|Gc options to be passed to the jvm||
-
-
-### `autorecovery`
-Runs an auto-recovery service
-
-Usage
-
-```bash
-
-$ bookkeeper autorecovery options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-
-
-### `bookie`
-Starts up a BookKeeper server (aka bookie)
-
-Usage
-
-```bash
-
-$ bookkeeper bookie options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-|-readOnly|Force start a read-only bookie server|false|
-|-withAutoRecovery|Start auto-recovery service bookie server|false|
-
-
-### `localbookie`
-Runs a test ensemble of N bookies locally
-
-Usage
-
-```bash
-
-$ bookkeeper localbookie N
-
-```
-
-### `upgrade`
-Upgrade the bookie’s filesystem
-
-Usage
-
-```bash
-
-$ bookkeeper upgrade options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--conf`|Configuration for the auto-recovery||
-|`-u`, `--upgrade`|Upgrade the bookie’s directories||
-
-
-### `shell`
-Run shell for admin commands. To see a full listing of those commands, run bookkeeper shell without an argument.
-
-Usage
-
-```bash
-
-$ bookkeeper shell
-
-```
-
-Example
-
-```bash
-
-$ bookkeeper shell bookiesanity
-
-```
-
-## `broker-tool`
-
-The `broker- tool` is used for operations on a specific broker.
-
-Usage
-
-```bash
-
-$ broker-tool command
-
-```
-
-Commands
-* `load-report`
-* `help`
-
-Example
-Two ways to get more information about a command as below:
-
-```bash
-
-$ broker-tool help command
-$ broker-tool command --help
-
-```
-
-### `load-report`
-
-Collect the load report of a specific broker. 
-The command is run on a broker, and used for troubleshooting why broker can’t collect right load report.
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--interval`| Interval to collect load report, in milliseconds ||
-|`-h`, `--help`| Display help information ||
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/reference-configuration.md b/site2/website/versioned_docs/version-2.1.1-incubating/reference-configuration.md
deleted file mode 100644
index c7fadc4918412..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/reference-configuration.md
+++ /dev/null
@@ -1,466 +0,0 @@
----
-id: reference-configuration
-title: Pulsar configuration
-sidebar_label: "Pulsar configuration"
-original_id: reference-configuration
----
-
-
-
-
-Pulsar configuration can be managed either via a series of configuration files contained in the [`conf`](https://github.com/apache/incubator-pulsar/tree/master/conf) directory of a Pulsar [installation](getting-started-standalone.md)
-
-* [BookKeeper](#bookkeeper)
-* [Broker](#broker)
-* [Client](#client)
-* [Service discovery](#service-discovery)
-* [Log4j](#log4j)
-* [Log4j shell](#log4j-shell)
-* [Standalone](#standalone)
-* [WebSocket](#websocket)
-* [ZooKeeper](#zookeeper)
-
-## BookKeeper
-
-BookKeeper is a replicated log storage system that Pulsar uses for durable storage of all messages.
-
-
-|Name|Description|Default|
-|---|---|---|
-|bookiePort|The port on which the bookie server listens.|3181|
-|allowLoopback|Whether the bookie is allowed to use a loopback interface as its primary interface (i.e. the interface used to establish its identity). By default, loopback interfaces are not allowed as the primary interface. Using a loopback interface as the primary interface usually indicates a configuration error. For example, it’s fairly common in some VPS setups to not configure a hostname or to have the hostname resolve to `127.0.0.1`. If this is the case, then all bookies in the cluster will establish their identities as `127.0.0.1:3181` and only one will be able to join the cluster. For VPSs configured like this, you should explicitly set the listening interface.|false|
-|listeningInterface|The network interface on which the bookie listens. If not set, the bookie will listen on all interfaces.|eth0|
-|journalDirectory|The directory where Bookkeeper outputs its write-ahead log (WAL)|data/bookkeeper/journal|
-|ledgerDirectories|The directory where Bookkeeper outputs ledger snapshots. This could define multiple directories to store snapshots separated by comma, for example `ledgerDirectories=/tmp/bk1-data,/tmp/bk2-data`. Ideally, ledger dirs and the journal dir are each in a different device, which reduces the contention between random I/O and sequential write. It is possible to run with a single disk, but performance will be significantly lower.|data/bookkeeper/ledgers|
-|ledgerManagerType|The type of ledger manager used to manage how ledgers are stored, managed, and garbage collected. See [BookKeeper Internals](http://bookkeeper.apache.org/docs/latest/getting-started/concepts) for more info.|hierarchical|
-|zkLedgersRootPath|The root ZooKeeper path used to store ledger metadata. This parameter is used by the ZooKeeper-based ledger manager as a root znode to store all ledgers.|/ledgers|
-|ledgerStorageClass|Ledger storage implementation class|org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage|
-|entryLogFilePreallocationEnabled|Enable or disable entry logger preallocation|true|
-|logSizeLimit|Max file size of the entry logger, in bytes. A new entry log file will be created when the old one reaches the file size limitation.|1073741824|
-|minorCompactionThreshold|Threshold of minor compaction. Entry log files whose remaining size percentage reaches below this threshold will be compacted in a minor compaction. If set to less than zero, the minor compaction is disabled.|0.2|
-|minorCompactionInterval|Time interval to run minor compaction, in seconds. If set to less than zero, the minor compaction is disabled.|3600|
-|majorCompactionThreshold|The threshold of major compaction. Entry log files whose remaining size percentage reaches below this threshold will be compacted in a major compaction. Those entry log files whose remaining size percentage is still higher than the threshold will never be compacted. If set to less than zero, the minor compaction is disabled.|0.5|
-|majorCompactionInterval|The time interval to run major compaction, in seconds. If set to less than zero, the major compaction is disabled.|86400|
-|compactionMaxOutstandingRequests|Sets the maximum number of entries that can be compacted without flushing. When compacting, the entries are written to the entrylog and the new offsets are cached in memory. Once the entrylog is flushed the index is updated with the new offsets. This parameter controls the number of entries added to the entrylog before a flush is forced. A higher value for this parameter means more memory will be used for offsets. Each offset consists of 3 longs. This parameter should not be modified unless you’re fully aware of the consequences.|100000|
-|compactionRate|The rate at which compaction will read entries, in adds per second.|1000|
-|isThrottleByBytes|Throttle compaction by bytes or by entries.|false|
-|compactionRateByEntries|The rate at which compaction will read entries, in adds per second.|1000|
-|compactionRateByBytes|Set the rate at which compaction reads entries. The unit is bytes added per second.|1000000|
-|journalMaxSizeMB|Max file size of journal file, in megabytes. A new journal file will be created when the old one reaches the file size limitation.|2048|
-|journalMaxBackups|The max number of old journal files to keep. Keeping a number of old journal files would help data recovery in special cases.|5|
-|journalPreAllocSizeMB|How space to pre-allocate at a time in the journal.|16|
-|journalWriteBufferSizeKB|The of the write buffers used for the journal.|64|
-|journalRemoveFromPageCache|Whether pages should be removed from the page cache after force write.|true|
-|journalAdaptiveGroupWrites|Whether to group journal force writes, which optimizes group commit for higher throughput.|true|
-|journalMaxGroupWaitMSec|The maximum latency to impose on a journal write to achieve grouping.|1|
-|journalAlignmentSize|All the journal writes and commits should be aligned to given size|4096|
-|journalBufferedWritesThreshold|Maximum writes to buffer to achieve grouping|524288|
-|journalFlushWhenQueueEmpty|If we should flush the journal when journal queue is empty|false|
-|numJournalCallbackThreads|The number of threads that should handle journal callbacks|8|
-|rereplicationEntryBatchSize|The number of max entries to keep in fragment for re-replication|5000|
-|gcWaitTime|How long the interval to trigger next garbage collection, in milliseconds. Since garbage collection is running in background, too frequent gc will heart performance. It is better to give a higher number of gc interval if there is enough disk capacity.|900000|
-|gcOverreplicatedLedgerWaitTime|How long the interval to trigger next garbage collection of overreplicated ledgers, in milliseconds. This should not be run very frequently since we read the metadata for all the ledgers on the bookie from zk.|86400000|
-|flushInterval|How long the interval to flush ledger index pages to disk, in milliseconds. Flushing index files will introduce much random disk I/O. If separating journal dir and ledger dirs each on different devices, flushing would not affect performance. But if putting journal dir and ledger dirs on same device, performance degrade significantly on too frequent flushing. You can consider increment flush interval to get better performance, but you need to pay more time on bookie server restart after failure.|60000|
-|bookieDeathWatchInterval|Interval to watch whether bookie is dead or not, in milliseconds|1000|
-|zkServers|A list of one of more servers on which zookeeper is running. The server list can be comma separated values, for example: zkServers=zk1:2181,zk2:2181,zk3:2181.|localhost:2181|
-|zkTimeout|ZooKeeper client session timeout in milliseconds Bookie server will exit if it received SESSION_EXPIRED because it was partitioned off from ZooKeeper for more than the session timeout JVM garbage collection, disk I/O will cause SESSION_EXPIRED. Increment this value could help avoiding this issue|30000|
-|serverTcpNoDelay|This settings is used to enabled/disabled Nagle’s algorithm, which is a means of improving the efficiency of TCP/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance.|true|
-|openFileLimit|Max number of ledger index files could be opened in bookie server If number of ledger index files reaches this limitation, bookie server started to swap some ledgers from memory to disk. Too frequent swap will affect performance. You can tune this number to gain performance according your requirements.|0|
-|pageSize|Size of a index page in ledger cache, in bytes A larger index page can improve performance writing page to disk, which is efficient when you have small number of ledgers and these ledgers have similar number of entries. If you have large number of ledgers and each ledger has fewer entries, smaller index page would improve memory usage.|8192|
-|pageLimit|How many index pages provided in ledger cache If number of index pages reaches this limitation, bookie server starts to swap some ledgers from memory to disk. You can increment this value when you found swap became more frequent. But make sure pageLimit*pageSize should not more than JVM max memory limitation, otherwise you would got OutOfMemoryException. In general, incrementing pageLimit, using smaller index page would gain better performance in lager number of ledgers with fewer entries case If pageLimit is -1, bookie server will use 1/3 of JVM memory to compute the limitation of number of index pages.|0|
-|readOnlyModeEnabled|If all ledger directories configured are full, then support only read requests for clients. If "readOnlyModeEnabled=true" then on all ledger disks full, bookie will be converted to read-only mode and serve only read requests. Otherwise the bookie will be shutdown. By default this will be disabled.|true|
-|diskUsageThreshold|For each ledger dir, maximum disk space which can be used. Default is 0.95f. i.e. 95% of disk can be used at most after which nothing will be written to that partition. If all ledger dir partitions are full, then bookie will turn to readonly mode if ‘readOnlyModeEnabled=true’ is set, else it will shutdown. Valid values should be in between 0 and 1 (exclusive).|0.95|
-|diskCheckInterval|Disk check interval in milli seconds, interval to check the ledger dirs usage.|10000|
-|auditorPeriodicCheckInterval|Interval at which the auditor will do a check of all ledgers in the cluster. By default this runs once a week. The interval is set in seconds. To disable the periodic check completely, set this to 0. Note that periodic checking will put extra load on the cluster, so it should not be run more frequently than once a day.|604800|
-|auditorPeriodicBookieCheckInterval|The interval between auditor bookie checks. The auditor bookie check, checks ledger metadata to see which bookies should contain entries for each ledger. If a bookie which should contain entries is unavailable, thea the ledger containing that entry is marked for recovery. Setting this to 0 disabled the periodic check. Bookie checks will still run when a bookie fails. The interval is specified in seconds.|86400|
-|numAddWorkerThreads|number of threads that should handle write requests. if zero, the writes would be handled by netty threads directly.|0|
-|numReadWorkerThreads|number of threads that should handle read requests. if zero, the reads would be handled by netty threads directly.|8|
-|maxPendingReadRequestsPerThread|If read workers threads are enabled, limit the number of pending requests, to avoid the executor queue to grow indefinitely.|2500|
-|readBufferSizeBytes|The number of bytes we should use as capacity for BufferedReadChannel.|4096|
-|writeBufferSizeBytes|The number of bytes used as capacity for the write buffer|65536|
-|useHostNameAsBookieID|Whether the bookie should use its hostname to register with the coordination service (e.g.: zookeeper service). When false, bookie will use its ipaddress for the registration.|false|
-|statsProviderClass||org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider|
-|prometheusStatsHttpPort||8000|
-|dbStorage_writeCacheMaxSizeMb|Size of Write Cache. Memory is allocated from JVM direct memory. Write cache is used to buffer entries before flushing into the entry log For good performance, it should be big enough to hold a substantial amount of entries in the flush interval.|25% of direct memory|
-|dbStorage_readAheadCacheMaxSizeMb|Size of Read cache. Memory is allocated from JVM direct memory. This read cache is pre-filled doing read-ahead whenever a cache miss happens|256|
-|dbStorage_readAheadCacheBatchSize|How many entries to pre-fill in cache after a read cache miss|1000|
-|dbStorage_rocksDB_blockCacheSize|Size of RocksDB block-cache. For best performance, this cache should be big enough to hold a significant portion of the index database which can reach ~2GB in some cases|268435456|
-|dbStorage_rocksDB_writeBufferSizeMB||64|
-|dbStorage_rocksDB_sstSizeInMB||64|
-|dbStorage_rocksDB_blockSize||65536|
-|dbStorage_rocksDB_bloomFilterBitsPerKey||10|
-|dbStorage_rocksDB_numLevels||-1|
-|dbStorage_rocksDB_numFilesInLevel0||4|
-|dbStorage_rocksDB_maxSizeInLevel1MB||256|
-
-
-
-## Broker
-
-Pulsar brokers are responsible for handling incoming messages from producers, dispatching messages to consumers, replicating data between clusters, and more.
-
-|Name|Description|Default|
-|---|---|---|
-|enablePersistentTopics|  Whether persistent topics are enabled on the broker |true|
-|enableNonPersistentTopics| Whether non-persistent topics are enabled on the broker |true|
-|functionsWorkerEnabled|  Whether the Pulsar Functions worker service is enabled in the broker  |false|
-|zookeeperServers|  Zookeeper quorum connection string  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|brokerServicePort| Broker data port  |6650|
-|brokerServicePortTls|  Broker data port for TLS  |6651|
-|webServicePort|  Port to use to server HTTP request  |8080|
-|webServicePortTls| Port to use to server HTTPS request |8443|
-|webSocketServiceEnabled| Enable the WebSocket API service in broker  |false|
-|bindAddress| Hostname or IP address the service binds on, default is 0.0.0.0.  |0.0.0.0|
-|advertisedAddress| Hostname or IP address the service advertises to the outside world. If not set, the value of `InetAddress.getLocalHost().getHostName()` is used.  ||
-|clusterName| Name of the cluster to which this broker belongs to ||
-|brokerDeduplicationEnabled|  Sets the default behavior for message deduplication in the broker. If enabled, the broker will reject messages that were already stored in the topic. This setting can be overridden on a per-namespace basis.  |false|
-|brokerDeduplicationMaxNumberOfProducers| The maximum number of producers for which information will be stored for deduplication purposes.  |10000|
-|brokerDeduplicationEntriesInterval|  The number of entries after which a deduplication informational snapshot is taken. A larger interval will lead to fewer snapshots being taken, though this would also lengthen the topic recovery time (the time required for entries published after the snapshot to be replayed). |1000|
-|brokerDeduplicationProducerInactivityTimeoutMinutes| The time of inactivity (in minutes) after which the broker will discard deduplication information related to a disconnected producer. |360|
-|zooKeeperSessionTimeoutMillis| Zookeeper session timeout in milliseconds |30000|
-|brokerShutdownTimeoutMs| Time to wait for broker graceful shutdown. After this time elapses, the process will be killed  |60000|
-|backlogQuotaCheckEnabled|  Enable backlog quota check. Enforces action on topic when the quota is reached  |true|
-|backlogQuotaCheckIntervalInSeconds|  How often to check for topics that have reached the quota |60|
-|backlogQuotaDefaultLimitGB|  Default per-topic backlog quota limit |10|
-|brokerDeleteInactiveTopicsEnabled| Enable the deletion of inactive topics. If topics are not consumed for some while, these inactive topics might be cleaned up. Deleting inactive topics is enabled by default. The default period is 1 minute.  |true|
-|brokerDeleteInactiveTopicsFrequencySeconds|  How often to check for inactive topics  |60|
-|messageExpiryCheckIntervalInMinutes| How frequently to proactively check and purge expired messages  |5|
-|brokerServiceCompactionMonitorIntervalInSeconds| Interval between checks to see if topics with compaction policies need to be compacted  |60|
-|activeConsumerFailoverDelayTimeMillis| How long to delay rewinding cursor and dispatching messages when active consumer is changed.  |1000|
-|clientLibraryVersionCheckEnabled|  Enable check for minimum allowed client library version |false|
-|clientLibraryVersionCheckAllowUnversioned| Allow client libraries with no version information  |true|
-|statusFilePath|  Path for the file used to determine the rotation status for the broker when responding to service discovery health checks ||
-|preferLaterVersions| If true, (and ModularLoadManagerImpl is being used), the load manager will attempt to use only brokers running the latest software version (to minimize impact to bundles)  |false|
-|tlsEnabled|  Enable TLS  |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-|tlsTrustCertsFilePath| Path for the trusted TLS certificate file ||
-|tlsAllowInsecureConnection|  Accept untrusted TLS certificate from client  |false|
-|maxUnackedMessagesPerConsumer| Max number of unacknowledged messages allowed to receive messages by a consumer on a shared subscription. Broker will stop sending messages to consumer once, this limit reaches until consumer starts acknowledging messages back. Using a value of 0, is disabling unackeMessage limit check and consumer can receive messages without any restriction  |50000|
-|maxUnackedMessagesPerSubscription| Max number of unacknowledged messages allowed per shared subscription. Broker will stop dispatching messages to all consumers of the subscription once this limit reaches until consumer starts acknowledging messages back and unack count reaches to limit/2. Using a value of 0, is disabling unackedMessage-limit check and dispatcher can dispatch messages without any restriction  |200000|
-|maxConcurrentLookupRequest|  Max number of concurrent lookup request broker allows to throttle heavy incoming lookup traffic |50000|
-|maxConcurrentTopicLoadRequest| Max number of concurrent topic loading request broker allows to control number of zk-operations |5000|
-|authenticationEnabled| Enable authentication |false|
-|authenticationProviders| Authentication provider name list, which is comma separated list of class names  ||
-|authorizationEnabled|  Enforce authorization |false|
-|superUserRoles|  Role names that are treated as "super-user", meaning they will be able to do all admin operations and publish/consume from all topics ||
-|brokerClientAuthenticationPlugin|  Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters  ||
-|brokerClientAuthenticationParameters|||
-|athenzDomainNames| Supported Athenz provider domain names(comma separated) for authentication  ||
-|bookkeeperClientAuthenticationPlugin|  Authentication plugin to use when connecting to bookies ||
-|bookkeeperClientAuthenticationParametersName|  BookKeeper auth plugin implementation specifics parameters name and values  ||
-|bookkeeperClientAuthenticationParameters|||   
-|bookkeeperClientTimeoutInSeconds|  Timeout for BK add / read operations  |30|
-|bookkeeperClientSpeculativeReadTimeoutInMillis|  Speculative reads are initiated if a read request doesn’t complete within a certain time Using a value of 0, is disabling the speculative reads |0|
-|bookkeeperClientHealthCheckEnabled|  Enable bookies health check. Bookies that have more than the configured number of failure within the interval will be quarantined for some time. During this period, new ledgers won’t be created on these bookies  |true|
-|bookkeeperClientHealthCheckIntervalSeconds||60|
-|bookkeeperClientHealthCheckErrorThresholdPerInterval||5|
-|bookkeeperClientHealthCheckQuarantineTimeInSeconds ||1800|
-|bookkeeperClientRackawarePolicyEnabled|  Enable rack-aware bookie selection policy. BK will chose bookies from different racks when forming a new bookie ensemble  |true|
-|bookkeeperClientIsolationGroups| Enable bookie isolation by specifying a list of bookie groups to choose from. Any bookie outside the specified groups will not be used by the broker  ||
-|managedLedgerDefaultEnsembleSize|  Number of bookies to use when creating a ledger |2|
-|managedLedgerDefaultWriteQuorum| Number of copies to store for each message  |2|
-|managedLedgerDefaultAckQuorum| Number of guaranteed copies (acks to wait before write is complete) |2|
-|managedLedgerCacheSizeMB|  Amount of memory to use for caching data payload in managed ledger. This memory is allocated from JVM direct memory and it’s shared across all the topics running in the same broker  |1024|
-|managedLedgerCacheEvictionWatermark| Threshold to which bring down the cache level when eviction is triggered  |0.9|
-|managedLedgerDefaultMarkDeleteRateLimit| Rate limit the amount of writes per second generated by consumer acking the messages  |1.0|
-|managedLedgerMaxEntriesPerLedger| The max number of entries to append to a ledger before triggering a rollover. A ledger rollover is triggered after the min rollover time has passed and one of the following conditions is true: 
    • The max rollover time has been reached
    • The max entries have been written to the ledger
    • The max ledger size has been written to the ledger
    |50000|
-|managedLedgerMinLedgerRolloverTimeMinutes| Minimum time between ledger rollover for a topic  |10|
-|managedLedgerMaxLedgerRolloverTimeMinutes| Maximum time before forcing a ledger rollover for a topic |240|
-|managedLedgerCursorMaxEntriesPerLedger|  Max number of entries to append to a cursor ledger  |50000|
-|managedLedgerCursorRolloverTimeInSeconds|  Max time before triggering a rollover on a cursor ledger  |14400|
-|managedLedgerMaxUnackedRangesToPersist|  Max number of "acknowledgment holes" that are going to be persistently stored. When acknowledging out of order, a consumer will leave holes that are supposed to be quickly filled by acking all the messages. The information of which messages are acknowledged is persisted by compressing in "ranges" of messages that were acknowledged. After the max number of ranges is reached, the information will only be tracked in memory and messages will be redelivered in case of crashes.  |1000|
-|autoSkipNonRecoverableData|  Skip reading non-recoverable/unreadable data-ledger under managed-ledger’s list.It helps when data-ledgers gets corrupted at bookkeeper and managed-cursor is stuck at that ledger. |false|
-|loadBalancerEnabled| Enable load balancer  |true|
-|loadBalancerPlacementStrategy| Strategy to assign a new bundle weightedRandomSelection ||
-|loadBalancerReportUpdateThresholdPercentage| Percentage of change to trigger load report update  |10|
-|loadBalancerReportUpdateMaxIntervalMinutes|  maximum interval to update load report  |15|
-|loadBalancerHostUsageCheckIntervalMinutes| Frequency of report to collect  |1|
-|loadBalancerSheddingIntervalMinutes| Load shedding interval. Broker periodically checks whether some traffic should be offload from some over-loaded broker to other under-loaded brokers  |30|
-|loadBalancerSheddingGracePeriodMinutes|  Prevent the same topics to be shed and moved to other broker more than once within this timeframe |30|
-|loadBalancerBrokerMaxTopics| Usage threshold to allocate max number of topics to broker  |50000|
-|loadBalancerBrokerUnderloadedThresholdPercentage|  Usage threshold to determine a broker as under-loaded |1|
-|loadBalancerBrokerOverloadedThresholdPercentage| Usage threshold to determine a broker as over-loaded  |85|
-|loadBalancerResourceQuotaUpdateIntervalMinutes|  Interval to update namespace bundle resource quota |15|
-|loadBalancerBrokerComfortLoadLevelPercentage|  Usage threshold to determine a broker is having just right level of load  |65|
-|loadBalancerAutoBundleSplitEnabled|  enable/disable namespace bundle auto split  |false|
-|loadBalancerNamespaceBundleMaxTopics|  maximum topics in a bundle, otherwise bundle split will be triggered  |1000|
-|loadBalancerNamespaceBundleMaxSessions|  maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered  |1000|
-|loadBalancerNamespaceBundleMaxMsgRate| maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered  |1000|
-|loadBalancerNamespaceBundleMaxBandwidthMbytes| maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered  |100|
-|loadBalancerNamespaceMaximumBundles| maximum number of bundles in a namespace  |128|
-|replicationMetricsEnabled| Enable replication metrics  |true|
-|replicationConnectionsPerBroker| Max number of connections to open for each broker in a remote cluster More connections host-to-host lead to better throughput over high-latency links.  |16|
-|replicationProducerQueueSize|  Replicator producer queue size  |1000|
-|replicatorPrefix|  Replicator prefix used for replicator producer name and cursor name pulsar.repl||
-|replicationTlsEnabled| Enable TLS when talking with other clusters to replicate messages |false|
-|defaultRetentionTimeInMinutes| Default message retention time. 0 means retention is disabled. -1 means data is not removed by time quota  ||
-|defaultRetentionSizeInMB|  Default retention size. 0 means retention is disabled. -1 means data is not removed by size quota  |0|
-|keepAliveIntervalSeconds|  How often to check whether the connections are still alive  |30|
-|brokerServicePurgeInactiveFrequencyInSeconds|  How often broker checks for inactive topics to be deleted (topics with no subscriptions and no one connected) |60|
-|loadManagerClassName|  Name of load manager to use |org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl|
-|managedLedgerOffloadDriver|  Driver to use to offload old data to long term storage (Possible values: S3)  ||
-|managedLedgerOffloadMaxThreads|  Maximum number of thread pool threads for ledger offloading |2|
-|s3ManagedLedgerOffloadRegion|  For Amazon S3 ledger offload, AWS region  ||
-|s3ManagedLedgerOffloadBucket|  For Amazon S3 ledger offload, Bucket to place offloaded ledger into ||
-|s3ManagedLedgerOffloadServiceEndpoint| For Amazon S3 ledger offload, Alternative endpoint to connect to (useful for testing) ||
-|s3ManagedLedgerOffloadMaxBlockSizeInBytes| For Amazon S3 ledger offload, Max block size in bytes. (64MB by default, 5MB minimum) |67108864|
-|s3ManagedLedgerOffloadReadBufferSizeInBytes| For Amazon S3 ledger offload, Read buffer size in bytes (1MB by default)  |1048576|
-
-
-
-
-## Client
-
-The [`pulsar-client`](reference-cli-tools.md#pulsar-client) CLI tool can be used to publish messages to Pulsar and consume messages from Pulsar topics. This tool can be used in lieu of a client library.
-
-|Name|Description|Default|
-|---|---|---|
-|webServiceUrl| The web URL for the cluster.  |http://localhost:8080/|
-|brokerServiceUrl|  The Pulsar protocol URL for the cluster.  |pulsar://localhost:6650/|
-|authPlugin|  The authentication plugin.  ||
-|authParams|  The authentication parameters for the cluster, as a comma-separated string. ||
-|useTls|  Whether or not TLS authentication will be enforced in the cluster.  |false|
-|tlsAllowInsecureConnection|||    
-|tlsTrustCertsFilePath|||
-
-
-## Service discovery
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  Zookeeper quorum connection string (comma-separated)  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|zookeeperSessionTimeoutMs| ZooKeeper session timeout |30000|
-|servicePort| Port to use to server binary-proto request  |6650|
-|servicePortTls|  Port to use to server binary-proto-tls request  |6651|
-|webServicePort|  Port that discovery service listen on |8080|
-|webServicePortTls| Port to use to server HTTPS request |8443|
-|bindOnLocalhost| Control whether to bind directly on localhost rather than on normal hostname  |false|
-|authenticationEnabled| Enable authentication |false|
-|authenticationProviders| Authentication provider name list, which is comma separated list of class names (comma-separated) ||
-|authorizationEnabled|  Enforce authorization |false|
-|superUserRoles|  Role names that are treated as "super-user", meaning they will be able to do all admin operations and publish/consume from all topics (comma-separated) ||
-|tlsEnabled|  Enable TLS  |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-
-
-
-## Log4j
-
-
-|Name|Default|
-|---|---|
-|pulsar.root.logger|  WARN,CONSOLE|
-|pulsar.log.dir|  logs|
-|pulsar.log.file| pulsar.log|
-|log4j.rootLogger|  ${pulsar.root.logger}|
-|log4j.appender.CONSOLE|  org.apache.log4j.ConsoleAppender|
-|log4j.appender.CONSOLE.Threshold|  DEBUG|
-|log4j.appender.CONSOLE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.CONSOLE.layout.ConversionPattern| %d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n|
-|log4j.appender.ROLLINGFILE|  org.apache.log4j.DailyRollingFileAppender|
-|log4j.appender.ROLLINGFILE.Threshold|  DEBUG|
-|log4j.appender.ROLLINGFILE.File| ${pulsar.log.dir}/${pulsar.log.file}|
-|log4j.appender.ROLLINGFILE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.ROLLINGFILE.layout.ConversionPattern| %d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n|
-|log4j.appender.TRACEFILE|  org.apache.log4j.FileAppender|
-|log4j.appender.TRACEFILE.Threshold|  TRACE|
-|log4j.appender.TRACEFILE.File| pulsar-trace.log|
-|log4j.appender.TRACEFILE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.TRACEFILE.layout.ConversionPattern| %d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n|
-
-
-## Log4j shell
-
-|Name|Default|
-|---|---|
-|bookkeeper.root.logger|  ERROR,CONSOLE|
-|log4j.rootLogger|  ${bookkeeper.root.logger}|
-|log4j.appender.CONSOLE|  org.apache.log4j.ConsoleAppender|
-|log4j.appender.CONSOLE.Threshold|  DEBUG|
-|log4j.appender.CONSOLE.layout| org.apache.log4j.PatternLayout|
-|log4j.appender.CONSOLE.layout.ConversionPattern| %d{ABSOLUTE} %-5p %m%n|
-|log4j.logger.org.apache.zookeeper| ERROR|
-|log4j.logger.org.apache.bookkeeper|  ERROR|
-|log4j.logger.org.apache.bookkeeper.bookie.BookieShell| INFO|
-
-
-## Standalone
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  The quorum connection string for local ZooKeeper  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|brokerServicePort| The port on which the standalone broker listens for connections |6650|
-|webServicePort|  The port used by the standalone broker for HTTP requests  |8080|
-|bindAddress| The hostname or IP address on which the standalone service binds  |0.0.0.0|
-|advertisedAddress| The hostname or IP address that the standalone service advertises to the outside world. If not set, the value of `InetAddress.getLocalHost().getHostName()` is used.  ||
-|clusterName| The name of the cluster that this broker belongs to. |standalone|
-|zooKeeperSessionTimeoutMillis| The ZooKeeper session timeout, in milliseconds. |30000|
-|brokerShutdownTimeoutMs| The time to wait for graceful broker shutdown. After this time elapses, the process will be killed. |60000|
-|backlogQuotaCheckEnabled|  Enable the backlog quota check, which enforces a specified action when the quota is reached.  |true|
-|backlogQuotaCheckIntervalInSeconds|  How often to check for topics that have reached the backlog quota.  |60|
-|backlogQuotaDefaultLimitGB|  The default per-topic backlog quota limit.  |10|
-|brokerDeleteInactiveTopicsEnabled| Enable the deletion of inactive topics. If topics are not consumed for some while, these inactive topics might be cleaned up. Deleting inactive topics is enabled by default. The default period is 1 minute. |true|
-|brokerDeleteInactiveTopicsFrequencySeconds|  How often to check for inactive topics, in seconds. |60|
-|messageExpiryCheckIntervalInMinutes| How often to proactively check and purged expired messages. |5|
-|activeConsumerFailoverDelayTimeMillis| How long to delay rewinding cursor and dispatching messages when active consumer is changed.  |1000|
-|clientLibraryVersionCheckEnabled|  Enable checks for minimum allowed client library version. |false|
-|clientLibraryVersionCheckAllowUnversioned| Allow client libraries with no version information  |true|
-|statusFilePath|  The path for the file used to determine the rotation status for the broker when responding to service discovery health checks |/usr/local/apache/htdocs|
-|maxUnackedMessagesPerConsumer| The maximum number of unacknowledged messages allowed to be received by consumers on a shared subscription. The broker will stop sending messages to a consumer once this limit is reached or until the consumer begins acknowledging messages. A value of 0 disables the unacked message limit check and thus allows consumers to receive messages without any restrictions. |50000|
-|maxUnackedMessagesPerSubscription| The same as above, except per subscription rather than per consumer.  |200000|
-|authenticationEnabled| Enable authentication for the broker. |false|
-|authenticationProviders| A comma-separated list of class names for authentication providers. |false|
-|authorizationEnabled|  Enforce authorization in brokers. |false|
-|superUserRoles|  Role names that are treated as "superusers." Superusers are authorized to perform all admin tasks. ||  
-|brokerClientAuthenticationPlugin|  The authentication settings of the broker itself. Used when the broker connects to other brokers either in the same cluster or from other clusters. ||
-|brokerClientAuthenticationParameters|  The parameters that go along with the plugin specified using brokerClientAuthenticationPlugin.  ||
-|athenzDomainNames| Supported Athenz authentication provider domain names as a comma-separated list.  ||
-|bookkeeperClientAuthenticationPlugin|  Authentication plugin to be used when connecting to bookies (BookKeeper servers). ||
-|bookkeeperClientAuthenticationParametersName|  BookKeeper authentication plugin implementation parameters and values.  ||
-|bookkeeperClientAuthenticationParameters|  Parameters associated with the bookkeeperClientAuthenticationParametersName ||
-|bookkeeperClientTimeoutInSeconds|  Timeout for BookKeeper add and read operations. |30|
-|bookkeeperClientSpeculativeReadTimeoutInMillis|  Speculative reads are initiated if a read request doesn’t complete within a certain time. A value of 0 disables speculative reads.  |0|
-|bookkeeperClientHealthCheckEnabled|  Enable bookie health checks.  |true|
-|bookkeeperClientHealthCheckIntervalSeconds|  The time interval, in seconds, at which health checks are performed. New ledgers are not created during health checks.  |60|
-|bookkeeperClientHealthCheckErrorThresholdPerInterval|  Error threshold for health checks.  |5|
-|bookkeeperClientHealthCheckQuarantineTimeInSeconds|  If bookies have more than the allowed number of failures within the time interval specified by bookkeeperClientHealthCheckIntervalSeconds |1800|
-|bookkeeperClientRackawarePolicyEnabled|    |true|
-|bookkeeperClientIsolationGroups|||   
-|managedLedgerDefaultEnsembleSize|    |1|
-|managedLedgerDefaultWriteQuorum|   |1|
-|managedLedgerDefaultAckQuorum|   |1|
-|managedLedgerCacheSizeMB|    |1024|
-|managedLedgerCacheEvictionWatermark|   |0.9|
-|managedLedgerDefaultMarkDeleteRateLimit|   |0.1|
-|managedLedgerMaxEntriesPerLedger|    |50000|
-|managedLedgerMinLedgerRolloverTimeMinutes|   |10|
-|managedLedgerMaxLedgerRolloverTimeMinutes|   |240|
-|managedLedgerCursorMaxEntriesPerLedger|    |50000|
-|managedLedgerCursorRolloverTimeInSeconds|    |14400|
-|autoSkipNonRecoverableData|    |false|
-|loadBalancerEnabled|   |false|
-|loadBalancerPlacementStrategy|   |weightedRandomSelection|
-|loadBalancerReportUpdateThresholdPercentage|   |10|
-|loadBalancerReportUpdateMaxIntervalMinutes|    |15|
-|loadBalancerHostUsageCheckIntervalMinutes|  |1|
-|loadBalancerSheddingIntervalMinutes|   |30|
-|loadBalancerSheddingGracePeriodMinutes|    |30|
-|loadBalancerBrokerMaxTopics|   |50000|
-|loadBalancerBrokerUnderloadedThresholdPercentage|    |1|
-|loadBalancerBrokerOverloadedThresholdPercentage|   |85|
-|loadBalancerResourceQuotaUpdateIntervalMinutes|    |15|
-|loadBalancerBrokerComfortLoadLevelPercentage|    |65|
-|loadBalancerAutoBundleSplitEnabled|    |false|
-|loadBalancerNamespaceBundleMaxTopics|    |1000|
-|loadBalancerNamespaceBundleMaxSessions|    |1000|
-|loadBalancerNamespaceBundleMaxMsgRate|   |1000|
-|loadBalancerNamespaceBundleMaxBandwidthMbytes|   |100|
-|loadBalancerNamespaceMaximumBundles|   |128|
-|replicationMetricsEnabled|   |true|
-|replicationConnectionsPerBroker|   |16|
-|replicationProducerQueueSize|    |1000|
-|defaultRetentionTimeInMinutes|   |0|
-|defaultRetentionSizeInMB|    |0|
-|keepAliveIntervalSeconds|    |30|
-|brokerServicePurgeInactiveFrequencyInSeconds|    |60|
-
-
-
-
-
-## WebSocket
-
-|Name|Description|Default|
-|---|---|---|
-|configurationStoreServers    |||
-|zooKeeperSessionTimeoutMillis|   |30000|
-|serviceUrl|||
-|serviceUrlTls|||
-|brokerServiceUrl||| 
-|brokerServiceUrlTls|||
-|webServicePort||8080|
-|webServicePortTls||8443|
-|bindAddress||0.0.0.0|
-|clusterName |||
-|authenticationEnabled||false|
-|authenticationProviders|||   
-|authorizationEnabled||false|
-|superUserRoles |||
-|brokerClientAuthenticationPlugin|||
-|brokerClientAuthenticationParameters||| 
-|tlsEnabled||false|
-|tlsAllowInsecureConnection||false|
-|tlsCertificateFilePath|||
-|tlsKeyFilePath |||
-|tlsTrustCertsFilePath|||
-
-
-## Pulsar proxy 
-
-The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) can be configured in the `conf/proxy.conf` file.
-
-
-|Name|Description|Default|
-|---|---|---|
-|zookeeperServers|  The ZooKeeper quorum connection string (as a comma-separated list)  ||
-|configurationStoreServers| Configuration store connection string (as a comma-separated list) ||
-|zookeeperSessionTimeoutMs| ZooKeeper session timeout (in milliseconds) |30000|
-|servicePort| The port to use for server binary Protobuf requests |6650|
-|servicePortTls|  The port to use to server binary Protobuf TLS requests  |6651|
-|statusFilePath|  Path for the file used to determine the rotation status for the proxy instance when responding to service discovery health checks ||
-|authenticationEnabled| Whether authentication is enabled for the Pulsar proxy  |false|
-|authenticationProviders| Authentication provider name list (a comma-separated list of class names) ||
-|authorizationEnabled|  Whether authorization is enforced by the Pulsar proxy |false|
-|authorizationProvider| Authorization provider as a fully qualified class name  |org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider|
-|brokerClientAuthenticationPlugin|  The authentication plugin used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientAuthenticationParameters|  The authentication parameters used by the Pulsar proxy to authenticate with Pulsar brokers  ||
-|brokerClientTrustCertsFilePath|  The path to trusted certificates used by the Pulsar proxy to authenticate with Pulsar brokers ||
-|superUserRoles|  Role names that are treated as "super-users," meaning that they will be able to perform all admin ||
-|forwardAuthorizationCredentials| Whether client authorization credentials are forwarded to the broker for re-authorization. Authentication must be enabled via authenticationEnabled=true for this to take effect.  |false|
-|maxConcurrentInboundConnections| Max concurrent inbound connections. The proxy will reject requests beyond that. |10000|
-|maxConcurrentLookupRequests| Max concurrent outbound connections. The proxy will error out requests beyond that. |50000|
-|tlsEnabledInProxy| Whether TLS is enabled for the proxy  |false|
-|tlsEnabledWithBroker|  Whether TLS is enabled when communicating with Pulsar brokers |false|
-|tlsCertificateFilePath|  Path for the TLS certificate file ||
-|tlsKeyFilePath|  Path for the TLS private key file ||
-|tlsTrustCertsFilePath| Path for the trusted TLS certificate pem file ||
-|tlsHostnameVerificationEnabled|  Whether the hostname is validated when the proxy creates a TLS connection with brokers  |false|
-|tlsRequireTrustedClientCertOnConnect|  Whether client certificates are required for TLS. Connections are rejected if the client certificate isn’t trusted. |false|
-
-
-## ZooKeeper
-
-ZooKeeper handles a broad range of essential configuration- and coordination-related tasks for Pulsar. The default configuration file for ZooKeeper is in the `conf/zookeeper.conf` file in your Pulsar installation. The following parameters are available:
-
-
-|Name|Description|Default|
-|---|---|---|
-|tickTime|  The tick is the basic unit of time in ZooKeeper, measured in milliseconds and used to regulate things like heartbeats and timeouts. tickTime is the length of a single tick.  |2000|
-|initLimit| The maximum time, in ticks, that the leader ZooKeeper server allows follower ZooKeeper servers to successfully connect and sync. The tick time is set in milliseconds using the tickTime parameter. |10|
-|syncLimit| The maximum time, in ticks, that a follower ZooKeeper server is allowed to sync with other ZooKeeper servers. The tick time is set in milliseconds using the tickTime parameter.  |5|
-|dataDir| The location where ZooKeeper will store in-memory database snapshots as well as the transaction log of updates to the database. |data/zookeeper|
-|clientPort|  The port on which the ZooKeeper server will listen for connections. |2181|
-|autopurge.snapRetainCount| In ZooKeeper, auto purge determines how many recent snapshots of the database stored in dataDir to retain within the time interval specified by autopurge.purgeInterval (while deleting the rest).  |3|
-|autopurge.purgeInterval| The time interval, in hours, by which the ZooKeeper database purge task is triggered. Setting to a non-zero number will enable auto purge; setting to 0 will disable. Read this guide before enabling auto purge. |1|
-|maxClientCnxns|  The maximum number of client connections. Increase this if you need to handle more ZooKeeper clients. |60|
-
-
-
-
-In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
-a `server.N` line to the `conf/zookeeper.conf` file for each node in the ZooKeeper cluster, where `N` is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:
-
-```properties
-
-server.1=zk1.us-west.example.com:2888:3888
-server.2=zk2.us-west.example.com:2888:3888
-server.3=zk3.us-west.example.com:2888:3888
-
-```
-
-> We strongly recommend consulting the [ZooKeeper Administrator's Guide](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html) for a more thorough and comprehensive introduction to ZooKeeper configuration
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/reference-pulsar-admin.md b/site2/website/versioned_docs/version-2.1.1-incubating/reference-pulsar-admin.md
deleted file mode 100644
index ce6f9ec1308df..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/reference-pulsar-admin.md
+++ /dev/null
@@ -1,2045 +0,0 @@
----
-id: reference-pulsar-admin
-title: Pulsar admin CLI
-sidebar_label: "Pulsar Admin CLI"
-original_id: reference-pulsar-admin
----
-
-The `pulsar-admin` tool enables you to manage Pulsar installations, including clusters, brokers, namespaces, tenants, and more.
-
-Usage
-
-```bash
-
-$ pulsar-admin command
-
-```
-
-Commands
-* `broker-stats`
-* `brokers`
-* `clusters`
-* `functions`
-* `namespaces`
-* `ns-isolation-policy`
-* `sink`
-* `source`
-* `topics`
-* `tenants`
-* `resource-quotas`
-* `schemas`
-
-## `broker-stats`
-
-Operations to collect broker statistics
-
-```bash
-
-$ pulsar-admin broker-stats subcommand
-
-```
-
-Subcommands
-* `allocator-stats`
-* `destinations`
-* `mbeans`
-* `monitoring-metrics`
-* `topics`
-
-
-### `allocator-stats`
-
-Dump allocator stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats allocator-stats allocator-name
-
-```
-
-### `destinations`
-
-Dump topic stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats destinations options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-### `mbeans`
-
-Dump Mbean stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats mbeans options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `monitoring-metrics`
-
-Dump metrics for monitoring
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats monitoring-metrics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-### `topics`
-
-Dump topic stats
-
-Usage
-
-```bash
-
-$ pulsar-admin broker-stats topics options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-i`, `--indent`|Indent JSON output|false|
-
-
-## `brokers`
-
-Operations about brokers
-
-```bash
-
-$ pulsar-admin brokers subcommand
-
-```
-
-Subcommands
-* `list`
-* `namespaces`
-* `update-dynamic-config`
-* `list-dynamic-config`
-* `get-all-dynamic-config`
-* `get-internal-config`
-
-### `list`
-List active brokers of the cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list cluster-name
-
-```
-
-### `namespaces`
-List namespaces owned by the broker
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers namespaces cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--url`|The URL for the broker||
-
-
-### `update-dynamic-config`
-Update a broker's dynamic service configuration
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers update-dynamic-config options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--config`|Service configuration parameter name||
-|`--value`|Value for the configuration parameter value specified using the `--config` flag||
-
-
-### `list-dynamic-config`
-Get list of updatable configuration name
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers list-dynamic-config
-
-```
-
-### `get-all-dynamic-config`
-Get all overridden dynamic-configuration values
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-all-dynamic-config
-
-```
-
-### `get-internal-config`
-Get internal configuration information
-
-Usage
-
-```bash
-
-$ pulsar-admin brokers get-internal-config
-
-```
-
-## `clusters`
-Operations about clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters subcommand
-
-```
-
-Subcommands
-* `get`
-* `create`
-* `update`
-* `delete`
-* `list`
-* `update-peer-clusters`
-
-
-### `get`
-Get the configuration data for the specified cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters get cluster-name
-
-```
-
-### `create`
-Provisions a new cluster. This operation requires Pulsar super-user privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters create cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `update`
-Update the configuration for a cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update cluster-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--broker-url`|The URL for the broker service.||
-|`--broker-url-secure`|The broker service URL for a secure connection||
-|`--url`|service-url||
-|`--url-secure`|service-url for secure connection||
-
-
-### `delete`
-Deletes an existing cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters delete cluster-name
-
-```
-
-### `list`
-List the existing clusters
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters list
-
-```
-
-### `update-peer-clusters`
-Update peer cluster names
-
-Usage
-
-```bash
-
-$ pulsar-admin clusters update-peer-clusters peer-cluster-names
-
-```
-
-## `functions`
-
-A command-line interface for Pulsar Functions
-
-Usage
-
-```bash
-
-$ pulsar-admin functions subcommand
-
-```
-
-Subcommands
-* `localrun`
-* `create`
-* `delete`
-* `update`
-* `get`
-* `getstatus`
-* `list`
-* `querystate`
-* `trigger`
-
-
-### `localrun`
-Run a Pulsar Function locally
-
-
-Usage
-
-```bash
-
-$ pulsar-admin functions localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The CPU to allocate to each function instance (in number of cores)||
-|`--ram`|The RAM to allocate to each function instance (in bytes)||
-|`--disk`|The disk space to allocate to each function instance (in bytes)||
-|`--brokerServiceUrl `|The URL of the Pulsar broker||
-|`--className`|The name of the function’s class||
-|`--customSerdeInputs`|A map of the input topic to SerDe name||
-|`--functionConfigFile`|The path of the YAML config file used to configure the function||
-|`--inputs`|The input topics for the function (as a comma-separated list if more than one topic is desired)||
-|`--logTopic`|The topic to which logs from this function are published||
-|`--jar`|A path to the JAR file for the function (if the function is written in Java)||
-|`--name`|The name of the function|The value specified by --className|
-|`--namespace`|The function’s namespace||
-|`--output`|The name of the topic to which the function publishes its output (if any)||
-|`--outputSerdeClassName`|The SerDe class used for the function’s output||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processingGuarantees`|The processing guarantees applied to the function. Can be one of: ATLEAST_ONCE, ATMOST_ONCE, or EFFECTIVELY_ONCE|ATLEAST_ONCE|
-|`--py`|The path of the Python file containing the function’s processing logic (if the function is written in Python)||
-|`--stateStorageServiceUrl`|The service URL for the function’s state storage (if the function uses a storage system different from the Apache BookKeeper cluster used by Pulsar)||
-|`--subscriptionType`|The subscription type used by the function when consuming messages on the input topic(s). Can be either SHARED or EXCLUSIVE|SHARED|
-|`--tenant`|The function’s tenant||
-|`--userConfig`|A user-supplied config value, set as a key/value pair. You can set multiple user config values.||
-
-
-### `create`
-Creates a new Pulsar Function on the target infrastructure
-
-Usage
-
-```
-
-$ pulsar-admin functions create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--cpu`|The CPU to allocate to each function instance (in number of cores)||
-|`--ram`|The RAM to allocate to each function instance (in bytes)||
-|`--disk`|The disk space to allocate to each function instance (in bytes)||
-|`--brokerServiceUrl `|The URL of the Pulsar broker||
-|`--className`|The name of the function’s class||
-|`--customSerdeInputs`|A map of the input topic to SerDe name||
-|`--functionConfigFile`|The path of the YAML config file used to configure the function||
-|`--inputs`|The input topics for the function (as a comma-separated list if more than one topic is desired)||
-|`--logTopic`|The topic to which logs from this function are published||
-|`--jar`|A path to the JAR file for the function (if the function is written in Java)||
-|`--name`|The name of the function|The value specified by --className|
-|`--namespace`|The function’s namespace||
-|`--output`|The name of the topic to which the function publishes its output (if any)||
-|`--outputSerdeClassName`|The SerDe class used for the function’s output||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processingGuarantees`|The processing guarantees applied to the function. Can be one of: ATLEAST_ONCE, ATMOST_ONCE, or EFFECTIVELY_ONCE|ATLEAST_ONCE|
-|`--py`|The path of the Python file containing the function’s processing logic (if the function is written in Python)||
-|`--stateStorageServiceUrl`|The service URL for the function’s state storage (if the function uses a storage system different from the Apache BookKeeper cluster used by Pulsar)||
-|`--subscriptionType`|The subscription type used by the function when consuming messages on the input topic(s). Can be either SHARED or EXCLUSIVE|SHARED|
-|`--tenant`|The function’s tenant||
-|`--userConfig`|A user-supplied config value, set as a key/value pair. You can set multiple user config values.||
-
-
-### `delete`
-Deletes an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function to delete||
-|`--namespace`|The namespace of the function to delete||
-|`--tenant`|The tenant of the function to delete||
-
-
-### `update`
-Updates an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions update options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--className`|The name of the function’s class||
-|`--customSerdeInputs`|A map of the input topic to SerDe name||
-|`--functionConfigFile`|The path of the YAML config file used to configure the function||
-|`--inputs`|The input topics for the function (as a comma-separated list if more than one topic is desired)||
-|`--logTopic`|The topic to which logs from this function are published||
-|`--jar`|A path to the JAR file for the function (if the function is written in Java)||
-|`--name`|The name of the function|The value specified by --className|
-|`--namespace`|The function’s namespace||
-|`--output`|The name of the topic to which the function publishes its output (if any)||
-|`--outputSerdeClassName`|The SerDe class used for the function’s output||
-|`--parallelism`|The function’s parallelism factor, i.e. the number of instances of the function to run|1|
-|`--processingGuarantees`|The processing guarantees applied to the function. Can be one of: ATLEAST_ONCE, ATMOST_ONCE, or EFFECTIVELY_ONCE|ATLEAST_ONCE|
-|`--py`|The path of the Python file containing the function’s processing logic (if the function is written in Python)||
-|`--subscriptionType`|The subscription type used by the function when consuming messages on the input topic(s). Can be either SHARED or EXCLUSIVE|SHARED|
-|`--tenant`|The function’s tenant||
-|`--userConfig`|A user-supplied config value, set as a key/value pair. You can set multiple user config values.||
-
-### `get`
-Fetch information about an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function||
-|`--namespace`|The namespace of the function||
-|`--tenant`|The tenant of the function||
-
-
-### `getstatus`
-Get the status of an existing Pulsar Function
-
-Usage
-
-```bash
-
-$ pulsar-admin functions getstatus options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function||
-|`--namespace`|The namespace of the function||
-|`--tenant`|The tenant of the function||
-
-
-### `list`
-List all Pulsar Functions for a specific tenant and namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin functions list options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--namespace`|The namespace of the function||
-|`--tenant`|The tenant of the function||
-
-
-### `querystate`
-Retrieve the current state of a Pulsar Function by key
-
-Usage
-
-```bash
-
-$ pulsar-admin functions querystate options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-k`, `--key`|The key for the state you want to fetch||
-|`--name`|The name of the function whose state you want to query||
-|`--namespace`|The namespace of the function whose state you want to query||
-|`--tenant`|The tenant of the function whose state you want to query||
-|`-u`, `--storage-service-url`|The service URL for the function’s state storage (if the function uses a storage system different from the Apache BookKeeper cluster used by Pulsar)||
-|`-w`, `--watch`|If set, watching for state changes is enabled|false|
-
-
-### `trigger`
-Triggers the specified Pulsar Function with a supplied value or file data
-
-Usage
-
-```bash
-
-$ pulsar-admin functions trigger options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the Pulsar Function to trigger||
-|`--namespace`|The namespace of the Pulsar Function to trigger||
-|`--tenant`|The tenant of the Pulsar Function to trigger||
-|`--triggerFile`|The path to the file containing the data with which the Pulsar Function is to be triggered||
-|`--triggerValue`|The value with which the Pulsar Function is to be triggered||
-
-
-## `namespaces`
-
-Operations for managing namespaces
-
-```bash
-
-$ pulsar-admin namespaces subcommand
-
-```
-
-Subcommands
-* `list`
-* `list-cluster`
-* `destinations`
-* `policies`
-* `create`
-* `delete`
-* `set-deduplication`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `set-clusters`
-* `get-clusters`
-* `get-backlog-quotas`
-* `set-backlog-quota`
-* `remove-backlog-quota`
-* `get-persistence`
-* `set-persistence`
-* `get-message-ttl`
-* `set-message-ttl`
-* `get-retention`
-* `set-retention`
-* `unload`
-* `clear-backlog`
-* `unsubscribe`
-* `get-compaction-threshold`
-* `set-compaction-threshold`
-* `get-offload-threshold`
-* `set-offload-threshold`
-
-
-### `list`
-Get the namespaces for a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces list tenant-name
-
-```
-
-### `list-cluster`
-Get the namespaces for a tenant in the cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces list-cluster tenant/cluster
-
-```
-
-### `destinations`
-Get the destinations for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces destinations tenant/cluster/namespace
-
-```
-
-### `policies`
-Get the policies of a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces policies tenant/cluster/namespace
-
-```
-
-### `create`
-Create a new namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces create tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-b` , `--bundles`|The number of bundles to activate|0|
-
-
-### `delete`
-Deletes a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces delete tenant/cluster/namespace
-
-```
-
-### `set-deduplication`
-Enable or disable message deduplication on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-deduplication tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--enable`, `-e`|Enable message deduplication on the specified namespace|false|
-|`--disable`, `-d`|Disable message deduplication on the specified namespace|false|
-
-
-### `permissions`
-Get the permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces permissions tenant/cluster/namespace
-
-```
-
-### `grant-permission`
-Grant permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces grant-permission tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces revoke-permission tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--role`|The client role to which to grant the permissions||
-
-
-### `set-clusters`
-Set replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-clusters tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-c`, `--clusters`|Replication clusters ID list (comma-separated values)||
-
-
-### `get-clusters`
-Get replication clusters for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-clusters tenant/cluster/namespace
-
-```
-
-### `get-backlog-quotas`
-Get the backlog quota policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-backlog-quotas tenant/cluster/namespace
-
-```
-
-### `set-backlog-quota`
-Set a backlog quota for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-l`, `--limit`|The backlog size limit (for example `10M` or `16G`)||
-|`-p`, `--policy`|The retention policy to enforce when the limit is reached. The valid options are: `producer_request_hold`, `producer_exception` or `consumer_backlog_eviction`|
-
-Example
-
-```bash
-
-$ pulsar-admin namespaces set-backlog-quota my-prop/my-cluster/my-ns \
---limit 2G \
---policy producer_request_hold
-
-```
-
-### `remove-backlog-quota`
-Remove a backlog quota policy from a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces remove-backlog-quota tenant/cluster/namespace
-
-```
-
-### `get-persistence`
-Get the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-persistence tenant/cluster/namespace
-
-```
-
-### `set-persistence`
-Set the persistence policies for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-persistence tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-a`, `--bookkeeper-ack-quorum`|The number of acks (guaranteed copies) to wait for each entry|0|
-|`-e`, `--bookkeeper-ensemble`|The number of bookies to use for a topic|0|
-|`-w`, `--bookkeeper-write-quorum`|How many writes to make of each entry|0|
-|`-r`, `--ml-mark-delete-max-rate`|Throttling rate of mark-delete operation (0 means no throttle)||
-
-
-### `get-message-ttl`
-Get the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-message-ttl tenant/cluster/namespace
-
-```
-
-### `set-message-ttl`
-Set the message TTL for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-message-ttl options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-ttl`, `--messageTTL`|Message TTL in seconds. When the value is set to `0`, TTL is disabled. TTL is disabled by default.|0|
-
-
-### `get-retention`
-Get the retention policy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-retention tenant/cluster/namespace
-
-```
-
-### `set-retention`
-Set the retention policy for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-retention tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|The retention size limits (for example 10M, 16G or 3T). 0 means no retention and -1 means infinite size retention||
-|`-t`, `--time`|The retention time in minutes, hours, days, or weeks. Examples: 100m, 13h, 2d, 5w. 0 means no retention and -1 means infinite time retention||
-
-
-### `unload`
-Unload a namespace or namespace bundle from the current serving broker.
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unload tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|||
-
-
-### `clear-backlog`
-Clear the backlog for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces clear-backlog tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|||   
-|`-f`, `--force`|Whether to force a clear backlog without prompt|false|
-|`-s`, `--sub`|The subscription name||
-
-
-### `unsubscribe`
-Unsubscribe the given subscription on all destinations on a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces unsubscribe tenant/cluster/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|||   
-|`-s`, `--sub`|The subscription name||
-
-
-### `get-compaction-threshold`
-Get compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-compaction-threshold tenant/namespace
-
-```
-
-### `set-compaction-threshold`
-Set compactionThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces set-compaction-threshold tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-t`, `--threshold`|Maximum number of bytes in a topic backlog before compaction is triggered (eg: 10M, 16G, 3T). 0 disables automatic compaction|0|
-
-
-### `get-offload-threshold`
-Get offloadThreshold for a namespace
-
-Usage
-
-```bash
-
-$ pulsar-admin namespaces get-offload-threshold tenant/namespace
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-s`, `--size`|Maximum number of bytes stored in the pulsar cluster for a topic before data will start being automatically offloaded to longterm storage (eg: 10M, 16G, 3T, 100). Negative values disable automatic offload. 0 triggers offloading as soon as possible.|-1|
-
-
-
-## `ns-isolation-policy`
-Operations for managing namespace isolation policies.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy subcommand
-
-```
-
-Subcommands
-* `set`
-* `get`
-* `list`
-* `delete`
-
-### `set`
-Create/update a namespace isolation policy for a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy set cluster-name policy-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--auto-failover-policy-params`|Comma-separated name=value auto failover policy parameters|[]|
-|`--auto-failover-policy-type`|Auto failover policy type name. Currently available options: min_available.|[]|
-|`--namespaces`|Comma-separated namespaces regex list|[]|
-|`--primary`|Comma-separated primary broker regex list|[]|
-|`--secondary`|Comma-separated secondary broker regex list|[]|
-
-
-### `get`
-Get the namespace isolation policy of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy get cluster-name policy-name
-
-```
-
-### `list`
-List all namespace isolation policies of a cluster. This operation requires Pulsar superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy list cluster-name
-
-```
-
-### `delete`
-Delete namespace isolation policy of a cluster. This operation requires superuser privileges.
-
-Usage
-
-```bash
-
-$ pulsar-admin ns-isolation-policy delete
-
-```
-
-## `sink`
-
-An interface for managing Pulsar IO sinks (egress data from Pulsar)
-
-Usage
-
-```bash
-
-$ pulsar-admin sink subcommand
-
-```
-
-Subcommands
-* `create`
-* `delete`
-* `localrun`
-
-
-### `create`
-Submit a Pulsar IO sink connector to run in a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin sink create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--className`|The sink’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--customSerdeInputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--disk`|The disk (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--inputs`|The sink’s input topic(s) (multiple topics can be specified as a comma-separated list)||
-|`--jar`|Path to the Java jar file for the sink||
-|`--name`|The sink’s name||
-|`--namespace`|The sink’s namespace||
-|`--parallelism`|"The sink’s parallelism factor (i.e. the number of sink instances to run)."||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the sink. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--sinkConfig`|Sink config key/values||
-|`--sinkConfigFile`|The path to a YAML config file specifying the sink’s configuration||
-|`--tenant`|The sink’s tenant||
-
-
-### `delete`
-Stops a Pulsar IO sink
-
-Usage
-
-```bash
-
-$ pulsar-admin sink delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function to delete||
-|`--namespace`|The namespace of the function to delete||
-|`--tenant`|The tenant of the function to delete||
-
-
-### `localrun`
-Run the Pulsar sink locally (rather than in the Pulsar cluster)
-
-Usage
-
-```bash
-
-$ pulsar-admin sink localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--brokerServiceUrl`|The URL for the Pulsar broker||
-|`--className`|The sink’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--customSerdeInputs`|The map of input topics to SerDe class names (as a JSON string)||
-|`--disk`|The disk (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--inputs`|The sink’s input topic(s) (multiple topics can be specified as a comma-separated list)||
-|`--jar`|Path to the Java jar file for the sink||
-|`--name`|The sink’s name||
-|`--namespace`|The sink’s namespace||
-|`--parallelism`|"The sink’s parallelism factor (i.e. the number of sink instances to run)."||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the sink. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per sink instance (applicable only to the Docker runtime)||
-|`--sinkConfig`|Sink config key/values||
-|`--sinkConfigFile`|The path to a YAML config file specifying the sink’s configuration||
-|`--tenant`|The sink’s tenant||
-
-
-
-## `source`
-An interface for managing Pulsar IO sources (ingress data into Pulsar)
-
-Usage
-
-```bash
-
-$ pulsar-admin source subcommand
-
-```
-
-Subcommands
-* `create`
-* `delete`
-* `localrun`
-
-
-### `create`
-Submit a Pulsar IO source connector to run in a Pulsar cluster
-
-Usage
-
-```bash
-
-$ pulsar-admin source create options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--className`|The source’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--deserializationClassName`|The SerDe classname for the source||
-|`--destinationTopicName`|The Pulsar topic to which data is sent||
-|`--disk`|The disk (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--jar`|Path to the Java jar file for the source||
-|`--name`|The source’s name||
-|`--namespace`|The source’s namespace||
-|`--parallelism`|The source’s parallelism factor (i.e. the number of source instances to run).||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the source. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--sourceConfig`|Source config key/values||
-|`--sourceConfigFile`|The path to a YAML config file specifying the source’s configuration||
-|`--tenant`|The source’s tenant||
-
-
-### `delete`
-Stops a Pulsar IO source
-
-Usage
-
-```bash
-
-$ pulsar-admin source delete options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--name`|The name of the function to delete||
-|`--namespace`|The namespace of the function to delete||
-|`--tenant`|The tenant of the function to delete||
-
-
-### `localrun`
-Run the Pulsar source locally (rather than in the Pulsar cluster)
-
-Usage
-
-```bash
-
-$ pulsar-admin source localrun options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--className`|The source’s Java class name||
-|`--cpu`|The CPU (in cores) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--deserializationClassName`|The SerDe classname for the source||
-|`--destinationTopicName`|The Pulsar topic to which data is sent||
-|`--disk`|The disk (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--jar`|Path to the Java jar file for the source||
-|`--name`|The source’s name||
-|`--namespace`|The source’s namespace||
-|`--parallelism`|The source’s parallelism factor (i.e. the number of source instances to run).||
-|`--processingGuarantees`|"The processing guarantees (aka delivery semantics) applied to the source. Available values: ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE."||
-|`--ram`|The RAM (in bytes) that needs to be allocated per source instance (applicable only to the Docker runtime)||
-|`--sourceConfig`|Source config key/values||
-|`--sourceConfigFile`|The path to a YAML config file specifying the source’s configuration||
-|`--tenant`|The source’s tenant||
-
-
-
-## `topics`
-Operations for managing Pulsar topics (both persistent and non persistent)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subcommand
-
-```
-
-Subcommands
-* `compact`
-* `compaction-status`
-* `offload`
-* `offload-status`
-* `create-partitioned-topic`
-* `delete-partitioned-topic`
-* `get-partitioned-topic-metadata`
-* `update-partitioned-topic`
-* `list`
-* `list-in-bundle`
-* `terminate`
-* `permissions`
-* `grant-permission`
-* `revoke-permission`
-* `lookup`
-* `bundle-range`
-* `delete`
-* `unload`
-* `subscriptions`
-* `unsubscribe`
-* `stats`
-* `stats-internal`
-* `info-internal`
-* `partitioned-stats`
-* `skip`
-* `skip-all`
-* `expire-messages`
-* `expire-messages-all-subscriptions`
-* `peek-messages`
-* `reset-cursor`
-
-
-### `compact`
-Run compaction on the specified topic (persistent topics only)
-
-Usage
-
-```
-
-$ pulsar-admin topics compact persistent://tenant/namespace/topic
-
-```
-
-### `compaction-status`
-Check the status of a topic compaction (persistent topics only)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics compaction-status persistent://tenant/namespace/topic
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `offload`
-Trigger offload of data from a topic to long-term storage (e.g. Amazon S3)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--size-threshold`|The maximum amount of data to keep in BookKeeper for the specific topic||
-
-
-### `offload-status`
-Check the status of data offloading from a topic to long-term storage
-
-Usage
-
-```bash
-
-$ pulsar-admin topics offload-status persistent://tenant/namespace/topic op
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-w`, `--wait-complete`|Wait for compaction to complete|false|
-
-
-### `create-partitioned-topic`
-Create a partitioned topic. A partitioned topic must be created before producers can publish to it.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics create-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-
-### `delete-partitioned-topic`
-Delete a partitioned topic. This will also delete all the partitions of the topic if they exist.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete-partitioned-topic {persistent|non-persistent}
-
-```
-
-### `get-partitioned-topic-metadata`
-Get the partitioned topic metadata. If the topic is not created or is a non-partitioned topic, this will return an empty topic with zero partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics get-partitioned-topic-metadata {persistent|non-persistent}://tenant/namespace/topic
-
-```
-
-### `update-partitioned-topic`
-Update existing non-global partitioned topic. New updating number of partitions must be greater than existing number of partitions.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics update-partitioned-topic {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-p`, `--partitions`|The number of partitions for the topic|0|
-
-### `list`
-Get the list of topics under a namespace
-
-Usage
-
-```
-
-$ pulsar-admin topics list tenant/cluster/namespace
-
-```
-
-### `list-in-bundle`
-Get a list of non-persistent topics present under a namespace bundle
-
-Usage
-
-```
-
-$ pulsar-admin topics list-in-bundle tenant/namespace options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-b`, `--bundle`|The bundle range||
-
-
-### `terminate`
-Terminate a persistent topic (disallow further messages from being published on the topic)
-
-Usage
-
-```bash
-
-$ pulsar-admin topics terminate persistent://tenant/namespace/topic
-
-```
-
-### `permissions`
-Get the permissions on a topic. Retrieve the effective permissions for a destination. These permissions are defined by the permissions set at the namespace level combined (union) with any eventual specific permissions set on the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics permissions topic
-
-```
-
-### `grant-permission`
-Grant a new permission to a client role on a single topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics grant-permission {persistent|non-persistent}://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--actions`|Actions to be granted (`produce` or `consume`)||
-|`--role`|The client role to which to grant the permissions||
-
-
-### `revoke-permission`
-Revoke permissions to a client role on a single topic. If the permission was not set at the topic level, but rather at the namespace level, this operation will return an error (HTTP status code 412).
-
-Usage
-
-```bash
-
-$ pulsar-admin topics revoke-permission topic
-
-```
-
-### `lookup`
-Look up a topic from the current serving broker
-
-Usage
-
-```bash
-
-$ pulsar-admin topics lookup topic
-
-```
-
-### `bundle-range`
-Get the namespace bundle which contains the given topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics bundle-range topic
-
-```
-
-### `delete`
-Delete a topic. The topic cannot be deleted if there are any active subscriptions or producers connected to the topic.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics delete topic
-
-```
-
-### `unload`
-Unload a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unload topic
-
-```
-
-### `subscriptions`
-Get the list of subscriptions on the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics subscriptions topic
-
-```
-
-### `unsubscribe`
-Delete a durable subscriber from a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics unsubscribe topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to delete||
-
-
-### `stats`
-Get the stats for the topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats topic
-
-```
-
-### `stats-internal`
-Get the internal stats for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics stats-internal topic
-
-```
-
-### `info-internal`
-Get the internal metadata info for the topic
-
-Usage
-
-```bash
-
-$ pulsar-admin topics info-internal topic
-
-```
-
-### `partitioned-stats`
-Get the stats for the partitioned topic and its connected producers and consumers. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics partitioned-stats topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`--per-partition`|Get per-partition stats|false|
-
-
-### `skip`
-Skip some messages for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics skip topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages to skip|0|
-|`-s`, `--subscription`|The subscription on which to skip messages||
-
-
-### `skip-all`
-Skip all the messages for the subscription
-
-Usage
-
-```bash
-
-$ pulsar-admin topics skip-all topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|The subscription to clear||
-
-
-### `expire-messages`
-Expire messages that are older than the given expiry time (in seconds) for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-|`-s`, `--subscription`|The subscription to skip messages on||
-
-
-### `expire-messages-all-subscriptions`
-Expire messages older than the given expiry time (in seconds) for all subscriptions
-
-Usage
-
-```bash
-
-$ pulsar-admin topics expire-messages-all-subscriptions topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-t`, `--expireTime`|Expire messages older than the time (in seconds)|0|
-
-
-### `peek-messages`
-Peek some messages for the subscription.
-
-Usage
-
-```bash
-
-$ pulsar-admin topics peek-messages topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-n`, `--count`|The number of messages|0|
-|`-s`, `--subscription`|Subscription to get messages from||
-
-
-### `reset-cursor`
-Reset position for subscription to closest to timestamp
-
-Usage
-
-```bash
-
-$ pulsar-admin topics reset-cursor topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|---|---|---|
-|`-s`, `--subscription`|Subscription to reset position on||
-|`-t`, `--time`|The time, in minutes, to reset back to (or minutes, hours, days, weeks, etc.). Examples: `100m`, `3h`, `2d`, `5w`.||
-
-
-
-## `tenants`
-Operations for managing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants subcommand
-
-```
-
-Subcommands
-* `list`
-* `get`
-* `create`
-* `update`
-* `delete`
-
-### `list`
-List the existing tenants
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants list
-
-```
-
-### `get`
-Gets the configuration of a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants get tenant-name
-
-```
-
-### `create`
-Creates a new tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants create tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-### `update`
-Updates a tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants update tenant-name options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-r`, `--admin-roles`|Comma-separated admin roles||
-|`-c`, `--allowed-clusters`|Comma-separated allowed clusters||
-
-
-### `delete`
-Deletes an existing tenant
-
-Usage
-
-```bash
-
-$ pulsar-admin tenants delete tenant-name
-
-```
-
-## `resource-quotas`
-Operations for managing resource quotas
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas subcommand
-
-```
-
-Subcommands
-* `get`
-* `set`
-* `reset-namespace-bundle-quota`
-
-
-### `get`
-Get the resource quota for a specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas get options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-### `set`
-Set the resource quota for the specified namespace bundle, or default quota if no namespace/bundle is specified.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas set options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-bi`, `--bandwidthIn`|The expected inbound bandwidth (in bytes/second)|0|
-|`-bo`, `--bandwidthOut`|Expected outbound bandwidth (in bytes/second)0|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-d`, `--dynamic`|Allow to be dynamically re-calculated (or not)|false|
-|`-mem`, `--memory`|Expectred memory usage (in megabytes)|0|
-|`-mi`, `--msgRateIn`|Expected incoming messages per second|0|
-|`-mo`, `--msgRateOut`|Expected outgoing messages per second|0|
-|`-n`, `--namespace`|The namespace as tenant/namespace, for example my-tenant/my-ns. Must be specified together with -b/--bundle.||
-
-
-### `reset-namespace-bundle-quota`
-Reset the specified namespace bundle's resource quota to a default value.
-
-Usage
-
-```bash
-
-$ pulsar-admin resource-quotas reset-namespace-bundle-quota options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`-b`, `--bundle`|A bundle of the form {start-boundary}_{end_boundary}. This must be specified together with -n/--namespace.||
-|`-n`, `--namespace`|The namespace||
-
-
-
-## `schemas`
-Operations related to Schemas associated with Pulsar topics.
-
-Usage
-
-```
-
-$ pulsar-admin schemas subcommand
-
-```
-
-Subcommands
-* `upload`
-* `delete`
-* `get`
-
-
-### `upload`
-Upload the schema definition for a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas upload persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--filename`|The path to the schema definition file. An example schema file is available under conf directory.||
-
-
-### `delete`
-Delete the schema definition associated with a topic
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas delete persistent://tenant/namespace/topic
-
-```
-
-### `get`
-Retrieve the schema definition associated with a topic (at a given version if version is supplied).
-
-Usage
-
-```bash
-
-$ pulsar-admin schemas get persistent://tenant/namespace/topic options
-
-```
-
-Options
-
-|Flag|Description|Default|
-|----|---|---|
-|`--version`|The version of the schema definition to retrieve for a topic.||
-
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/reference-rest-api-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/reference-rest-api-overview.md
deleted file mode 100644
index 4bdcf23483a2b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/reference-rest-api-overview.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-id: reference-rest-api-overview
-title: Pulsar REST APIs
-sidebar_label: "Pulsar REST APIs"
----
-
-A REST API (also known as RESTful API, REpresentational State Transfer Application Programming Interface) is a set of definitions and protocols for building and integrating application software, using HTTP requests to GET, PUT, POST, and DELETE data following the REST standards. In essence, REST API is a set of remote calls using standard methods to request and return data in a specific format between two systems. 
-
-Pulsar provides a variety of REST APIs that enable you to interact with Pulsar to retrieve information or perform an action. 
-
-| REST API category | Description |
-| --- | --- |
-| [Admin](https://pulsar.apache.org/admin-rest-api/?version=master) | REST APIs for administrative operations.|
-| [Functions](https://pulsar.apache.org/functions-rest-api/?version=master) | REST APIs for function-specific operations.|
-| [Sources](https://pulsar.apache.org/source-rest-api/?version=master) | REST APIs for source-specific operations.|
-| [Sinks](https://pulsar.apache.org/sink-rest-api/?version=master) | REST APIs for sink-specific operations.|
-| [Packages](https://pulsar.apache.org/packages-rest-api/?version=master) | REST APIs for package-specific operations. A package can be a group of functions, sources, and sinks.|
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/reference-terminology.md b/site2/website/versioned_docs/version-2.1.1-incubating/reference-terminology.md
deleted file mode 100644
index ebc114d86f707..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/reference-terminology.md
+++ /dev/null
@@ -1,167 +0,0 @@
----
-id: reference-terminology
-title: Pulsar Terminology
-sidebar_label: "Terminology"
----
-
-Here is a glossary of terms related to Apache Pulsar:
-
-### Concepts
-
-#### Pulsar
-
-Pulsar is a distributed messaging system originally created by Yahoo but now under the stewardship of the Apache Software Foundation.
-
-#### Message
-
-Messages are the basic unit of Pulsar. They're what [producers](#producer) publish to [topics](#topic)
-and what [consumers](#consumer) then consume from topics.
-
-#### Topic
-
-A named channel used to pass messages published by [producers](#producer) to [consumers](#consumer) who
-process those [messages](#message).
-
-#### Partitioned Topic
-
-A topic that is served by multiple Pulsar [brokers](#broker), which enables higher throughput.
-
-#### Namespace
-
-A grouping mechanism for related [topics](#topic).
-
-#### Namespace Bundle
-
-A virtual group of [topics](#topic) that belong to the same [namespace](#namespace). A namespace bundle
-is defined as a range between two 32-bit hashes, such as 0x00000000 and 0xffffffff.
-
-#### Tenant
-
-An administrative unit for allocating capacity and enforcing an authentication/authorization scheme.
-
-#### Subscription
-
-A lease on a [topic](#topic) established by a group of [consumers](#consumer). Pulsar has four subscription
-modes (exclusive, shared, failover and key_shared).
-
-#### Pub-Sub
-
-A messaging pattern in which [producer](#producer) processes publish messages on [topics](#topic) that
-are then consumed (processed) by [consumer](#consumer) processes.
-
-#### Producer
-
-A process that publishes [messages](#message) to a Pulsar [topic](#topic).
-
-#### Consumer
-
-A process that establishes a subscription to a Pulsar [topic](#topic) and processes messages published
-to that topic by [producers](#producer).
-
-#### Reader
-
-Pulsar readers are message processors much like Pulsar [consumers](#consumer) but with two crucial differences:
-
-- you can specify *where* on a topic readers begin processing messages (consumers always begin with the latest
-  available unacked message);
-- readers don't retain data or acknowledge messages.
-
-#### Cursor
-
-The subscription position for a [consumer](#consumer).
-
-#### Acknowledgment (ack)
-
-A message sent to a Pulsar broker by a [consumer](#consumer) that a message has been successfully processed.
-An acknowledgement (ack) is Pulsar's way of knowing that the message can be deleted from the system;
-if no acknowledgement, then the message will be retained until it's processed.
-
-#### Negative Acknowledgment (nack)
-
-When an application fails to process a particular message, it can send a "negative ack" to Pulsar
-to signal that the message should be replayed at a later timer. (By default, failed messages are
-replayed after a 1 minute delay). Be aware that negative acknowledgment on ordered subscription types,
-such as Exclusive, Failover and Key_Shared, can cause failed messages to arrive consumers out of the original order.
-
-#### Unacknowledged
-
-A message that has been delivered to a consumer for processing but not yet confirmed as processed by the consumer.
-
-#### Retention Policy
-
-Size and time limits that you can set on a [namespace](#namespace) to configure retention of [messages](#message)
-that have already been [acknowledged](#acknowledgement-ack).
-
-#### Multi-Tenancy
-
-The ability to isolate [namespaces](#namespace), specify quotas, and configure authentication and authorization
-on a per-[tenant](#tenant) basis.
-
-### Architecture
-
-#### Standalone
-
-A lightweight Pulsar broker in which all components run in a single Java Virtual Machine (JVM) process. Standalone
-clusters can be run on a single machine and are useful for development purposes.
-
-#### Cluster
-
-A set of Pulsar [brokers](#broker) and [BookKeeper](#bookkeeper) servers (aka [bookies](#bookie)).
-Clusters can reside in different geographical regions and replicate messages to one another
-in a process called [geo-replication](#geo-replication).
-
-#### Instance
-
-A group of Pulsar [clusters](#cluster) that act together as a single unit.
-
-#### Geo-Replication
-
-Replication of messages across Pulsar [clusters](#cluster), potentially in different datacenters
-or geographical regions.
-
-#### Configuration Store
-
-Pulsar's configuration store (previously known as configuration store) is a ZooKeeper quorum that
-is used for configuration-specific tasks. A multi-cluster Pulsar installation requires just one
-configuration store across all [clusters](#cluster).
-
-#### Topic Lookup
-
-A service provided by Pulsar [brokers](#broker) that enables connecting clients to automatically determine
-which Pulsar [cluster](#cluster) is responsible for a [topic](#topic) (and thus where message traffic for
-the topic needs to be routed).
-
-#### Service Discovery
-
-A mechanism provided by Pulsar that enables connecting clients to use just a single URL to interact
-with all the [brokers](#broker) in a [cluster](#cluster).
-
-#### Broker
-
-A stateless component of Pulsar [clusters](#cluster) that runs two other components: an HTTP server
-exposing a REST interface for administration and topic lookup and a [dispatcher](#dispatcher) that
-handles all message transfers. Pulsar clusters typically consist of multiple brokers.
-
-#### Dispatcher
-
-An asynchronous TCP server used for all data transfers in-and-out a Pulsar [broker](#broker). The Pulsar
-dispatcher uses a custom binary protocol for all communications.
-
-### Storage
-
-#### BookKeeper
-
-[Apache BookKeeper](http://bookkeeper.apache.org/) is a scalable, low-latency persistent log storage
-service that Pulsar uses to store data.
-
-#### Bookie
-
-Bookie is the name of an individual BookKeeper server. It is effectively the storage server of Pulsar.
-
-#### Ledger
-
-An append-only data structure in [BookKeeper](#bookkeeper) that is used to persistently store messages in Pulsar [topics](#topic).
-
-### Functions
-
-Pulsar Functions are lightweight functions that can consume messages from Pulsar topics, apply custom processing logic, and, if desired, publish results to topics.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-athenz.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-athenz.md
deleted file mode 100644
index 6d338fc4013bd..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-athenz.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-id: security-athenz
-title: Authentication using Athenz
-sidebar_label: "Authentication using Athenz"
----
-
-[Athenz](https://github.com/AthenZ/athenz) is a role-based authentication/authorization system. In Pulsar, you can use Athenz role tokens (also known as *z-tokens*) to establish the identify of the client.
-
-## Athenz authentication settings
-
-A [decentralized Athenz system](https://github.com/AthenZ/athenz/blob/master/docs/decent_authz_flow.md) contains an [authori**Z**ation **M**anagement **S**ystem](https://github.com/AthenZ/athenz/blob/master/docs/setup_zms.md) (ZMS) server and an [authori**Z**ation **T**oken **S**ystem](https://github.com/AthenZ/athenz/blob/master/docs/setup_zts) (ZTS) server.
-
-To begin, you need to set up Athenz service access control. You need to create domains for the *provider* (which provides some resources to other services with some authentication/authorization policies) and the *tenant* (which is provisioned to access some resources in a provider). In this case, the provider corresponds to the Pulsar service itself and the tenant corresponds to each application using Pulsar (typically, a [tenant](reference-terminology.md#tenant) in Pulsar).
-
-### Create the tenant domain and service
-
-On the [tenant](reference-terminology.md#tenant) side, you need to do the following things:
-
-1. Create a domain, such as `shopping`
-2. Generate a private/public key pair
-3. Create a service, such as `some_app`, on the domain with the public key
-
-Note that you need to specify the private key generated in step 2 when the Pulsar client connects to the [broker](reference-terminology.md#broker) (see client configuration examples for [Java](client-libraries-java.md#tls-authentication) and [C++](client-libraries-cpp.md#tls-authentication)).
-
-For more specific steps involving the Athenz UI, refer to [Example Service Access Control Setup](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#client-tenant-domain).
-
-### Create the provider domain and add the tenant service to some role members
-
-On the provider side, you need to do the following things:
-
-1. Create a domain, such as `pulsar`
-2. Create a role
-3. Add the tenant service to members of the role
-
-Note that you can specify any action and resource in step 2 since they are not used on Pulsar. In other words, Pulsar uses the Athenz role token only for authentication, *not* for authorization.
-
-For more specific steps involving UI, refer to [Example Service Access Control Setup](https://github.com/AthenZ/athenz/blob/master/docs/example_service_athenz_setup.md#server-provider-domain).
-
-## Configure the broker for Athenz
-
-> ### TLS encryption 
->
-> Note that when you are using Athenz as an authentication provider, you had better use TLS encryption 
-> as it can protect role tokens from being intercepted and reused. (for more details involving TLS encryption see [Architecture - Data Model](https://github.com/AthenZ/athenz/blob/master/docs/data_model)).
-
-In the `conf/broker.conf` configuration file in your Pulsar installation, you need to provide the class name of the Athenz authentication provider as well as a comma-separated list of provider domain names.
-
-```properties
-
-# Add the Athenz auth provider
-authenticationEnabled=true
-authorizationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-athenzDomainNames=pulsar
-
-# Enable TLS
-tlsEnabled=true
-tlsCertificateFilePath=/path/to/broker-cert.pem
-tlsKeyFilePath=/path/to/broker-key.pem
-
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-brokerClientAuthenticationParameters={"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}
-
-```
-
-> A full listing of parameters is available in the `conf/broker.conf` file, you can also find the default
-> values for those parameters in [Broker Configuration](reference-configuration.md#broker).
-
-## Configure clients for Athenz
-
-For more information on Pulsar client authentication using Athenz, see the following language-specific docs:
-
-* [Java client](client-libraries-java.md#athenz)
-
-## Configure CLI tools for Athenz
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-pulsar-admin.md), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You need to add the following authentication parameters to the `conf/client.conf` config file to use Athenz with CLI tools of Pulsar:
-
-```properties
-
-# URL for the broker
-serviceUrl=https://broker.example.com:8443/
-
-# Set Athenz auth plugin and its parameters
-authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-authParams={"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}
-
-# Enable TLS
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/cacert.pem
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-authorization.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-authorization.md
deleted file mode 100644
index c5e3c04b03524..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-authorization.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-id: security-authorization
-title: Authentication and authorization in Pulsar
-sidebar_label: "Authorization and ACLs"
----
-
-
-In Pulsar, the [authentication provider](security-overview.md#authentication-providers) is responsible for properly identifying clients and associating the clients with [role tokens](security-overview.md#role-tokens). If you only enable authentication, an authenticated role token has the ability to access all resources in the cluster. *Authorization* is the process that determines *what* clients are able to do.
-
-The role tokens with the most privileges are the *superusers*. The *superusers* can create and destroy tenants, along with having full access to all tenant resources.
-
-When a superuser creates a [tenant](reference-terminology.md#tenant), that tenant is assigned an admin role. A client with the admin role token can then create, modify and destroy namespaces, and grant and revoke permissions to *other role tokens* on those namespaces.
-
-## Broker and Proxy Setup
-
-### Enable authorization and assign superusers
-You can enable the authorization and assign the superusers in the broker ([`conf/broker.conf`](reference-configuration.md#broker)) configuration files.
-
-```properties
-
-authorizationEnabled=true
-superUserRoles=my-super-user-1,my-super-user-2
-
-```
-
-> A full list of parameters is available in the `conf/broker.conf` file.
-> You can also find the default values for those parameters in [Broker Configuration](reference-configuration.md#broker). 
-
-Typically, you use superuser roles for administrators, clients as well as broker-to-broker authorization. When you use [geo-replication](concepts-replication.md), every broker needs to be able to publish to all the other topics of clusters.
-
-You can also enable the authorization for the proxy in the proxy configuration file (`conf/proxy.conf`). Once you enable the authorization on the proxy, the proxy does an additional authorization check before forwarding the request to a broker. 
-If you enable authorization on the broker, the broker checks the authorization of the request when the broker receives the forwarded request.
-
-### Proxy Roles
-
-By default, the broker treats the connection between a proxy and the broker as a normal user connection. The broker authenticates the user as the role configured in `proxy.conf`(see ["Enable TLS Authentication on Proxies"](security-tls-authentication.md#enable-tls-authentication-on-proxies)). However, when the user connects to the cluster through a proxy, the user rarely requires the authentication. The user expects to be able to interact with the cluster as the role for which they have authenticated with the proxy.
-
-Pulsar uses *Proxy roles* to enable the authentication. Proxy roles are specified in the broker configuration file, [`conf/broker.conf`](reference-configuration.md#broker). If a client that is authenticated with a broker is one of its ```proxyRoles```, all requests from that client must also carry information about the role of the client that is authenticated with the proxy. This information is called the *original principal*. If the *original principal* is absent, the client is not able to access anything.
-
-You must authorize both the *proxy role* and the *original principal* to access a resource to ensure that the resource is accessible via the proxy. Administrators can take two approaches to authorize the *proxy role* and the *original principal*.
-
-The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role named `proxy1`, when the superuser creates a tenant, you should specify `proxy1` as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, you should also grant `proxy1` the same permissions.
-
-Another approach is to make the proxy role a superuser. This allows the proxy to access all resources. The client still needs to authenticate with the proxy, and all requests made through the proxy have their role downgraded to the *original principal* of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.
-
-You can specify the roles as proxy roles in [`conf/broker.conf`](reference-configuration.md#broker).
-
-```properties
-
-proxyRoles=my-proxy-role
-
-# if you want to allow superusers to use the proxy (see above)
-superUserRoles=my-super-user-1,my-super-user-2,my-proxy-role
-
-```
-
-## Administer tenants
-
-Pulsar [instance](reference-terminology.md#instance) administrators or some kind of self-service portal typically provisions a Pulsar [tenant](reference-terminology.md#tenant). 
-
-You can manage tenants using the [`pulsar-admin`](reference-pulsar-admin.md) tool. 
-
-### Create a new tenant
-
-The following is an example tenant creation command:
-
-```shell
-
-$ bin/pulsar-admin tenants create my-tenant \
-  --admin-roles my-admin-role \
-  --allowed-clusters us-west,us-east
-
-```
-
-This command creates a new tenant `my-tenant` that is allowed to use the clusters `us-west` and `us-east`.
-
-A client that successfully identifies itself as having the role `my-admin-role` is allowed to perform all administrative tasks on this tenant.
-
-The structure of topic names in Pulsar reflects the hierarchy between tenants, clusters, and namespaces:
-
-```shell
-
-persistent://tenant/namespace/topic
-
-```
-
-### Manage permissions
-
-You can use [Pulsar Admin Tools](admin-api-permissions.md) for managing permission in Pulsar.
-
-### Pulsar admin authentication
-
-```java
-
-PulsarAdmin admin = PulsarAdmin.builder()
-                    .serviceHttpUrl("http://broker:8080")
-                    .authentication("com.org.MyAuthPluginClass", "param1:value1")
-                    .build();
-
-```
-
-To use TLS:
-
-```java
-
-PulsarAdmin admin = PulsarAdmin.builder()
-                    .serviceHttpUrl("https://broker:8080")
-                    .authentication("com.org.MyAuthPluginClass", "param1:value1")
-                    .tlsTrustCertsFilePath("/path/to/trust/cert")
-                    .build();
-
-```
-
-## Authorize an authenticated client with multiple roles
-
-When a client is identified with multiple roles in a token (the type of role claim in the token is an array) during the authentication process, Pulsar supports to check the permissions of all the roles and further authorize the client as long as one of its roles has the required permissions.
-
-> **Note**
    
-> This authorization method is only compatible with [JWT authentication](security-jwt.md).
-
-To enable this authorization method, configure the authorization provider as `MultiRolesTokenAuthorizationProvider` in the `conf/broker.conf` file.
-
- ```properties
- 
- # Authorization provider fully qualified class-name
- authorizationProvider=org.apache.pulsar.broker.authorization.MultiRolesTokenAuthorizationProvider
- 
- ```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-encryption.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-encryption.md
deleted file mode 100644
index 3be74a932dddf..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-encryption.md
+++ /dev/null
@@ -1,334 +0,0 @@
----
-id: security-encryption
-title: Pulsar Encryption
-sidebar_label: "End-to-End Encryption"
----
-
-````mdx-code-block
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-````
-
-
-Applications can use Pulsar encryption to encrypt messages on the producer side and decrypt messages on the consumer side. You can use the public and private key pair that the application configures to perform encryption. Only the consumers with a valid key can decrypt the encrypted messages.
-
-## Asymmetric and symmetric encryption
-
-Pulsar uses a dynamically generated symmetric AES key to encrypt messages(data). You can use the application-provided ECDSA (Elliptic Curve Digital Signature Algorithm) or RSA (Rivest–Shamir–Adleman) key pair to encrypt the AES key(data key), so you do not have to share the secret with everyone.
-
-Key is a public and private key pair used for encryption or decryption. The producer key is the public key of the key pair, and the consumer key is the private key of the key pair.
-
-The application configures the producer with the public key. You can use this key to encrypt the AES data key. The encrypted data key is sent as part of message header. Only entities with the private key (in this case the consumer) are able to decrypt the data key which is used to decrypt the message.
-
-You can encrypt a message with more than one key. Any one of the keys used for encrypting the message is sufficient to decrypt the message.
-
-Pulsar does not store the encryption key anywhere in the Pulsar service. If you lose or delete the private key, your message is irretrievably lost, and is unrecoverable.
-
-## Producer
-![alt text](/assets/pulsar-encryption-producer.jpg "Pulsar Encryption Producer")
-
-## Consumer
-![alt text](/assets/pulsar-encryption-consumer.jpg "Pulsar Encryption Consumer")
-
-## Get started
-
-1. Create your ECDSA or RSA public and private key pair by using the following commands.
-  * ECDSA（for Java clients only)
-
-   ```shell
-   
-   openssl ecparam -name secp521r1 -genkey -param_enc explicit -out test_ecdsa_privkey.pem
-   openssl ec -in test_ecdsa_privkey.pem -pubout -outform pem -out test_ecdsa_pubkey.pem
-   
-   ```
-
-  * RSA (for C++, Python and Node.js clients)
-
-   ```shell
-   
-   openssl genrsa -out test_rsa_privkey.pem 2048
-   openssl rsa -in test_rsa_privkey.pem -pubout -outform pkcs8 -out test_rsa_pubkey.pem
-   
-   ```
-
-2. Add the public and private key to the key management and configure your producers to retrieve public keys and consumers clients to retrieve private keys.
-
-3. Implement the `CryptoKeyReader` interface, specifically `CryptoKeyReader.getPublicKey()` for producer and `CryptoKeyReader.getPrivateKey()` for consumer, which Pulsar client invokes to load the key.
-
-4. Add the encryption key name to the producer builder: PulsarClient.newProducer().addEncryptionKey("myapp.key").
-
-5. Configure a `CryptoKeyReader` to a producer, consumer or reader. 
-
-````mdx-code-block
-
-
-
-```java
-
-PulsarClient pulsarClient = PulsarClient.builder().serviceUrl("pulsar://localhost:6650").build();
-String topic = "persistent://my-tenant/my-ns/my-topic";
-// RawFileKeyReader is just an example implementation that's not provided by Pulsar
-CryptoKeyReader keyReader = new RawFileKeyReader("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem");
-
-Producer producer = pulsarClient.newProducer()
-        .topic(topic)
-        .cryptoKeyReader(keyReader)
-        .addEncryptionKey("myappkey")
-        .create();
-
-Consumer consumer = pulsarClient.newConsumer()
-        .topic(topic)
-        .subscriptionName("my-subscriber-name")
-        .cryptoKeyReader(keyReader)
-        .subscribe();
-
-Reader reader = pulsarClient.newReader()
-        .topic(topic)
-        .startMessageId(MessageId.earliest)
-        .cryptoKeyReader(keyReader)
-        .create();
-
-```
-
-
-
-
-```c++
-
-Client client("pulsar://localhost:6650");
-std::string topic = "persistent://my-tenant/my-ns/my-topic";
-// DefaultCryptoKeyReader is a built-in implementation that reads public key and private key from files
-auto keyReader = std::make_shared("test_ecdsa_pubkey.pem", "test_ecdsa_privkey.pem");
-
-Producer producer;
-ProducerConfiguration producerConf;
-producerConf.setCryptoKeyReader(keyReader);
-producerConf.addEncryptionKey("myappkey");
-client.createProducer(topic, producerConf, producer);
-
-Consumer consumer;
-ConsumerConfiguration consumerConf;
-consumerConf.setCryptoKeyReader(keyReader);
-client.subscribe(topic, "my-subscriber-name", consumerConf, consumer);
-
-Reader reader;
-ReaderConfiguration readerConf;
-readerConf.setCryptoKeyReader(keyReader);
-client.createReader(topic, MessageId::earliest(), readerConf, reader);
-
-```
-
-
-
-
-```python
-
-from pulsar import Client, CryptoKeyReader
-
-client = Client('pulsar://localhost:6650')
-topic = 'persistent://my-tenant/my-ns/my-topic'
-# CryptoKeyReader is a built-in implementation that reads public key and private key from files
-key_reader = CryptoKeyReader('test_ecdsa_pubkey.pem', 'test_ecdsa_privkey.pem')
-
-producer = client.create_producer(
-    topic=topic,
-    encryption_key='myappkey',
-    crypto_key_reader=key_reader
-)
-
-consumer = client.subscribe(
-    topic=topic,
-    subscription_name='my-subscriber-name',
-    crypto_key_reader=key_reader
-)
-
-reader = client.create_reader(
-    topic=topic,
-    start_message_id=MessageId.earliest,
-    crypto_key_reader=key_reader
-)
-
-client.close()
-
-```
-
-
-
-
-```nodejs
-
-const Pulsar = require('pulsar-client');
-
-(async () => {
-// Create a client
-const client = new Pulsar.Client({
-    serviceUrl: 'pulsar://localhost:6650',
-    operationTimeoutSeconds: 30,
-});
-
-// Create a producer
-const producer = await client.createProducer({
-    topic: 'persistent://public/default/my-topic',
-    sendTimeoutMs: 30000,
-    batchingEnabled: true,
-    publicKeyPath: "public-key.client-rsa.pem",
-    encryptionKey: "encryption-key"
-});
-
-// Create a consumer
-const consumer = await client.subscribe({
-    topic: 'persistent://public/default/my-topic',
-    subscription: 'sub1',
-    subscriptionType: 'Shared',
-    ackTimeoutMs: 10000,
-    privateKeyPath: "private-key.client-rsa.pem"
-});
-
-// Send messages
-for (let i = 0; i < 10; i += 1) {
-    const msg = `my-message-${i}`;
-    producer.send({
-    data: Buffer.from(msg),
-    });
-    console.log(`Sent message: ${msg}`);
-}
-await producer.flush();
-
-// Receive messages
-for (let i = 0; i < 10; i += 1) {
-    const msg = await consumer.receive();
-    console.log(msg.getData().toString());
-    consumer.acknowledge(msg);
-}
-
-await consumer.close();
-await producer.close();
-await client.close();
-})();
-
-```
-
-
-
-
-````
-
-6. Below is an example of a **customized** `CryptoKeyReader` implementation.
-
-````mdx-code-block
-
-
-
-```java
-
-class RawFileKeyReader implements CryptoKeyReader {
-
-    String publicKeyFile = "";
-    String privateKeyFile = "";
-
-    RawFileKeyReader(String pubKeyFile, String privKeyFile) {
-        publicKeyFile = pubKeyFile;
-        privateKeyFile = privKeyFile;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPublicKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(publicKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read public key from file " + publicKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-
-    @Override
-    public EncryptionKeyInfo getPrivateKey(String keyName, Map keyMeta) {
-        EncryptionKeyInfo keyInfo = new EncryptionKeyInfo();
-        try {
-            keyInfo.setKey(Files.readAllBytes(Paths.get(privateKeyFile)));
-        } catch (IOException e) {
-            System.out.println("ERROR: Failed to read private key from file " + privateKeyFile);
-            e.printStackTrace();
-        }
-        return keyInfo;
-    }
-}
-
-```
-
-
-
-
-```c++
-
-class CustomCryptoKeyReader : public CryptoKeyReader {
-    public:
-    Result getPublicKey(const std::string& keyName, std::map& metadata,
-                        EncryptionKeyInfo& encKeyInfo) const override {
-        // TODO:
-        return ResultOk;
-    }
-
-    Result getPrivateKey(const std::string& keyName, std::map& metadata,
-                        EncryptionKeyInfo& encKeyInfo) const override {
-        // TODO:
-        return ResultOk;
-    }
-};
-
-auto keyReader = std::make_shared(/* ... */);
-// TODO: create producer, consumer or reader based on keyReader here
-
-```
-
-Besides, you can use the **default** implementation of `CryptoKeyReader` by specifying the paths of `private key` and `public key`.
-
-
-
-
-Currently, **customized** `CryptoKeyReader` implementation is not supported in Python. However, you can use the **default** implementation by specifying the path of `private key` and `public key`.
-
-
-
-
-Currently, **customized** `CryptoKeyReader` implementation is not supported in Node.js. However, you can use the **default** implementation by specifying the path of `private key` and `public key`.
-
-
-
-
-````
-
-## Key rotation
-Pulsar generates a new AES data key every 4 hours or after publishing a certain number of messages. A producer fetches the asymmetric public key every 4 hours by calling CryptoKeyReader.getPublicKey() to retrieve the latest version.
-
-## Enable encryption at the producer application
-If you produce messages that are consumed across application boundaries, you need to ensure that consumers in other applications have access to one of the private keys that can decrypt the messages. You can do this in two ways:
-1. The consumer application provides you access to their public key, which you add to your producer keys.
-2. You grant access to one of the private keys from the pairs that producer uses. 
-
-When producers want to encrypt the messages with multiple keys, producers add all such keys to the config. Consumer can decrypt the message as long as the consumer has access to at least one of the keys.
-
-If you need to encrypt the messages using 2 keys (`myapp.messagekey1` and `myapp.messagekey2`), refer to the following example.
-
-```java
-
-PulsarClient.newProducer().addEncryptionKey("myapp.messagekey1").addEncryptionKey("myapp.messagekey2");
-
-```
-
-## Decrypt encrypted messages at the consumer application
-Consumers require to access one of the private keys to decrypt messages that the producer produces. If you want to receive encrypted messages, create a public or private key and give your public key to the producer application to encrypt messages using your public key.
-
-## Handle failures
-* Producer/Consumer loses access to the key
-  * Producer action fails to indicate the cause of the failure. Application has the option to proceed with sending unencrypted messages in such cases. Call `PulsarClient.newProducer().cryptoFailureAction(ProducerCryptoFailureAction)` to control the producer behavior. The default behavior is to fail the request.
-  * If consumption fails due to decryption failure or missing keys in consumer, the application has the option to consume the encrypted message or discard it. Call `PulsarClient.newConsumer().cryptoFailureAction(ConsumerCryptoFailureAction)` to control the consumer behavior. The default behavior is to fail the request. Application is never able to decrypt the messages if the private key is permanently lost.
-* Batch messaging
-  * If decryption fails and the message contains batch messages, client is not able to retrieve individual messages in the batch, hence message consumption fails even if cryptoFailureAction() is set to `ConsumerCryptoFailureAction.CONSUME`.
-* If decryption fails, the message consumption stops and the application notices backlog growth in addition to decryption failure messages in the client log. If the application does not have access to the private key to decrypt the message, the only option is to skip or discard backlogged messages. 
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-extending.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-extending.md
deleted file mode 100644
index 3d3fde6e4867e..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-extending.md
+++ /dev/null
@@ -1,82 +0,0 @@
----
-id: security-extending
-title: Extend Authentication and Authorization in Pulsar
-sidebar_label: "Extend Authentication and Authorization"
----
-
-Pulsar provides a way to use custom authentication and authorization mechanisms.
-
-## Authentication
-
-You can use a custom authentication mechanism by providing the implementation in the form of two plugins.
-* Client authentication plugin
-* Proxy/Broker authentication plugin
-
-### Client authentication plugin
-
-For the client library, you need to implement `org.apache.pulsar.client.api.Authentication`. By entering the command below, you can pass this class when you create a Pulsar client.
-
-```java
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar://localhost:6650")
-    .authentication(new MyAuthentication())
-    .build();
-
-```
-
-You can implement 2 interfaces on the client side:
- * [`Authentication`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/Authentication.html)
- * [`AuthenticationDataProvider`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/AuthenticationDataProvider.html)
-
-This in turn requires you to provide the client credentials in the form of `org.apache.pulsar.client.api.AuthenticationDataProvider` and also leaves the chance to return different kinds of authentication token for different types of connection or by passing a certificate chain to use for TLS.
-
-You can find the following examples for different client authentication plugins:
- * [Mutual TLS](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java)
- * [Athenz](https://github.com/apache/pulsar/blob/master/pulsar-client-auth-athenz/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationAthenz.java)
- * [Kerberos](https://github.com/apache/pulsar/blob/master/pulsar-client-auth-sasl/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationSasl.java)
- * [JSON Web Token (JWT)](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationToken.java)
- * [OAuth 2.0](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/AuthenticationOAuth2.java)
- * [Basic auth](https://github.com/apache/pulsar/blob/master/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationBasic.java)
-
-### Proxy/Broker authentication plugin
-
-On the proxy/broker side, you need to configure the corresponding plugin to validate the credentials that the client sends. The proxy and broker can support multiple authentication providers at the same time.
-
-In `conf/broker.conf`, you can choose to specify a list of valid providers:
-
-```properties
-
-# Authentication provider name list, which is comma separated list of class names
-authenticationProviders=
-
-```
-
-For the implementation of the `org.apache.pulsar.broker.authentication.AuthenticationProvider` interface, refer to [here](https://github.com/apache/pulsar/blob/master/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProvider.java).
-
-You can find the following examples for different broker authentication plugins:
-
- * [Mutual TLS](https://github.com/apache/pulsar/blob/master/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTls.java)
- * [Athenz](https://github.com/apache/pulsar/blob/master/pulsar-broker-auth-athenz/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java)
- * [Kerberos](https://github.com/apache/pulsar/blob/master/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java)
- * [JSON Web Token (JWT)](https://github.com/apache/pulsar/blob/master/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java)
- * [Basic auth](https://github.com/apache/pulsar/blob/master/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java)
-
-## Authorization
-
-Authorization is the operation that checks whether a particular "role" or "principal" has permission to perform a certain operation.
-
-By default, you can use the embedded authorization provider provided by Pulsar. You can also configure a different authorization provider through a plugin. Note that although the Authentication plugin is designed for use in both the proxy and broker, the Authorization plugin is designed only for use on the broker.
-
-### Broker authorization plugin
-
-To provide a custom authorization provider, you need to implement the `org.apache.pulsar.broker.authorization.AuthorizationProvider` interface, put this class in the Pulsar broker classpath and configure the class in `conf/broker.conf`:
-
- ```properties
- 
- # Authorization provider fully qualified class-name
- authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
- 
- ```
-
-For the implementation of the `org.apache.pulsar.broker.authorization.AuthorizationProvider` interface, refer to [here](https://github.com/apache/pulsar/blob/master/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authorization/AuthorizationProvider.java).
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-overview.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-overview.md
deleted file mode 100644
index 41beb0c87880b..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-overview.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-id: security-overview
-title: Pulsar security overview
-sidebar_label: "Overview"
----
-
-As the central message bus for a business, Apache Pulsar is frequently used for storing mission-critical data. Therefore, enabling security features in Pulsar is crucial.
-
-By default, Pulsar configures no encryption, authentication, or authorization. Any client can communicate to Apache Pulsar via plain text service URLs. So we must ensure that Pulsar accessing via these plain text service URLs is restricted to trusted clients only. In such cases, you can use Network segmentation and/or authorization ACLs to restrict access to trusted IPs. If you use neither, the state of cluster is wide open and anyone can access the cluster.
-
-Pulsar supports a pluggable authentication mechanism. And Pulsar clients use this mechanism to authenticate with brokers and proxies. You can also configure Pulsar to support multiple authentication sources.
-
-The Pulsar broker validates the authentication credentials when a connection is established. After the initial connection is authenticated, the "principal" token is stored for authorization though the connection is not re-authenticated. The broker periodically checks the expiration status of every `ServerCnx` object. You can set the `authenticationRefreshCheckSeconds` on the broker to control the frequency to check the expiration status. By default, the `authenticationRefreshCheckSeconds` is set to 60s. When the authentication is expired, the broker forces to re-authenticate the connection. If the re-authentication fails, the broker disconnects the client.
-
-The broker supports learning whether a particular client supports authentication refreshing. If a client supports authentication refreshing and the credential is expired, the authentication provider calls the `refreshAuthentication` method to initiate the refreshing process. If a client does not support authentication refreshing and the credential is expired, the broker disconnects the client.
-
-You had better secure the service components in your Apache Pulsar deployment.
-
-## Role tokens
-
-In Pulsar, a *role* is a string, like `admin` or `app1`, which can represent a single client or multiple clients. You can use roles to control permission for clients to produce or consume from certain topics, administer the configuration for tenants, and so on.
-
-Apache Pulsar uses an [Authentication Provider](#authentication-providers) to establish the identity of a client and then assign a *role token* to that client. This role token is then used for [Authorization and ACLs](security-authorization.md) to determine what the client is authorized to do.
-
-## Authentication providers
-
-Currently Pulsar supports the following authentication providers:
-
-- [TLS authentication](security-tls-authentication.md)
-- [Athenz authentication](security-athenz.md)
-- [Kerberos authentication](security-kerberos.md)
-- [JSON Web Token (JWT) authentication](security-jwt.md)
-- [OAuth 2.0 authentication](security-oauth2.md)
-- Basic authentication
-
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-tls-authentication.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-tls-authentication.md
deleted file mode 100644
index d34ecbc1fdcf3..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-tls-authentication.md
+++ /dev/null
@@ -1,221 +0,0 @@
----
-id: security-tls-authentication
-title: Authentication using TLS
-sidebar_label: "Authentication using TLS"
----
-
-## TLS authentication overview
-
-TLS authentication is an extension of [TLS transport encryption](security-tls-transport.md). Not only servers have keys and certs that the client uses to verify the identity of servers, clients also have keys and certs that the server uses to verify the identity of clients. You must have TLS transport encryption configured on your cluster before you can use TLS authentication. This guide assumes you already have TLS transport encryption configured.
-
-`Bouncy Castle Provider` provides TLS related cipher suites and algorithms in Pulsar. If you need [FIPS](https://www.bouncycastle.org/fips_faq.html) version of `Bouncy Castle Provider`, please reference [Bouncy Castle page](security-bouncy-castle.md).
-
-### Create client certificates
-
-Client certificates are generated using the certificate authority. Server certificates are also generated with the same certificate authority.
-
-The biggest difference between client certs and server certs is that the **common name** for the client certificate is the **role token** which that client is authenticated as.
-
-To use client certificates, you need to set `tlsRequireTrustedClientCertOnConnect=true` at the broker side. For details, refer to [TLS broker configuration](security-tls-transport.md#configure-broker).
-
-First, you need to enter the following command to generate the key :
-
-```bash
-
-$ openssl genrsa -out admin.key.pem 2048
-
-```
-
-Similar to the broker, the client expects the key to be in [PKCS 8](https://en.wikipedia.org/wiki/PKCS_8) format, so you need to convert it by entering the following command:
-
-```bash
-
-$ openssl pkcs8 -topk8 -inform PEM -outform PEM \
-      -in admin.key.pem -out admin.key-pk8.pem -nocrypt
-
-```
-
-Next, enter the command below to generate the certificate request. When you are asked for a **common name**, enter the **role token** that you want this key pair to authenticate a client as.
-
-```bash
-
-$ openssl req -config openssl.cnf \
-      -key admin.key.pem -new -sha256 -out admin.csr.pem
-
-```
-
-:::note
-
-If openssl.cnf is not specified, read [Certificate authority](http://pulsar.apache.org/docs/en/security-tls-transport/#certificate-authority) to get the openssl.cnf.
-
-:::
-
-Then, enter the command below to sign with request with the certificate authority. Note that the client certs uses the **usr_cert** extension, which allows the cert to be used for client authentication.
-
-```bash
-
-$ openssl ca -config openssl.cnf -extensions usr_cert \
-      -days 1000 -notext -md sha256 \
-      -in admin.csr.pem -out admin.cert.pem
-
-```
-
-You can get a cert, `admin.cert.pem`, and a key, `admin.key-pk8.pem` from this command. With `ca.cert.pem`, clients can use this cert and this key to authenticate themselves to brokers and proxies as the role token ``admin``.
-
-:::note
-
-If the "unable to load CA private key" error occurs and the reason of this error is "No such file or directory: /etc/pki/CA/private/cakey.pem" in this step. Try the command below:
-
-```bash
-
-$ cd /etc/pki/tls/misc/CA
-$ ./CA -newca
-
-```
-
-to generate `cakey.pem` .
-
-:::
-
-## Enable TLS authentication on brokers
-
-To configure brokers to authenticate clients, add the following parameters to `broker.conf`, alongside [the configuration to enable tls transport](security-tls-transport.md#broker-configuration):
-
-```properties
-
-# Configuration to enable authentication
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-# operations and publish/consume from all topics
-superUserRoles=admin
-
-# Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters
-brokerClientTlsEnabled=true
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-brokerClientAuthenticationParameters={"tlsCertFile":"/path/my-ca/admin.cert.pem","tlsKeyFile":"/path/my-ca/admin.key-pk8.pem"}
-brokerClientTrustCertsFilePath=/path/my-ca/certs/ca.cert.pem
-
-```
-
-## Enable TLS authentication on proxies
-
-To configure proxies to authenticate clients, add the following parameters to `proxy.conf`, alongside [the configuration to enable tls transport](security-tls-transport.md#proxy-configuration):
-
-The proxy should have its own client key pair for connecting to brokers. You need to configure the role token for this key pair in the ``proxyRoles`` of the brokers. See the [authorization guide](security-authorization.md) for more details.
-
-```properties
-
-# For clients connecting to the proxy
-authenticationEnabled=true
-authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-# For the proxy to connect to brokers
-brokerClientAuthenticationPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-brokerClientAuthenticationParameters=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
-
-```
-
-## Client configuration
-
-When you use TLS authentication, client connects via TLS transport. You need to configure the client to use ```https://``` and 8443 port for the web service URL, ```pulsar+ssl://``` and 6651 port for the broker service URL.
-
-### CLI tools
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-pulsar-admin.md), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You need to add the following parameters to that file to use TLS authentication with the CLI tools of Pulsar:
-
-```properties
-
-webServiceUrl=https://broker.example.com:8443/
-brokerServiceUrl=pulsar+ssl://broker.example.com:6651/
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
-authParams=tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem
-
-```
-
-### Java client
-
-```java
-
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar+ssl://broker.example.com:6651/")
-    .enableTls(true)
-    .tlsTrustCertsFilePath("/path/to/ca.cert.pem")
-    .authentication("org.apache.pulsar.client.impl.auth.AuthenticationTls",
-                    "tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem")
-    .build();
-
-```
-
-### Python client
-
-```python
-
-from pulsar import Client, AuthenticationTLS
-
-auth = AuthenticationTLS("/path/to/my-role.cert.pem", "/path/to/my-role.key-pk8.pem")
-client = Client("pulsar+ssl://broker.example.com:6651/",
-                tls_trust_certs_file_path="/path/to/ca.cert.pem",
-                tls_allow_insecure_connection=False,
-				authentication=auth)
-
-```
-
-### C++ client
-
-```c++
-
-#include 
-
-pulsar::ClientConfiguration config;
-config.setUseTls(true);
-config.setTlsTrustCertsFilePath("/path/to/ca.cert.pem");
-config.setTlsAllowInsecureConnection(false);
-
-pulsar::AuthenticationPtr auth = pulsar::AuthTls::create("/path/to/my-role.cert.pem",
-                                                         "/path/to/my-role.key-pk8.pem")
-config.setAuth(auth);
-
-pulsar::Client client("pulsar+ssl://broker.example.com:6651/", config);
-
-```
-
-### Node.js client
-
-```JavaScript
-
-const Pulsar = require('pulsar-client');
-
-(async () => {
-  const auth = new Pulsar.AuthenticationTls({
-    certificatePath: '/path/to/my-role.cert.pem',
-    privateKeyPath: '/path/to/my-role.key-pk8.pem',
-  });
-
-  const client = new Pulsar.Client({
-    serviceUrl: 'pulsar+ssl://broker.example.com:6651/',
-    authentication: auth,
-    tlsTrustCertsFilePath: '/path/to/ca.cert.pem',
-  });
-})();
-
-```
-
-### C# client
-
-```c#
-
-var clientCertificate = new X509Certificate2("admin.pfx");
-var client = PulsarClient.Builder()
-                         .AuthenticateUsingClientCertificate(clientCertificate)
-                         .Build();
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/security-tls-transport.md b/site2/website/versioned_docs/version-2.1.1-incubating/security-tls-transport.md
deleted file mode 100644
index 3feaf3a4564ae..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/security-tls-transport.md
+++ /dev/null
@@ -1,312 +0,0 @@
----
-id: security-tls-transport
-title: Transport Encryption using TLS
-sidebar_label: "Transport Encryption using TLS"
----
-
-## TLS overview
-
-By default, Apache Pulsar clients communicate with the Apache Pulsar service in plain text. This means that all data is sent in the clear. You can use TLS to encrypt this traffic to protect the traffic from the snooping of a man-in-the-middle attacker.
-
-You can also configure TLS for both encryption and authentication. Use this guide to configure just TLS transport encryption and refer to [here](security-tls-authentication.md) for TLS authentication configuration. Alternatively, you can use [another authentication mechanism](security-athenz.md) on top of TLS transport encryption.
-
-> Note that enabling TLS may impact the performance due to encryption overhead.
-
-## TLS concepts
-
-TLS is a form of [public key cryptography](https://en.wikipedia.org/wiki/Public-key_cryptography). Using key pairs consisting of a public key and a private key can perform the encryption. The public key encrpyts the messages and the private key decrypts the messages.
-
-To use TLS transport encryption, you need two kinds of key pairs, **server key pairs** and a **certificate authority**.
-
-You can use a third kind of key pair, **client key pairs**, for [client authentication](security-tls-authentication.md).
-
-You should store the **certificate authority** private key in a very secure location (a fully encrypted, disconnected, air gapped computer). As for the certificate authority public key, the **trust cert**, you can freely shared it.
-
-For both client and server key pairs, the administrator first generates a private key and a certificate request, then uses the certificate authority private key to sign the certificate request, finally generates a certificate. This certificate is the public key for the server/client key pair.
-
-For TLS transport encryption, the clients can use the **trust cert** to verify that the server has a key pair that the certificate authority signed when the clients are talking to the server. A man-in-the-middle attacker does not have access to the certificate authority, so they couldn't create a server with such a key pair.
-
-For TLS authentication, the server uses the **trust cert** to verify that the client has a key pair that the certificate authority signed. The common name of the **client cert** is then used as the client's role token (see [Overview](security-overview.md)).
-
-`Bouncy Castle Provider` provides cipher suites and algorithms in Pulsar. If you need [FIPS](https://www.bouncycastle.org/fips_faq.html) version of `Bouncy Castle Provider`, please reference [Bouncy Castle page](security-bouncy-castle.md).
-
-## Create TLS certificates
-
-Creating TLS certificates for Pulsar involves creating a [certificate authority](#certificate-authority) (CA), [server certificate](#server-certificate), and [client certificate](#client-certificate).
-
-Follow the guide below to set up a certificate authority. You can also refer to plenty of resources on the internet for more details. We recommend [this guide](https://jamielinux.com/docs/openssl-certificate-authority/index.html) for your detailed reference.
-
-### Certificate authority
-
-1. Create the certificate for the CA. You can use CA to sign both the broker and client certificates. This ensures that each party will trust the others. You should store CA in a very secure location (ideally completely disconnected from networks, air gapped, and fully encrypted).
-
-2. Entering the following command to create a directory for your CA, and place [this openssl configuration file](https://github.com/apache/pulsar/tree/master/site2/website/static/examples/openssl.cnf) in the directory. You may want to modify the default answers for company name and department in the configuration file. Export the location of the CA directory to the environment variable, CA_HOME. The configuration file uses this environment variable to find the rest of the files and directories that the CA needs.
-
-```bash
-
-mkdir my-ca
-cd my-ca
-wget https://raw.githubusercontent.com/apache/pulsar-site/main/site2/website/static/examples/openssl.cnf
-export CA_HOME=$(pwd)
-
-```
-
-3. Enter the commands below to create the necessary directories, keys and certs.
-
-```bash
-
-mkdir certs crl newcerts private
-chmod 700 private/
-touch index.txt
-echo 1000 > serial
-openssl genrsa -aes256 -out private/ca.key.pem 4096
-# You need enter a password in the command above
-chmod 400 private/ca.key.pem
-openssl req -config openssl.cnf -key private/ca.key.pem \
-    -new -x509 -days 7300 -sha256 -extensions v3_ca \
-    -out certs/ca.cert.pem
-# You must enter the same password in the previous openssl command
-chmod 444 certs/ca.cert.pem
-
-```
-
-:::tip
-
-The default `openssl` on macOS doesn't work for the commands above. You must upgrade the `openssl` via Homebrew:
-
-```bash
-
-brew install openssl
-export PATH="/usr/local/Cellar/openssl@3/3.0.1/bin:$PATH"
-
-```
-
-The version `3.0.1` might change in the future. Use the actual path from the output of `brew install` command.
-
-:::
-
-4. After you answer the question prompts, CA-related files are stored in the `./my-ca` directory. Within that directory:
-
-* `certs/ca.cert.pem` is the public certificate. This public certificates is meant to be distributed to all parties involved.
-* `private/ca.key.pem` is the private key. You only need it when you are signing a new certificate for either broker or clients and you must safely guard this private key.
-
-### Server certificate
-
-Once you have created a CA certificate, you can create certificate requests and sign them with the CA.
-
-The following commands ask you a few questions and then create the certificates. When you are asked for the common name, you should match the hostname of the broker. You can also use a wildcard to match a group of broker hostnames, for example, `*.broker.usw.example.com`. This ensures that multiple machines can reuse the same certificate.
-
-:::tip
-
-Sometimes matching the hostname is not possible or makes no sense,
-such as when you create the brokers with random hostnames, or you
-plan to connect to the hosts via their IP. In these cases, you 
-should configure the client to disable TLS hostname verification. For more
-details, you can see [the host verification section in client configuration](#hostname-verification).
-
-:::
-
-1. Enter the command below to generate the key.
-
-```bash
-
-openssl genrsa -out broker.key.pem 2048
-
-```
-
-The broker expects the key to be in [PKCS 8](https://en.wikipedia.org/wiki/PKCS_8) format, so enter the following command to convert it.
-
-```bash
-
-openssl pkcs8 -topk8 -inform PEM -outform PEM \
-      -in broker.key.pem -out broker.key-pk8.pem -nocrypt
-
-```
-
-2. Enter the following command to generate the certificate request.
-
-```bash
-
-openssl req -config openssl.cnf \
-    -key broker.key.pem -new -sha256 -out broker.csr.pem
-
-```
-
-3. Sign it with the certificate authority by entering the command below.
-
-```bash
-
-openssl ca -config openssl.cnf -extensions server_cert \
-    -days 1000 -notext -md sha256 \
-    -in broker.csr.pem -out broker.cert.pem
-
-```
-
-At this point, you have a cert, `broker.cert.pem`, and a key, `broker.key-pk8.pem`, which you can use along with `ca.cert.pem` to configure TLS transport encryption for your broker and proxy nodes.
-
-## Configure broker
-
-To configure a Pulsar [broker](reference-terminology.md#broker) to use TLS transport encryption, you need to make some changes to `broker.conf`, which locates in the `conf` directory of your [Pulsar installation](getting-started-standalone.md).
-
-Add these values to the configuration file (substituting the appropriate certificate paths where necessary):
-
-```properties
-
-brokerServicePortTls=6651
-webServicePortTls=8081
-tlsRequireTrustedClientCertOnConnect=true
-tlsCertificateFilePath=/path/to/broker.cert.pem
-tlsKeyFilePath=/path/to/broker.key-pk8.pem
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-
-```
-
-> You can find a full list of parameters available in the `conf/broker.conf` file,
-> as well as the default values for those parameters, in [Broker Configuration](reference-configuration.md#broker) 
-> 
-### TLS Protocol Version and Cipher
-
-You can configure the broker (and proxy) to require specific TLS protocol versions and ciphers for TLS negiotation. You can use the TLS protocol versions and ciphers to stop clients from requesting downgraded TLS protocol versions or ciphers that may have weaknesses.
-
-Both the TLS protocol versions and cipher properties can take multiple values, separated by commas. The possible values for protocol version and ciphers depend on the TLS provider that you are using. Pulsar uses OpenSSL if the OpenSSL is available, but if the OpenSSL is not available, Pulsar defaults back to the JDK implementation.
-
-```properties
-
-tlsProtocols=TLSv1.3,TLSv1.2
-tlsCiphers=TLS_DH_RSA_WITH_AES_256_GCM_SHA384,TLS_DH_RSA_WITH_AES_256_CBC_SHA
-
-```
-
-OpenSSL currently supports ```TLSv1.1```, ```TLSv1.2``` and ```TLSv1.3``` for the protocol version. You can acquire a list of supported cipher from the openssl ciphers command, i.e. ```openssl ciphers -tls1_3```.
-
-For JDK 11, you can obtain a list of supported values from the documentation:
-- [TLS protocol](https://docs.oracle.com/en/java/javase/11/security/oracle-providers.html#GUID-7093246A-31A3-4304-AC5F-5FB6400405E2__SUNJSSEPROVIDERPROTOCOLPARAMETERS-BBF75009)
-- [Ciphers](https://docs.oracle.com/en/java/javase/11/security/oracle-providers.html#GUID-7093246A-31A3-4304-AC5F-5FB6400405E2__SUNJSSE_CIPHER_SUITES)
-
-## Proxy Configuration
-
-Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy connecting to brokers.
-
-```properties
-
-# For clients connecting to the proxy
-tlsEnabledInProxy=true
-tlsCertificateFilePath=/path/to/broker.cert.pem
-tlsKeyFilePath=/path/to/broker.key-pk8.pem
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-
-# For the proxy to connect to brokers
-tlsEnabledWithBroker=true
-brokerClientTrustCertsFilePath=/path/to/ca.cert.pem
-
-```
-
-## Client configuration
-
-When you enable the TLS transport encryption, you need to configure the client to use ```https://``` and port 8443 for the web service URL, and ```pulsar+ssl://``` and port 6651 for the broker service URL.
-
-As the server certificate that you generated above does not belong to any of the default trust chains, you also need to either specify the path the **trust cert** (recommended), or tell the client to allow untrusted server certs.
-
-### Hostname verification
-
-Hostname verification is a TLS security feature whereby a client can refuse to connect to a server if the "CommonName" does not match the hostname to which the hostname is connecting. By default, Pulsar clients disable hostname verification, as it requires that each broker has a DNS record and a unique cert.
-
-Moreover, as the administrator has full control of the certificate authority, a bad actor is unlikely to be able to pull off a man-in-the-middle attack. "allowInsecureConnection" allows the client to connect to servers whose cert has not been signed by an approved CA. The client disables "allowInsecureConnection" by default, and you should always disable "allowInsecureConnection" in production environments. As long as you disable "allowInsecureConnection", a man-in-the-middle attack requires that the attacker has access to the CA.
-
-One scenario where you may want to enable hostname verification is where you have multiple proxy nodes behind a VIP, and the VIP has a DNS record, for example, pulsar.mycompany.com. In this case, you can generate a TLS cert with pulsar.mycompany.com as the "CommonName," and then enable hostname verification on the client.
-
-The examples below show that hostname verification is disabled for the CLI tools/Java/Python/C++/Node.js/C# clients by default. 
-
-### CLI tools
-
-[Command-line tools](reference-cli-tools.md) like [`pulsar-admin`](reference-cli-tools.md#pulsar-admin), [`pulsar-perf`](reference-cli-tools.md#pulsar-perf), and [`pulsar-client`](reference-cli-tools.md#pulsar-client) use the `conf/client.conf` config file in a Pulsar installation.
-
-You need to add the following parameters to that file to use TLS transport with the CLI tools of Pulsar:
-
-```properties
-
-webServiceUrl=https://broker.example.com:8443/
-brokerServiceUrl=pulsar+ssl://broker.example.com:6651/
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca.cert.pem
-tlsEnableHostnameVerification=false
-
-```
-
-#### Java client
-
-```java
-
-import org.apache.pulsar.client.api.PulsarClient;
-
-PulsarClient client = PulsarClient.builder()
-    .serviceUrl("pulsar+ssl://broker.example.com:6651/")
-    .enableTls(true)
-    .tlsTrustCertsFilePath("/path/to/ca.cert.pem")
-    .enableTlsHostnameVerification(false) // false by default, in any case
-    .allowTlsInsecureConnection(false) // false by default, in any case
-    .build();
-
-```
-
-#### Python client
-
-```python
-
-from pulsar import Client
-
-client = Client("pulsar+ssl://broker.example.com:6651/",
-                tls_hostname_verification=False,
-                tls_trust_certs_file_path="/path/to/ca.cert.pem",
-                tls_allow_insecure_connection=False) // defaults to false from v2.2.0 onwards
-
-```
-
-#### C++ client
-
-```c++
-
-#include 
-
-ClientConfiguration config = ClientConfiguration();
-config.setUseTls(true);  // shouldn't be needed soon
-config.setTlsTrustCertsFilePath(caPath);
-config.setTlsAllowInsecureConnection(false);
-config.setAuth(pulsar::AuthTls::create(clientPublicKeyPath, clientPrivateKeyPath));
-config.setValidateHostName(false);
-
-```
-
-#### Node.js client
-
-```JavaScript
-
-const Pulsar = require('pulsar-client');
-
-(async () => {
-  const client = new Pulsar.Client({
-    serviceUrl: 'pulsar+ssl://broker.example.com:6651/',
-    tlsTrustCertsFilePath: '/path/to/ca.cert.pem',
-    useTls: true,
-    tlsValidateHostname: false,
-    tlsAllowInsecureConnection: false,
-  });
-})();
-
-```
-
-#### C# client
-
-```c#
-
-var certificate = new X509Certificate2("ca.cert.pem");
-var client = PulsarClient.Builder()
-                         .TrustedCertificateAuthority(certificate) //If the CA is not trusted on the host, you can add it explicitly.
-                         .VerifyCertificateAuthority(true) //Default is 'true'
-                         .VerifyCertificateName(false)     //Default is 'false'
-                         .Build();
-
-```
-
-> Note that `VerifyCertificateName` refers to the configuration of hostname verification in the C# client.
diff --git a/site2/website/versioned_docs/version-2.1.1-incubating/standalone.md b/site2/website/versioned_docs/version-2.1.1-incubating/standalone.md
deleted file mode 100644
index 46a5adebe7464..0000000000000
--- a/site2/website/versioned_docs/version-2.1.1-incubating/standalone.md
+++ /dev/null
@@ -1,222 +0,0 @@
----
-id: standalone
-title: Setting up a local standalone cluster
-sidebar_label: "Run Pulsar locally"
-original_id: standalone
----
-
-For the purposes of local development and testing, you can run Pulsar in standalone mode on your own machine. Standalone mode includes a Pulsar broker as well as the necessary ZooKeeper and BookKeeper components running inside of a single Java Virtual Machine (JVM) process.
-
-> #### Pulsar in production? 
-> If you're looking to run a full production Pulsar installation, see the [Deploying a Pulsar instance](deploy-bare-metal.md) guide.
-
-## Run Pulsar Standalone Manually
-
-### System requirements
-
-Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
-
-
-### Installing Pulsar
-
-To get started running Pulsar, download a binary tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar @pulsar:version@ binary release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:binary_release_url
-  
-  ```
-
-Once the tarball is downloaded, untar it and `cd` into the resulting directory:
-
-```bash
-
-$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
-$ cd apache-pulsar-@pulsar:version@
-
-```
-
-### What your package contains
-
-The Pulsar binary package initially contains the following directories:
-
-Directory | Contains
-:---------|:--------
-`bin` | Pulsar's command-line tools, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](reference-pulsar-admin.md)
-`conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
-`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar
-`licenses` | License files, in `.txt` form, for various components of the Pulsar [codebase](https://github.com/apache/pulsar)
-
-These directories will be created once you begin running Pulsar:
-
-Directory | Contains
-:---------|:--------
-`data` | The data storage directory used by ZooKeeper and BookKeeper
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
-`logs` | Logs created by the installation
-
-
-### Installing Builtin Connectors
-
-Since release `2.1.0-incubating`, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
-If you would like to enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
-
-* by clicking the link below and downloading the release from an Apache mirror:
-
-  * Pulsar IO Connectors @pulsar:version@ release
-
-* from the Pulsar [downloads page](pulsar:download_page_url)
-* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
-* using [wget](https://www.gnu.org/software/wget):
-
-  ```shell
-  
-  $ wget pulsar:connector_release_url
-  
-  ```
-
-Once the tarball is downloaded, in the pulsar directory, untar the io-connectors package and copy the connectors as `connectors`
-in the pulsar directory:
-
-```bash
-
-$ tar xvfz /path/to/apache-pulsar-io-connectors-@pulsar:version@-bin.tar.gz
-
-// you will find a directory named `apache-pulsar-io-connectors-@pulsar:version@` in the pulsar directory
-// then copy the connectors
-
-$ cd apache-pulsar-io-connectors-@pulsar:version@/connectors connectors
-
-$ ls connectors
-pulsar-io-aerospike-@pulsar:version@.nar
-pulsar-io-cassandra-@pulsar:version@.nar
-pulsar-io-kafka-@pulsar:version@.nar
-pulsar-io-kinesis-@pulsar:version@.nar
-pulsar-io-rabbitmq-@pulsar:version@.nar
-pulsar-io-twitter-@pulsar:version@.nar
-...
-
-```
-
-> #### NOTES
->
-> If you are running Pulsar in a bare metal cluster, you need to make sure `connectors` tarball is unzipped in every broker's pulsar directory
-> (or in every function-worker's pulsar directory if you are running a separate worker cluster for Pulsar functions).
-> 
-> If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DC/OS](https://dcos.io/)),
-> you can use `apachepulsar/pulsar-all` image instead of `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
-
-### Starting the cluster
-
-Once you have an up-to-date local copy of the release, you can start up a local cluster using the [`pulsar`](reference-cli-tools.md#pulsar) command, which is stored in the `bin` directory, and specifying that you want to start up Pulsar in standalone mode:
-
-```bash
-
-$ bin/pulsar standalone
-
-```
-
-If Pulsar has been successfully started, you should see `INFO`-level log messages like this:
-
-```bash
-
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@95] - Configuration Store cache started
-2017-06-01 14:46:29,192 - INFO  - [main:AuthenticationService@61] - Authentication is disabled
-2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@108] - Pulsar WebSocket Service started
-
-```
-
-> #### Automatically created namespace
-> When you start a local standalone cluster, Pulsar will automatically create a `public/default` [namespace](concepts-messaging.md#namespaces) that you can use for development purposes. All Pulsar topics are managed within namespaces. For more info, see [Topics](concepts-messaging.md#topics).
-
-## Run Pulsar Standalone in Docker
-
-Alternatively, you can run pulsar standalone locally in docker.
-
-```bash
-
-docker run -it -p 80:80 -p 8080:8080 -p 6650:6650 apachepulsar/pulsar-standalone
-
-```
-
-The command forwards following port to localhost:
-
-- 80: the port for pulsar dashboard
-- 8080: the http service url for pulsar service
-- 6650: the binary protocol service url for pulsar service
-
-After the docker container is running, you can access the dashboard under http://localhost .
-
-## Testing your cluster setup
-
-Pulsar provides a CLI tool called [`pulsar-client`](reference-cli-tools.md#pulsar-client) that enables you to do things like send messages to a Pulsar topic in a running cluster. This command will send a simple message saying `hello-pulsar` to the `my-topic` topic:
-
-```bash
-
-$ bin/pulsar-client produce my-topic --messages "hello-pulsar"
-
-```
-
-If the message has been successfully published to the topic, you should see a confirmation like this in the `pulsar-client` logs:
-
-```
-
-13:09:39.356 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 1 messages successfully produced
-
-```
-
-> #### No need to explicitly create new topics
-> You may have noticed that we did not explicitly create the `my-topic` topic to which we sent the `hello-pulsar` message. If you attempt to write a message to a topic that does not yet exist, Pulsar will automatically create that topic for you.
-
-## Using Pulsar clients locally
-
-Pulsar currently offers client libraries for [Java](client-libraries-java.md), [Python](client-libraries-python.md), and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can use one of these root URLs for interacting with your cluster:
-
-* `http://localhost:8080`
-* `pulsar://localhost:6650`
-
-Here's an example producer for a Pulsar topic using the [Java](client-libraries-java.md) client:
-
-```java
-
-String localClusterUrl = "pulsar://localhost:6650";
-
-PulsarClient client = PulsarClient.builder().serviceUrl(localClusterUrl).build();
-Producer producer = client.newProducer().topic("my-topic").create();
-
-```
-
-Here's an example [Python](client-libraries-python.md) producer:
-
-```python
-
-import pulsar
-
-client = pulsar.Client('pulsar://localhost:6650')
-producer = client.create_producer('my-topic')
-
-```
-
-Finally, here's an example [C++](client-libraries-cpp.md) producer:
-
-```cpp
-
-Client client("pulsar://localhost:6650");
-Producer producer;
-Result result = client.createProducer("my-topic", producer);
-if (result != ResultOk) {
-    LOG_ERROR("Error creating producer: " << result);
-    return -1;
-}
-
-```
-
diff --git a/site2/website/versioned_docs/version-2.10.x/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.10.x/client-libraries-cpp.md
index bfa8e5abe0a68..a17f977ddda16 100644
--- a/site2/website/versioned_docs/version-2.10.x/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.10.x/client-libraries-cpp.md
@@ -5,341 +5,111 @@ sidebar_label: "C++"
 original_id: client-libraries-cpp
 ---
 
-You can use Pulsar C++ client to create Pulsar producers and consumers in C++.
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
 
-All the methods in producer, consumer, and reader of a C++ client are thread-safe.
+You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-## Supported platforms
+All the methods in producer, consumer, and reader of a C++ client are thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ client.
 
-Pulsar C++ client is supported on **Linux** ,**macOS** and **Windows** platforms.
+## Installation
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+Use one of the following methods to install a Pulsar C++ client.
 
+### Brew
 
-## Linux
-
-:::note
-
-You can choose one of the following installation methods based on your needs: Compilation, Install RPM or Install Debian.
-
-:::
-
-### Compilation 
-
-#### System requirements
-
-You need to install the following components before using the C++ client:
-
-* [CMake](https://cmake.org/)
-* [Boost](http://www.boost.org/)
-* [Protocol Buffers](https://developers.google.com/protocol-buffers/) >= 3
-* [libcurl](https://curl.se/libcurl/)
-* [Google Test](https://github.com/google/googletest)
-
-1. Clone the Pulsar repository.
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-
-```
-
-2. Install all necessary dependencies.
-
-```shell
-
-$ apt-get install cmake libssl-dev libcurl4-openssl-dev liblog4cxx-dev \
-  libprotobuf-dev protobuf-compiler libboost-all-dev google-mock libgtest-dev libjsoncpp-dev
-
-```
-
-3. Compile and install [Google Test](https://github.com/google/googletest).
-
-```shell
-
-# libgtest-dev version is 1.18.0 or above
-$ cd /usr/src/googletest
-$ sudo cmake .
-$ sudo make
-$ sudo cp ./googlemock/libgmock.a ./googlemock/gtest/libgtest.a /usr/lib/
-
-# less than 1.18.0
-$ cd /usr/src/gtest
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgtest.a /usr/lib
-
-$ cd /usr/src/gmock
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgmock.a /usr/lib
-
-```
-
-4. Compile the Pulsar client library for C++ inside the Pulsar repository.
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
-After you install the components successfully, the files `libpulsar.so` and `libpulsar.a` are in the `lib` folder of the repository. The tools `perfProducer` and `perfConsumer` are in the `perf` directory.
-
-### Install Dependencies
-
-> Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can download and install those packages directly.
-
-After you download and install RPM or DEB, the `libpulsar.so`, `libpulsarnossl.so`, `libpulsar.a`, and `libpulsarwithdeps.a` libraries are in your `/usr/lib` directory.
-
-By default, they are built in code path `${PULSAR_HOME}/pulsar-client-cpp`. You can build with the command below.
-
- `cmake . -DBUILD_TESTS=OFF -DLINK_STATIC=ON && make pulsarShared pulsarSharedNossl pulsarStatic pulsarStaticWithDeps -j 3`.
-
-These libraries rely on some other libraries. If you want to get detailed version of dependencies, see [RPM](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/rpm/Dockerfile) or [DEB](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/deb/Dockerfile) files.
-
-1. `libpulsar.so` is a shared library, containing statically linked `boost` and `openssl`. It also dynamically links all other necessary libraries. You can use this Pulsar library with the command below.
+Use [Homebrew](http://brew.sh/) to install the latest tagged version with the library and headers:
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.so -I/usr/local/ssl/include
-
-```
-
-2. `libpulsarnossl.so` is a shared library, similar to `libpulsar.so` except that the libraries `openssl` and `crypto` are dynamically linked. You can use this Pulsar library with the command below.
-
-```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarnossl.so -lssl -lcrypto -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
+brew install libpulsar
 ```
 
-3. `libpulsar.a` is a static library. You need to load dependencies before using this library. You can use this Pulsar library with the command below.
+### Deb
 
-```bash
+1. Download any one of the Deb packages:
 
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib -lboost_system -lboost_regex -lcurl -lprotobuf -lzstd -lz
-
-```
-
-4. `libpulsarwithdeps.a` is a static library, based on `libpulsar.a`. It is archived in the dependencies of `libboost_regex`, `libboost_system`, `libcurl`, `libprotobuf`, `libzstd` and `libz`. You can use this Pulsar library with the command below.
+
+
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarwithdeps.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
+wget @pulsar:deb:client@
 ```
 
-The `libpulsarwithdeps.a` does not include library openssl related libraries `libssl` and `libcrypto`, because these two libraries are related to security. It is more reasonable and easier to use the versions provided by the local system to handle security issues and upgrade libraries.
-
-### Install RPM
+This package contains shared libraries `libpulsar.so` and `libpulsarnossl.so`.
 
-1. Download an RPM package from the links in the table. 
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:dist_rpm:client@) | [asc](@pulsar:dist_rpm:client@.asc), [sha512](@pulsar:dist_rpm:client@.sha512) |
-| [client-debuginfo](@pulsar:dist_rpm:client-debuginfo@) | [asc](@pulsar:dist_rpm:client-debuginfo@.asc),  [sha512](@pulsar:dist_rpm:client-debuginfo@.sha512) |
-| [client-devel](@pulsar:dist_rpm:client-devel@) | [asc](@pulsar:dist_rpm:client-devel@.asc),  [sha512](@pulsar:dist_rpm:client-devel@.sha512) |
-
-2. Install the package using the following command.
+
+
 
 ```bash
-
-$ rpm -ivh apache-pulsar-client*.rpm
-
-```
-
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` directory, for example：
-
-```bash
-
-lrwxrwxrwx 1 root root 18 Dec 30 22:21 libpulsar.so -> libpulsar.so.2.9.1
-lrwxrwxrwx 1 root root 23 Dec 30 22:21 libpulsarnossl.so -> libpulsarnossl.so.2.9.1
-
+wget @pulsar:deb:client-devel@
 ```
 
-:::note
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-If you get the error that `libpulsar.so: cannot open shared object file: No such file or directory` when starting Pulsar client, you may need to run `ldconfig` first.
+
+
 
-:::
-
-2. Install the GCC and g++ using the following command, otherwise errors would occur in installing Node.js.
+2. Install the package using the following command:
 
 ```bash
-
-$ sudo yum -y install gcc automake autoconf libtool make
-$ sudo yum -y install gcc-c++
-
+apt install ./apache-pulsar-client*.deb
 ```
 
-### Install Debian
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-1. Download a Debian package from the links in the table. 
+### RPM
 
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:deb:client@) | [asc](@pulsar:dist_deb:client@.asc), [sha512](@pulsar:dist_deb:client@.sha512) |
-| [client-devel](@pulsar:deb:client-devel@) | [asc](@pulsar:dist_deb:client-devel@.asc),  [sha512](@pulsar:dist_deb:client-devel@.sha512) |
+1. Download any one of the RPM packages:
 
-2. Install the package using the following command.
+
+
 
 ```bash
-
-$ apt install ./apache-pulsar-client*.deb
-
+wget @pulsar:dist_rpm:client@
 ```
 
-After you install DEB successfully, Pulsar libraries are in the `/usr/lib` directory.
-
-### Build
+This package contains shared libraries: `libpulsar.so` and `libpulsarnossl.so`.
 
-> If you want to build RPM and Debian packages from the latest master, follow the instructions below. You should run all the instructions at the root directory of your cloned Pulsar repository.
-
-There are recipes that build RPM and Debian packages containing a
-statically linked `libpulsar.so` / `libpulsarnossl.so` / `libpulsar.a` / `libpulsarwithdeps.a` with all required dependencies.
-
-To build the C++ library packages, you need to build the Java packages first.
-
-```shell
-
-mvn install -DskipTests
-
-```
-
-#### RPM
-
-To build the RPM inside a Docker container, use the command below. The RPMs are in the `pulsar-client-cpp/pkg/rpm/RPMS/x86_64/` path.
-
-```shell
-
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
-
-```
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-devel | Static library `libpulsar.a`, `libpulsarwithdeps.a`and C++ and C headers |
-| pulsar-client-debuginfo | Debug symbols for `libpulsar.so` |
-
-#### Debian
-
-To build Debian packages, enter the following command.
-
-```shell
-
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
-
-```
-
-Debian packages are created in the `pulsar-client-cpp/pkg/deb/BUILD/DEB/` path.
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-dev | Static library `libpulsar.a`, `libpulsarwithdeps.a` and C++ and C headers |
-
-## MacOS
-
-### Compilation
-
-1. Clone the Pulsar repository.
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-
-```
-
-2. Install all necessary dependencies.
-
-```shell
-
-# OpenSSL installation
-$ brew install openssl
-$ export OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/
-$ export OPENSSL_ROOT_DIR=/usr/local/opt/openssl/
-
-# Protocol Buffers installation
-$ brew install protobuf boost boost-python log4cxx
-# If you are using python3, you need to install boost-python3 
-
-# Google Test installation
-$ git clone https://github.com/google/googletest.git
-$ cd googletest
-$ git checkout release-1.12.1
-$ cmake .
-$ make install
-
-```
-
-3. Compile the Pulsar client library in the repository that you cloned.
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
-### Install `libpulsar`
-
-Pulsar releases are available in the [Homebrew](https://brew.sh/) core repository. You can install the C++ client library with the following command. The package is installed with the library and headers.
-
-```shell
-
-brew install libpulsar
+
+
 
+```bash
+wget @pulsar:dist_rpm:client-debuginfo@
 ```
 
-## Windows (64-bit)
-
-### Compilation
-
-1. Clone the Pulsar repository.
+This package contains debug symbols for `libpulsar.so`.
 
-```shell
-
-$ git clone https://github.com/apache/pulsar
+
+
 
+```bash
+wget @pulsar:dist_rpm:client-devel@
 ```
 
-2. Install all necessary dependencies.
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-```shell
+
+
 
-cd ${PULSAR_HOME}/pulsar-client-cpp
-vcpkg install --feature-flags=manifests --triplet x64-windows
+2. Install the package using the following command:
 
+```bash
+rpm -ivh apache-pulsar-client*.rpm
 ```
 
-3. Build C++ libraries.
-
-```shell
-
-cmake -B ./build -A x64 -DBUILD_PYTHON_WRAPPER=OFF -DBUILD_TESTS=OFF -DVCPKG_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=Release -S .
-cmake --build ./build --config Release
-
-```
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-> **NOTE**
->
-> 1. For Windows 32-bit, you need to use `-A Win32` and `-DVCPKG_TRIPLET=x86-windows`.
-> 2. For MSVC Debug mode, you need to replace `Release` with `Debug` for both `CMAKE_BUILD_TYPE` variable and `--config` option.
+:::note
 
-4. Client libraries are available in the following places.
+If you get an error like "libpulsar.so: cannot open shared object file: No such file or directory" when starting a Pulsar client, you need to run `ldconfig` first.
 
-```
+:::
 
-${PULSAR_HOME}/pulsar-client-cpp/build/lib/Release/pulsar.lib
-${PULSAR_HOME}/pulsar-client-cpp/build/lib/Release/pulsar.dll
+### Source
 
-```
+For how to build Pulsar C++ client on different platforms from source code, see [compliation](https://github.com/apache/pulsar-client-cpp#compilation).
 
 ## Connection URLs
 
@@ -353,7 +123,7 @@ pulsar://localhost:6650
 
 ```
 
-In a Pulsar cluster in production, the URL looks as follows. 
+In a Pulsar cluster in production, the URL looks as follows.
 
 ```http
 
@@ -504,7 +274,7 @@ producerConf.setLazyStartPartitionedProducers(true);
 
 ### Enable chunking
 
-Message [chunking](concepts-messaging.md#chunking) enables Pulsar to process large payload messages by splitting the message into chunks at the producer side and aggregating chunked messages at the consumer side. 
+Message [chunking](concepts-messaging.md#chunking) enables Pulsar to process large payload messages by splitting the message into chunks at the producer side and aggregating chunked messages at the consumer side.
 
 The message chunking feature is OFF by default. The following is an example about how to enable message chunking when creating a producer.
 
@@ -624,7 +394,7 @@ int main() {
 
 ### Configure chunking
 
-You can limit the maximum number of chunked messages a consumer maintains concurrently by configuring the `setMaxPendingChunkedMessage` and `setAutoAckOldestChunkedMessageOnQueueFull` parameters. When the threshold is reached, the consumer drops pending messages by silently acknowledging them or asking the broker to redeliver them later. 
+You can limit the maximum number of chunked messages a consumer maintains concurrently by configuring the `setMaxPendingChunkedMessage` and `setAutoAckOldestChunkedMessageOnQueueFull` parameters. When the threshold is reached, the consumer drops pending messages by silently acknowledging them or asking the broker to redeliver them later.
 
 The following is an example of how to configure message chunking.
 
@@ -654,7 +424,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
@@ -666,7 +436,7 @@ schema, see [Pulsar schema](schema-get-started.md).
 - The following example shows how to create a producer with an Avro schema.
 
   ```cpp
-  
+
   static const std::string exampleSchema =
       "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
       "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
@@ -674,13 +444,13 @@ schema, see [Pulsar schema](schema-get-started.md).
   ProducerConfiguration producerConf;
   producerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
   client.createProducer("topic-avro", producerConf, producer);
-  
+
   ```
 
 - The following example shows how to create a consumer with an Avro schema.
 
   ```cpp
-  
+
   static const std::string exampleSchema =
       "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
       "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
@@ -688,14 +458,14 @@ schema, see [Pulsar schema](schema-get-started.md).
   Consumer consumer;
   consumerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
   client.subscribe("topic-avro", "sub-2", consumerConf, consumer)
-  
+
   ```
 
 ### ProtobufNative schema
 
 The following example shows how to create a producer and a consumer with a ProtobufNative schema.
 ​
-1. Generate the `User` class using Protobuf3. 
+1. Generate the `User` class using Protobuf3.
 
    :::note
 
@@ -706,14 +476,14 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```protobuf
-   
+
    syntax = "proto3";
-   
+
    message User {
        string name = 1;
        int32 age = 2;
    }
-   
+
    ```
 
 ​
@@ -721,9 +491,9 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```cpp
-   
+
    #include 
-   
+
    ```
 
 ​
@@ -731,7 +501,7 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```cpp
-   
+
    ProducerConfiguration producerConf;
    producerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
    Producer producer;
@@ -742,7 +512,7 @@ The following example shows how to create a producer and a consumer with a Proto
    std::string content;
    user.SerializeToString(&content);
    producer.send(MessageBuilder().setContent(content).build());
-   
+
    ```
 
 ​
@@ -750,7 +520,7 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```cpp
-   
+
    ConsumerConfiguration consumerConf;
    consumerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
    consumerConf.setSubscriptionInitialPosition(InitialPositionEarliest);
@@ -760,6 +530,6 @@ The following example shows how to create a producer and a consumer with a Proto
    consumer.receive(msg);
    User user2;
    user2.ParseFromArray(msg.getData(), msg.getLength());
-   
+
    ```
 
diff --git a/site2/website/versioned_docs/version-2.10.x/client-libraries-python.md b/site2/website/versioned_docs/version-2.10.x/client-libraries-python.md
index b607be00e54c6..9cc87de872fee 100644
--- a/site2/website/versioned_docs/version-2.10.x/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.10.x/client-libraries-python.md
@@ -11,15 +11,15 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [Python directory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [Python directory](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
-You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp).
+You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar-client-cpp).
 
 ### Install using pip
 
@@ -70,7 +70,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [(@pulsar:apidoc:python@)](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.10.x/client-libraries.md b/site2/website/versioned_docs/version-2.10.x/client-libraries.md
index 6cdc1e615c81f..d3c49b27e771a 100644
--- a/site2/website/versioned_docs/version-2.10.x/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.10.x/client-libraries.md
@@ -7,15 +7,15 @@ original_id: client-libraries
 
 Pulsar supports the following client libraries:
 
-|Language|Documentation|Release note|Code repo
-|---|---|---|---
-Java |- [User doc](client-libraries-java.md) 

    - [API doc](/api/client/)|[Here](/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](/api/cpp/)|[Here](/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](/api/python/)|[Here](/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
-WebSocket| [User doc](client-libraries-websocket.md) | [Here](/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
-Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
-Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
-C# |[User doc](client-libraries-dotnet.md)| [Here](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG)|[Here](https://github.com/apache/pulsar-dotpulsar) 
+| Language  | Documentation                                                                            | Release note                                                             | Code repo                                                             |
+|-----------|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------|
+| Java      | - [User doc](client-libraries-java.md) 

    - [API doc](/api/client/)             | [Here](/release-notes/)                                                  | [Here](https://github.com/apache/pulsar/tree/master/pulsar-client)    |
+| C++       | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)       | [Here](/release-notes/)                                                  | [Here](https://github.com/apache/pulsar-client-cpp)                   |
+| Python    | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@) | [Here](/release-notes/)                                                  | [Here](https://github.com/apache/pulsar-client-python)                |
+| WebSocket | [User doc](client-libraries-websocket.md)                                                | [Here](/release-notes/)                                                  | [Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) |
+| Go client | [User doc](client-libraries-go.md)                                                       | [Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) | [Here](https://github.com/apache/pulsar-client-go)                    |
+| Node.js   | [User doc](client-libraries-node.md)                                                     | [Here](https://github.com/apache/pulsar-client-node/releases)            | [Here](https://github.com/apache/pulsar-client-node)                  |
+| C#        | [User doc](client-libraries-dotnet.md)                                                   | [Here](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG) | [Here](https://github.com/apache/pulsar-dotpulsar)                    |
 
 :::note
 
diff --git a/site2/website/versioned_docs/version-2.10.x/concepts-messaging.md b/site2/website/versioned_docs/version-2.10.x/concepts-messaging.md
index 84e31b8f68998..adb7687df96cf 100644
--- a/site2/website/versioned_docs/version-2.10.x/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.10.x/concepts-messaging.md
@@ -263,14 +263,15 @@ The message redelivery behavior should be as follows.
 
 Redelivery count | Redelivery delay
 :--------------------|:-----------
-1 | 10 + 1 seconds
-2 | 10 + 2 seconds
-3 | 10 + 4 seconds
-4 | 10 + 8 seconds
-5 | 10 + 16 seconds
-6 | 10 + 32 seconds
-7 | 10 + 60 seconds
-8 | 10 + 60 seconds
+1 | 1 seconds
+2 | 2 seconds
+3 | 4 seconds
+4 | 8 seconds
+5 | 16 seconds
+6 | 32 seconds
+7 | 60 seconds
+8 | 60 seconds
+
 :::note
 
 If batching is enabled, all messages in one batch are redelivered to the consumer.
diff --git a/site2/website/versioned_docs/version-2.10.x/deploy-bare-metal.md b/site2/website/versioned_docs/version-2.10.x/deploy-bare-metal.md
index 25dc04458613b..86e86d9255934 100644
--- a/site2/website/versioned_docs/version-2.10.x/deploy-bare-metal.md
+++ b/site2/website/versioned_docs/version-2.10.x/deploy-bare-metal.md
@@ -271,8 +271,8 @@ You can initialize this metadata using the [`initialize-cluster-metadata`](refer
 
 $ bin/pulsar initialize-cluster-metadata \
   --cluster pulsar-cluster-1 \
-  --metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
-  --configuration-metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181/my-chroot-path \
+  --metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181 \
+  --configuration-metadata-store zk:zk1.us-west.example.com:2181,zk2.us-west.example.com:2181 \
   --web-service-url http://pulsar.us-west.example.com:8080 \
   --web-service-url-tls https://pulsar.us-west.example.com:8443 \
   --broker-service-url pulsar://pulsar.us-west.example.com:6650 \
@@ -386,8 +386,8 @@ The most important element of broker configuration is ensuring that each broker
 
 ```properties
 
-metadataStoreUrl=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
-configurationMetadataStoreUrl=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
+metadataStoreUrl=zk://zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
+configurationMetadataStoreUrl=zk://zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
 
 ```
 
diff --git a/site2/website/versioned_docs/version-2.10.x/helm-deploy.md b/site2/website/versioned_docs/version-2.10.x/helm-deploy.md
index 0e7815e4f4d90..c047763bd3b4b 100644
--- a/site2/website/versioned_docs/version-2.10.x/helm-deploy.md
+++ b/site2/website/versioned_docs/version-2.10.x/helm-deploy.md
@@ -153,38 +153,38 @@ The Pulsar Helm chart is designed to enable controlled upgrades. So it can confi
 images:
   zookeeper:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   bookie:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   autorecovery:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   broker:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   proxy:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   functions:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
   prometheus:
     repository: prom/prometheus
-    tag: v1.6.3
+    tag: v2.17.2
     pullPolicy: IfNotPresent
   grafana:
     repository: streamnative/apache-pulsar-grafana-dashboard-k8s
-    tag: 0.0.4
+    tag: 0.0.16
     pullPolicy: IfNotPresent
   pulsar_manager:
     repository: apachepulsar/pulsar-manager
-    tag: v0.1.0
+    tag: v0.3.0
     pullPolicy: IfNotPresent
     hasCommand: false
 
diff --git a/site2/website/versioned_docs/version-2.10.x/standalone.md b/site2/website/versioned_docs/version-2.10.x/standalone.md
index e279db20486ff..c07b825294482 100644
--- a/site2/website/versioned_docs/version-2.10.x/standalone.md
+++ b/site2/website/versioned_docs/version-2.10.x/standalone.md
@@ -6,7 +6,8 @@ original_id: standalone
 ---
 
 ````mdx-code-block
-import {Redirect} from '@docusaurus/router';
+import useLocationParentPath from '@site/src/libs/useLocationParentPath';
+import {Redirect} from "@docusaurus/router";
 
-
+
 ````
diff --git a/site2/website/versioned_docs/version-2.2.0/client-libraries-python.md b/site2/website/versioned_docs/version-2.2.0/client-libraries-python.md
index 9de991d4d23a1..46bcb2c190a7d 100644
--- a/site2/website/versioned_docs/version-2.2.0/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.2.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.2.0/client-libraries.md b/site2/website/versioned_docs/version-2.2.0/client-libraries.md
index a86194d2aabc6..e4bb3980f38a6 100644
--- a/site2/website/versioned_docs/version-2.2.0/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.2.0/client-libraries.md
@@ -32,13 +32,13 @@ For a tutorial on using the Pulsar Go client, see [The Pulsar Go client](client-
 
 For a tutorial on using the Pulsar Python client, see [The Pulsar Python client](client-libraries-python.md).
 
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](/api/python).
+There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](@pulsar:apidoc:python@).
 
 ## C++ client
 
 For a tutorial on using the Pulsar C++ clent, see [The Pulsar C++ client](client-libraries-cpp.md).
 
-There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API docs for the C++ client [here](/api/cpp).
+There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API docs for the C++ client [here](@pulsar:apidoc:cpp@).
 
 ## Feature Matrix
 
diff --git a/site2/website/versioned_docs/version-2.2.0/functions-api.md b/site2/website/versioned_docs/version-2.2.0/functions-api.md
index c0c25f9e8a825..4708ed364856b 100644
--- a/site2/website/versioned_docs/version-2.2.0/functions-api.md
+++ b/site2/website/versioned_docs/version-2.2.0/functions-api.md
@@ -600,7 +600,7 @@ There is one example Python native function in this {@inject: github:folder:/pul
 
 ### Python SDK functions
 
-To get started developing Pulsar Functions using the Python SDK, you'll need to install the [`pulsar-client`](/api/python) library using the instructions [above](#getting-started).
+To get started developing Pulsar Functions using the Python SDK, you'll need to install the [`pulsar-client`](@pulsar:apidoc:python@) library using the instructions [above](#getting-started).
 
 #### Python SDK examples
 
diff --git a/site2/website/versioned_docs/version-2.2.1/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.2.1/client-libraries-cpp.md
index b709463ff0309..dd4ae20137d5a 100644
--- a/site2/website/versioned_docs/version-2.2.1/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.2.1/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
@@ -656,7 +656,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.2.1/client-libraries-python.md b/site2/website/versioned_docs/version-2.2.1/client-libraries-python.md
index 7ed649e86096a..46cffc58070ec 100644
--- a/site2/website/versioned_docs/version-2.2.1/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.2.1/client-libraries-python.md
@@ -10,15 +10,15 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [Python directory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [Python directory](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
-You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp).
+You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar-client-cpp).
 
 ### Install using pip
 
@@ -70,7 +70,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.2.1/client-libraries.md b/site2/website/versioned_docs/version-2.2.1/client-libraries.md
index 8f91dfbbbdd8c..2ab7b9bfee27b 100644
--- a/site2/website/versioned_docs/version-2.2.1/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.2.1/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) 

    - [API doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
+C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp) 
+Python | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python) 
 WebSocket| [User doc](client-libraries-websocket.md) | [Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
 Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website/versioned_docs/version-2.3.0/client-libraries-python.md b/site2/website/versioned_docs/version-2.3.0/client-libraries-python.md
index f0a8f92304ff4..6c7f8f0fde8fc 100644
--- a/site2/website/versioned_docs/version-2.3.0/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.3.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.3.0/client-libraries.md b/site2/website/versioned_docs/version-2.3.0/client-libraries.md
index 8f91dfbbbdd8c..2ab7b9bfee27b 100644
--- a/site2/website/versioned_docs/version-2.3.0/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.3.0/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) 

    - [API doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
+C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp) 
+Python | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python) 
 WebSocket| [User doc](client-libraries-websocket.md) | [Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
 Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website/versioned_docs/version-2.3.1/client-libraries-python.md b/site2/website/versioned_docs/version-2.3.1/client-libraries-python.md
index 775c3e7eb0820..4ef63be0748b0 100644
--- a/site2/website/versioned_docs/version-2.3.1/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.3.1/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.3.1/client-libraries.md b/site2/website/versioned_docs/version-2.3.1/client-libraries.md
index 8f91dfbbbdd8c..2ab7b9bfee27b 100644
--- a/site2/website/versioned_docs/version-2.3.1/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.3.1/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) 

    - [API doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
+C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp) 
+Python | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python) 
 WebSocket| [User doc](client-libraries-websocket.md) | [Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
 Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website/versioned_docs/version-2.3.2/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.3.2/client-libraries-cpp.md
index b709463ff0309..dd4ae20137d5a 100644
--- a/site2/website/versioned_docs/version-2.3.2/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.3.2/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
@@ -656,7 +656,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.3.2/client-libraries-python.md b/site2/website/versioned_docs/version-2.3.2/client-libraries-python.md
index 7ed649e86096a..46cffc58070ec 100644
--- a/site2/website/versioned_docs/version-2.3.2/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.3.2/client-libraries-python.md
@@ -10,15 +10,15 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [Python directory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [Python directory](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
-You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp).
+You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar-client-cpp).
 
 ### Install using pip
 
@@ -70,7 +70,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.3.2/client-libraries.md b/site2/website/versioned_docs/version-2.3.2/client-libraries.md
index b6ca97de9cad9..8887f1628d6fa 100644
--- a/site2/website/versioned_docs/version-2.3.2/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.3.2/client-libraries.md
@@ -33,13 +33,13 @@ For a tutorial on using the Pulsar Go client, see [Pulsar Go client](client-libr
 
 For a tutorial on using the Pulsar Python client, see [Pulsar Python client](client-libraries-python.md).
 
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](/api/python).
+There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](@pulsar:apidoc:python@).
 
 ## C++ client
 
 For a tutorial on using the Pulsar C++ clent, see [Pulsar C++ client](client-libraries-cpp.md).
 
-There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API docs for the C++ client [here](/api/cpp).
+There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API docs for the C++ client [here](@pulsar:apidoc:cpp@).
 
 ## Feature Matrix
 Pulsar client feature matrix for different languages is listed on [Client Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) page.
diff --git a/site2/website/versioned_docs/version-2.4.0/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.4.0/client-libraries-cpp.md
index b709463ff0309..dd4ae20137d5a 100644
--- a/site2/website/versioned_docs/version-2.4.0/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.4.0/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
@@ -656,7 +656,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.4.0/client-libraries-python.md b/site2/website/versioned_docs/version-2.4.0/client-libraries-python.md
index f61cedffe967b..1b36e97a80613 100644
--- a/site2/website/versioned_docs/version-2.4.0/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.4.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.4.0/client-libraries.md b/site2/website/versioned_docs/version-2.4.0/client-libraries.md
index 8f91dfbbbdd8c..2ab7b9bfee27b 100644
--- a/site2/website/versioned_docs/version-2.4.0/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.4.0/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) 

    - [API doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
+C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp) 
+Python | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python) 
 WebSocket| [User doc](client-libraries-websocket.md) | [Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
 Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website/versioned_docs/version-2.4.0/functions-api.md b/site2/website/versioned_docs/version-2.4.0/functions-api.md
index 6409c0556285c..d36f20409673d 100644
--- a/site2/website/versioned_docs/version-2.4.0/functions-api.md
+++ b/site2/website/versioned_docs/version-2.4.0/functions-api.md
@@ -607,7 +607,7 @@ There is one example Python native function in this {@inject: github:folder:/pul
 
 ### Python SDK functions
 
-To get started developing Pulsar Functions using the Python SDK, you'll need to install the [`pulsar-client`](/api/python) library using the instructions [above](#getting-started).
+To get started developing Pulsar Functions using the Python SDK, you'll need to install the [`pulsar-client`](@pulsar:apidoc:python@) library using the instructions [above](#getting-started).
 
 #### Python SDK examples
 
diff --git a/site2/website/versioned_docs/version-2.4.1/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.4.1/client-libraries-cpp.md
index b709463ff0309..dd4ae20137d5a 100644
--- a/site2/website/versioned_docs/version-2.4.1/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.4.1/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
@@ -656,7 +656,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.4.1/client-libraries-python.md b/site2/website/versioned_docs/version-2.4.1/client-libraries-python.md
index 3f52095b3c4bc..22a87af6b6e89 100644
--- a/site2/website/versioned_docs/version-2.4.1/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.4.1/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.4.1/client-libraries.md b/site2/website/versioned_docs/version-2.4.1/client-libraries.md
index 8f91dfbbbdd8c..2ab7b9bfee27b 100644
--- a/site2/website/versioned_docs/version-2.4.1/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.4.1/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) 

    - [API doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
+C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp) 
+Python | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python) 
 WebSocket| [User doc](client-libraries-websocket.md) | [Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
 Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website/versioned_docs/version-2.4.2/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.4.2/client-libraries-cpp.md
index b709463ff0309..dd4ae20137d5a 100644
--- a/site2/website/versioned_docs/version-2.4.2/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.4.2/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
@@ -656,7 +656,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.4.2/client-libraries-python.md b/site2/website/versioned_docs/version-2.4.2/client-libraries-python.md
index 3f52095b3c4bc..22a87af6b6e89 100644
--- a/site2/website/versioned_docs/version-2.4.2/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.4.2/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.4.2/client-libraries.md b/site2/website/versioned_docs/version-2.4.2/client-libraries.md
index 8f91dfbbbdd8c..2ab7b9bfee27b 100644
--- a/site2/website/versioned_docs/version-2.4.2/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.4.2/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) 

    - [API doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client) 
-C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp) 
-Python | - [User doc](client-libraries-python.md) 

    - [API doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) 
+C++ | - [User doc](client-libraries-cpp.md) 

    - [API doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp) 
+Python | - [User doc](client-libraries-python.md) 

    - [API doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python) 
 WebSocket| [User doc](client-libraries-websocket.md) | [Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) 
 Go client|[User doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases) |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website/versioned_docs/version-2.5.0/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.5.0/client-libraries-cpp.md
index bbc74dbb31eab..c8c26ddd89a05 100644
--- a/site2/website/versioned_docs/version-2.5.0/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.5.0/client-libraries-cpp.md
@@ -203,7 +203,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.5.0/client-libraries-python.md b/site2/website/versioned_docs/version-2.5.0/client-libraries-python.md
index d804344562f5f..dd200c4906955 100644
--- a/site2/website/versioned_docs/version-2.5.0/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.5.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.5.0/client-libraries.md b/site2/website/versioned_docs/version-2.5.0/client-libraries.md
index 7bb8611208d5c..6fb205bd86bc3 100644
--- a/site2/website/versioned_docs/version-2.5.0/client-libraries.md
+++ b/site2/website/versioned_docs/version-2.5.0/client-libraries.md
@@ -33,13 +33,13 @@ For a tutorial on using the Pulsar Go client, see [Pulsar Go client](client-libr
 
 For a tutorial on using the Pulsar Python client, see [Pulsar Python client](client-libraries-python.md).
 
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](/api/python).
+There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](@pulsar:apidoc:python@).
 
 ## C++ client
 
 For a tutorial on using the Pulsar C++ clent, see [Pulsar C++ client](client-libraries-cpp.md).
 
-There are also [Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client [here](/api/cpp).
+There are also [Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client [here](@pulsar:apidoc:cpp@).
 
 ## Feature Matrix
 Pulsar client feature matrix for different languages is listed on [Client Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) page.
diff --git a/site2/website/versioned_docs/version-2.5.1/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.5.1/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.5.1/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.5.1/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.5.1/client-libraries-python.md b/site2/website/versioned_docs/version-2.5.1/client-libraries-python.md
index 5435a6a99a046..47bf6a6ead68e 100644
--- a/site2/website/versioned_docs/version-2.5.1/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.5.1/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.5.2/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.5.2/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.5.2/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.5.2/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.5.2/client-libraries-python.md b/site2/website/versioned_docs/version-2.5.2/client-libraries-python.md
index 5435a6a99a046..47bf6a6ead68e 100644
--- a/site2/website/versioned_docs/version-2.5.2/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.5.2/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.6.0/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.6.0/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.6.0/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.6.0/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.6.0/client-libraries-python.md b/site2/website/versioned_docs/version-2.6.0/client-libraries-python.md
index 5435a6a99a046..47bf6a6ead68e 100644
--- a/site2/website/versioned_docs/version-2.6.0/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.6.0/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.6.1/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.6.1/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.6.1/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.6.1/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.6.1/client-libraries-python.md b/site2/website/versioned_docs/version-2.6.1/client-libraries-python.md
index 6d4c7e6a77888..29ad2697c7ca2 100644
--- a/site2/website/versioned_docs/version-2.6.1/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.6.1/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.6.2/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.6.2/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.6.2/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.6.2/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.6.2/client-libraries-python.md b/site2/website/versioned_docs/version-2.6.2/client-libraries-python.md
index 6d4c7e6a77888..29ad2697c7ca2 100644
--- a/site2/website/versioned_docs/version-2.6.2/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.6.2/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.6.3/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.6.3/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.6.3/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.6.3/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.6.3/client-libraries-python.md b/site2/website/versioned_docs/version-2.6.3/client-libraries-python.md
index 6d4c7e6a77888..29ad2697c7ca2 100644
--- a/site2/website/versioned_docs/version-2.6.3/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.6.3/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.6.4/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.6.4/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.6.4/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.6.4/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.6.4/client-libraries-python.md b/site2/website/versioned_docs/version-2.6.4/client-libraries-python.md
index 6d4c7e6a77888..29ad2697c7ca2 100644
--- a/site2/website/versioned_docs/version-2.6.4/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.6.4/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.7.0/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.7.0/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.7.0/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.7.0/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.7.0/client-libraries-python.md b/site2/website/versioned_docs/version-2.7.0/client-libraries-python.md
index 5435a6a99a046..47bf6a6ead68e 100644
--- a/site2/website/versioned_docs/version-2.7.0/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.7.0/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.7.1/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.7.1/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.7.1/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.7.1/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.7.1/client-libraries-python.md b/site2/website/versioned_docs/version-2.7.1/client-libraries-python.md
index b2c401049705f..e94ab0d219a7f 100644
--- a/site2/website/versioned_docs/version-2.7.1/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.7.1/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.7.2/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.7.2/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.7.2/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.7.2/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.7.2/client-libraries-python.md b/site2/website/versioned_docs/version-2.7.2/client-libraries-python.md
index e7ea7f01813f8..6a44038574cec 100644
--- a/site2/website/versioned_docs/version-2.7.2/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.7.2/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.7.3/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.7.3/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.7.3/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.7.3/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.7.3/client-libraries-python.md b/site2/website/versioned_docs/version-2.7.3/client-libraries-python.md
index e7ea7f01813f8..6a44038574cec 100644
--- a/site2/website/versioned_docs/version-2.7.3/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.7.3/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.7.4/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.7.4/client-libraries-cpp.md
index 684df5fd2d825..7037b122be64e 100644
--- a/site2/website/versioned_docs/version-2.7.4/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.7.4/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
@@ -257,7 +257,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.7.4/client-libraries-python.md b/site2/website/versioned_docs/version-2.7.4/client-libraries-python.md
index e7ea7f01813f8..6a44038574cec 100644
--- a/site2/website/versioned_docs/version-2.7.4/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.7.4/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.7.5/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.7.5/client-libraries-cpp.md
index 684df5fd2d825..bebb4b9411386 100644
--- a/site2/website/versioned_docs/version-2.7.5/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.7.5/client-libraries-cpp.md
@@ -5,161 +5,111 @@ sidebar_label: "C++"
 original_id: client-libraries-cpp
 ---
 
-You can use Pulsar C++ client to create Pulsar producers and consumers in C++.
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
 
-All the methods in producer, consumer, and reader of a C++ client are thread-safe.
+You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-## Supported platforms
+All the methods in producer, consumer, and reader of a C++ client are thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ client.
 
-Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
+## Installation
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+Use one of the following methods to install a Pulsar C++ client.
 
-## Linux
+### Brew
 
-> Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can download and install those packages directly.
-
-Four kind of libraries `libpulsar.so` / `libpulsarnossl.so` / `libpulsar.a` / `libpulsarwithdeps.a` are included in your `/usr/lib` after rpm/deb download and install.
-By default, they are build under code path `${PULSAR_HOME}/pulsar-client-cpp`, using command
- `cmake . -DBUILD_TESTS=OFF -DLINK_STATIC=ON && make pulsarShared pulsarSharedNossl pulsarStatic pulsarStaticWithDeps -j 3`
-These libraries rely on some other libraries, if you want to get detailed version of dependencies libraries, please reference [these](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/rpm/Dockerfile) [files](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/deb/Dockerfile).
-
-1. `libpulsar.so` is the Shared library, it contains statically linked `boost` and `openssl`, and will also dynamically link all other needed libraries.
-The command the when use this pulsar library is like this:
-
-```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.so -I/usr/local/ssl/include
-
-```
-
-2. `libpulsarnossl.so` is the Shared library that similar to `libpulsar.so` except that the library `openssl` and `crypto` are dynamically linked.
-The command the when use this pulsar library is like this:
+Use [Homebrew](http://brew.sh/) to install the latest tagged version with the library and headers:
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarnossl.so -lssl -lcrypto -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
+brew install libpulsar
 ```
 
-3. `libpulsar.a` is the Static library, it need to load some dependencies library when using it. 
-The command the when use this pulsar library is like this:
-
-```bash
+### Deb
 
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib -lboost_system -lboost_regex -lcurl -lprotobuf -lzstd -lz
-
-```
+1. Download any one of the Deb packages:
 
-4. `libpulsarwithdeps.a` is the Static library, base on `libpulsar.a`, and archived in the dependencies libraries of `libboost_regex`,  `libboost_system`, `libcurl`, `libprotobuf`, `libzstd` and `libz`, 
-The command the when use this pulsar library is like this:
+
+
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarwithdeps.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
+wget @pulsar:deb:client@
 ```
 
-`libpulsarwithdeps.a` does not include library openssl related libraries: `libssl` and `libcrypto`, because these 2 library is related to security, 
-by using user local system provided version is more reasonable, and more easy for user to handling security issue and library upgrade.
-
-### Install RPM
-
-1. Download a RPM package from the links in the table. 
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:dist_rpm:client@) | [asc](@pulsar:dist_rpm:client@.asc), [sha512](@pulsar:dist_rpm:client@.sha512) |
-| [client-debuginfo](@pulsar:dist_rpm:client-debuginfo@) | [asc](@pulsar:dist_rpm:client-debuginfo@.asc),  [sha512](@pulsar:dist_rpm:client-debuginfo@.sha512) |
-| [client-devel](@pulsar:dist_rpm:client-devel@) | [asc](@pulsar:dist_rpm:client-devel@.asc),  [sha512](@pulsar:dist_rpm:client-devel@.sha512) |
+This package contains shared libraries `libpulsar.so` and `libpulsarnossl.so`.
 
-2. Install the package using the following command.
+
+
 
 ```bash
-
-$ rpm -ivh apache-pulsar-client*.rpm
-
+wget @pulsar:deb:client-devel@
 ```
 
-After install, Pulsar libraries will be placed under `/usr/lib`.
-
-### Install Debian
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-1. Download a Debian package from the links in the table. 
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:deb:client@) | [asc](@pulsar:dist_deb:client@.asc), [sha512](@pulsar:dist_deb:client@.sha512) |
-| [client-devel](@pulsar:deb:client-devel@) | [asc](@pulsar:dist_deb:client-devel@.asc),  [sha512](@pulsar:dist_deb:client-devel@.sha512) |
+
+
 
 2. Install the package using the following command:
 
 ```bash
-
-$ apt install ./apache-pulsar-client*.deb
-
+apt install ./apache-pulsar-client*.deb
 ```
 
-After install, Pulsar libraries will be placed under `/usr/lib`.
-
-### Build
-
-> If you want to build RPM and Debian packages from the latest master, follow the instructions below. All the instructions are run at the root directory of your cloned Pulsar repository.
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-There are recipes that build RPM and Debian packages containing a
-statically linked `libpulsar.so` / `libpulsarnossl.so` / `libpulsar.a` / `libpulsarwithdeps.a` with all the required
-dependencies.
+### RPM
 
-To build the C++ library packages, build the Java packages first.
+1. Download any one of the RPM packages:
 
-```shell
-
-mvn install -DskipTests
+
+
 
+```bash
+wget @pulsar:dist_rpm:client@
 ```
 
-#### RPM
+This package contains shared libraries: `libpulsar.so` and `libpulsarnossl.so`.
 
-```shell
-
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
+
+
 
+```bash
+wget @pulsar:dist_rpm:client-debuginfo@
 ```
 
-This builds the RPM inside a Docker container and it leaves the RPMs in `pulsar-client-cpp/pkg/rpm/RPMS/x86_64/`.
+This package contains debug symbols for `libpulsar.so`.
 
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-devel | Static library `libpulsar.a`, `libpulsarwithdeps.a`and C++ and C headers |
-| pulsar-client-debuginfo | Debug symbols for `libpulsar.so` |
+
+
 
-#### Debian
+```bash
+wget @pulsar:dist_rpm:client-devel@
+```
 
-To build Debian packages, enter the following command.
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-```shell
+
+
 
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
+2. Install the package using the following command:
 
+```bash
+rpm -ivh apache-pulsar-client*.rpm
 ```
 
-Debian packages are created at `pulsar-client-cpp/pkg/deb/BUILD/DEB/`.
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-dev | Static library `libpulsar.a`, `libpulsarwithdeps.a` and C++ and C headers |
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-## MacOS
+:::note
 
-Pulsar releases are available in the [Homebrew](https://brew.sh/) core repository. You can install the C++ client library with the following command. The package is installed with the library and headers.
+If you get an error like "libpulsar.so: cannot open shared object file: No such file or directory" when starting a Pulsar client, you need to run `ldconfig` first.
 
-```shell
+:::
 
-brew install libpulsar
+### Source
 
-```
+For how to build Pulsar C++ client on different platforms from source code, see [compliation](https://github.com/apache/pulsar-client-cpp#compilation).
 
 ## Connection URLs
 
@@ -173,7 +123,7 @@ pulsar://localhost:6650
 
 ```
 
-In a Pulsar cluster in production, the URL looks as follows: 
+In a Pulsar cluster in production, the URL looks as follows:
 
 ```http
 
@@ -190,7 +140,7 @@ pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
 ## Create a consumer
-To connect to Pulsar as a consumer, you need to create a consumer on the C++ client. The following is an example. 
+To connect to Pulsar as a consumer, you need to create a consumer on the C++ client. The following is an example.
 
 ```c++
 
@@ -218,7 +168,7 @@ client.close();
 ```
 
 ## Create a producer
-To connect to Pulsar as a producer, you need to create a producer on the C++ client. The following is an example. 
+To connect to Pulsar as a producer, you need to create a producer on the C++ client. The following is an example.
 
 ```c++
 
@@ -257,7 +207,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.7.5/client-libraries-python.md b/site2/website/versioned_docs/version-2.7.5/client-libraries-python.md
index e7ea7f01813f8..6a44038574cec 100644
--- a/site2/website/versioned_docs/version-2.7.5/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.7.5/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.8.x/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.8.x/client-libraries-cpp.md
index 656aae730bada..f6da1402521a5 100644
--- a/site2/website/versioned_docs/version-2.8.x/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.8.x/client-libraries-cpp.md
@@ -5,267 +5,111 @@ sidebar_label: "C++"
 original_id: client-libraries-cpp
 ---
 
-You can use Pulsar C++ client to create Pulsar producers and consumers in C++.
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
 
-All the methods in producer, consumer, and reader of a C++ client are thread-safe.
+You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-## Supported platforms
+All the methods in producer, consumer, and reader of a C++ client are thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ client.
 
-Pulsar C++ client is supported on **Linux** and **macOS** platforms.
+## Installation
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+Use one of the following methods to install a Pulsar C++ client.
 
-## System requirements
+### Brew
 
-You need to install the following components before using the C++ client:
-
-* [CMake](https://cmake.org/)
-* [Boost](http://www.boost.org/)
-* [Protocol Buffers](https://developers.google.com/protocol-buffers/) 2.6
-* [libcurl](https://curl.haxx.se/libcurl/)
-* [Google Test](https://github.com/google/googletest)
-
-## Linux
-
-### Compilation 
-
-1. Clone the Pulsar repository.
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-
-```
-
-2. Install all necessary dependencies.
-
-```shell
-
-$ apt-get install cmake libssl-dev libcurl4-openssl-dev liblog4cxx-dev \
-  libprotobuf-dev protobuf-compiler libboost-all-dev google-mock libgtest-dev libjsoncpp-dev
-
-```
-
-3. Compile and install [Google Test](https://github.com/google/googletest).
-
-```shell
-
-# libgtest-dev version is 1.18.0 or above
-$ cd /usr/src/googletest
-$ sudo cmake .
-$ sudo make
-$ sudo cp ./googlemock/libgmock.a ./googlemock/gtest/libgtest.a /usr/lib/
-
-# less than 1.18.0
-$ cd /usr/src/gtest
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgtest.a /usr/lib
-
-$ cd /usr/src/gmock
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgmock.a /usr/lib
-
-```
-
-4. Compile the Pulsar client library for C++ inside the Pulsar repository.
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
-After you install the components successfully, the files `libpulsar.so` and `libpulsar.a` are in the `lib` folder of the repository. The tools `perfProducer` and `perfConsumer` are in the `perf` directory.
-
-### Install Dependencies
-
-> Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can download and install those packages directly.
-
-After you download and install RPM or DEB, the `libpulsar.so`, `libpulsarnossl.so`, `libpulsar.a`, and `libpulsarwithdeps.a` libraries are in your `/usr/lib` directory.
-
-By default, they are built in code path `${PULSAR_HOME}/pulsar-client-cpp`. You can build with the command below.
-
- `cmake . -DBUILD_TESTS=OFF -DLINK_STATIC=ON && make pulsarShared pulsarSharedNossl pulsarStatic pulsarStaticWithDeps -j 3`.
-
-These libraries rely on some other libraries. If you want to get detailed version of dependencies, see [RPM](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/rpm/Dockerfile) or [DEB](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/deb/Dockerfile) files.
-
-1. `libpulsar.so` is a shared library, containing statically linked `boost` and `openssl`. It also dynamically links all other necessary libraries. You can use this Pulsar library with the command below.
+Use [Homebrew](http://brew.sh/) to install the latest tagged version with the library and headers:
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.so -I/usr/local/ssl/include
-
-```
-
-2. `libpulsarnossl.so` is a shared library, similar to `libpulsar.so` except that the libraries `openssl` and `crypto` are dynamically linked. You can use this Pulsar library with the command below.
-
-```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarnossl.so -lssl -lcrypto -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
+brew install libpulsar
 ```
 
-3. `libpulsar.a` is a static library. You need to load dependencies before using this library. You can use this Pulsar library with the command below.
-
-```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib -lboost_system -lboost_regex -lcurl -lprotobuf -lzstd -lz
+### Deb
 
-```
+1. Download any one of the Deb packages:
 
-4. `libpulsarwithdeps.a` is a static library, based on `libpulsar.a`. It is archived in the dependencies of `libboost_regex`, `libboost_system`, `libcurl`, `libprotobuf`, `libzstd` and `libz`. You can use this Pulsar library with the command below.
+
+
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarwithdeps.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
+wget @pulsar:deb:client@
 ```
 
-The `libpulsarwithdeps.a` does not include library openssl related libraries `libssl` and `libcrypto`, because these two libraries are related to security. It is more reasonable and easier to use the versions provided by the local system to handle security issues and upgrade libraries.
-
-### Install RPM
+This package contains shared libraries `libpulsar.so` and `libpulsarnossl.so`.
 
-1. Download an RPM package from the links in the table. 
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:dist_rpm:client@) | [asc](@pulsar:dist_rpm:client@.asc), [sha512](@pulsar:dist_rpm:client@.sha512) |
-| [client-debuginfo](@pulsar:dist_rpm:client-debuginfo@) | [asc](@pulsar:dist_rpm:client-debuginfo@.asc),  [sha512](@pulsar:dist_rpm:client-debuginfo@.sha512) |
-| [client-devel](@pulsar:dist_rpm:client-devel@) | [asc](@pulsar:dist_rpm:client-devel@.asc),  [sha512](@pulsar:dist_rpm:client-devel@.sha512) |
-
-2. Install the package using the following command.
+
+
 
 ```bash
-
-$ rpm -ivh apache-pulsar-client*.rpm
-
+wget @pulsar:deb:client-devel@
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` directory.
-
-### Install Debian
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-1. Download a Debian package from the links in the table. 
+
+
 
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:deb:client@) | [asc](@pulsar:dist_deb:client@.asc), [sha512](@pulsar:dist_deb:client@.sha512) |
-| [client-devel](@pulsar:deb:client-devel@) | [asc](@pulsar:dist_deb:client-devel@.asc),  [sha512](@pulsar:dist_deb:client-devel@.sha512) |
-
-2. Install the package using the following command.
+2. Install the package using the following command:
 
 ```bash
-
-$ apt install ./apache-pulsar-client*.deb
-
+apt install ./apache-pulsar-client*.deb
 ```
 
-After you install DEB successfully, Pulsar libraries are in the `/usr/lib` directory.
-
-### Build
-
-> If you want to build RPM and Debian packages from the latest master, follow the instructions below. You should run all the instructions at the root directory of your cloned Pulsar repository.
-
-There are recipes that build RPM and Debian packages containing a
-statically linked `libpulsar.so` / `libpulsarnossl.so` / `libpulsar.a` / `libpulsarwithdeps.a` with all required dependencies.
-
-To build the C++ library packages, you need to build the Java packages first.
-
-```shell
-
-mvn install -DskipTests
-
-```
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-#### RPM
+### RPM
 
-To build the RPM inside a Docker container, use the command below. The RPMs are in the `pulsar-client-cpp/pkg/rpm/RPMS/x86_64/` path.
+1. Download any one of the RPM packages:
 
-```shell
-
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
+
+
 
+```bash
+wget @pulsar:dist_rpm:client@
 ```
 
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-devel | Static library `libpulsar.a`, `libpulsarwithdeps.a`and C++ and C headers |
-| pulsar-client-debuginfo | Debug symbols for `libpulsar.so` |
-
-#### Debian
+This package contains shared libraries: `libpulsar.so` and `libpulsarnossl.so`.
 
-To build Debian packages, enter the following command.
-
-```shell
-
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
+
+
 
+```bash
+wget @pulsar:dist_rpm:client-debuginfo@
 ```
 
-Debian packages are created in the `pulsar-client-cpp/pkg/deb/BUILD/DEB/` path.
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-dev | Static library `libpulsar.a`, `libpulsarwithdeps.a` and C++ and C headers |
-
-## MacOS
-
-### Compilation
-
-1. Clone the Pulsar repository.
-
-```shell
+This package contains debug symbols for `libpulsar.so`.
 
-$ git clone https://github.com/apache/pulsar
+
+
 
+```bash
+wget @pulsar:dist_rpm:client-devel@
 ```
 
-2. Install all necessary dependencies.
-
-```shell
-
-# OpenSSL installation
-$ brew install openssl
-$ export OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/
-$ export OPENSSL_ROOT_DIR=/usr/local/opt/openssl/
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-$ brew install protobuf boost boost-python log4cxx
-# If you are using python3, you need to install boost-python3 
+
+
 
-# Google Test installation
-$ git clone https://github.com/google/googletest.git
-$ cd googletest
-$ git checkout release-1.12.1
-$ cmake .
-$ make install
+2. Install the package using the following command:
 
+```bash
+rpm -ivh apache-pulsar-client*.rpm
 ```
 
-3. Compile the Pulsar client library in the repository that you cloned.
-
-```shell
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
+:::note
 
-```
-
-### Install `libpulsar`
+If you get an error like "libpulsar.so: cannot open shared object file: No such file or directory" when starting a Pulsar client, you need to run `ldconfig` first.
 
-Pulsar releases are available in the [Homebrew](https://brew.sh/) core repository. You can install the C++ client library with the following command. The package is installed with the library and headers.
+:::
 
-```shell
+### Source
 
-brew install libpulsar
-
-```
+For how to build Pulsar C++ client on different platforms from source code, see [compliation](https://github.com/apache/pulsar-client-cpp#compilation).
 
 ## Connection URLs
 
@@ -279,7 +123,7 @@ pulsar://localhost:6650
 
 ```
 
-In a Pulsar cluster in production, the URL looks as follows. 
+In a Pulsar cluster in production, the URL looks as follows.
 
 ```http
 
@@ -297,7 +141,7 @@ pulsar+ssl://pulsar.us-west.example.com:6651
 
 ## Create a consumer
 
-To use Pulsar as a consumer, you need to create a consumer on the C++ client. The following is an example. 
+To use Pulsar as a consumer, you need to create a consumer on the C++ client. The following is an example.
 
 ```cpp
 
@@ -326,7 +170,7 @@ client.close();
 
 ## Create a producer
 
-To use Pulsar as a producer, you need to create a producer on the C++ client. The following is an example. 
+To use Pulsar as a producer, you need to create a producer on the C++ client. The following is an example.
 
 ```cpp
 
@@ -365,7 +209,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
diff --git a/site2/website/versioned_docs/version-2.8.x/client-libraries-python.md b/site2/website/versioned_docs/version-2.8.x/client-libraries-python.md
index 394f6d28db2d7..320a8730c8071 100644
--- a/site2/website/versioned_docs/version-2.8.x/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.8.x/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub Repository](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -65,7 +65,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.8.x/helm-deploy.md b/site2/website/versioned_docs/version-2.8.x/helm-deploy.md
index 93709f7091c1e..7df6402e41b3a 100644
--- a/site2/website/versioned_docs/version-2.8.x/helm-deploy.md
+++ b/site2/website/versioned_docs/version-2.8.x/helm-deploy.md
@@ -153,38 +153,38 @@ The Pulsar Helm chart is designed to enable controlled upgrades. So it can confi
 images:
   zookeeper:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   bookie:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   autorecovery:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   broker:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   proxy:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   functions:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
   prometheus:
     repository: prom/prometheus
-    tag: v1.6.3
+    tag: v2.17.2
     pullPolicy: IfNotPresent
   grafana:
     repository: streamnative/apache-pulsar-grafana-dashboard-k8s
-    tag: 0.0.4
+    tag: 0.0.16
     pullPolicy: IfNotPresent
   pulsar_manager:
     repository: apachepulsar/pulsar-manager
-    tag: v0.1.0
+    tag: v0.3.0
     pullPolicy: IfNotPresent
     hasCommand: false
 
diff --git a/site2/website/versioned_docs/version-2.9.x/client-libraries-cpp.md b/site2/website/versioned_docs/version-2.9.x/client-libraries-cpp.md
index bd20cc4ca8063..d1ef13416aebd 100644
--- a/site2/website/versioned_docs/version-2.9.x/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.9.x/client-libraries-cpp.md
@@ -5,318 +5,111 @@ sidebar_label: "C++"
 original_id: client-libraries-cpp
 ---
 
-You can use Pulsar C++ client to create Pulsar producers and consumers in C++.
+````mdx-code-block
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+````
 
-All the methods in producer, consumer, and reader of a C++ client are thread-safe.
+You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-## Supported platforms
+All the methods in producer, consumer, and reader of a C++ client are thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ client.
 
-Pulsar C++ client is supported on **Linux** ,**macOS** and **Windows** platforms.
+## Installation
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+Use one of the following methods to install a Pulsar C++ client.
 
-## System requirements
+### Brew
 
-You need to install the following components before using the C++ client:
-
-* [CMake](https://cmake.org/)
-* [Boost](http://www.boost.org/)
-* [Protocol Buffers](https://developers.google.com/protocol-buffers/) >= 3
-* [libcurl](https://curl.se/libcurl/)
-* [Google Test](https://github.com/google/googletest)
-
-## Linux
-
-### Compilation 
-
-1. Clone the Pulsar repository.
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
+Use [Homebrew](http://brew.sh/) to install the latest tagged version with the library and headers:
 
+```bash
+brew install libpulsar
 ```
 
-2. Install all necessary dependencies.
+### Deb
 
-```shell
+1. Download any one of the Deb packages:
 
-$ apt-get install cmake libssl-dev libcurl4-openssl-dev liblog4cxx-dev \
-  libprotobuf-dev protobuf-compiler libboost-all-dev google-mock libgtest-dev libjsoncpp-dev
+
+
 
+```bash
+wget @pulsar:deb:client@
 ```
 
-3. Compile and install [Google Test](https://github.com/google/googletest).
-
-```shell
-
-# libgtest-dev version is 1.18.0 or above
-$ cd /usr/src/googletest
-$ sudo cmake .
-$ sudo make
-$ sudo cp ./googlemock/libgmock.a ./googlemock/gtest/libgtest.a /usr/lib/
-
-# less than 1.18.0
-$ cd /usr/src/gtest
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgtest.a /usr/lib
+This package contains shared libraries `libpulsar.so` and `libpulsarnossl.so`.
 
-$ cd /usr/src/gmock
-$ sudo cmake .
-$ sudo make
-$ sudo cp libgmock.a /usr/lib
+
+
 
+```bash
+wget @pulsar:deb:client-devel@
 ```
 
-4. Compile the Pulsar client library for C++ inside the Pulsar repository.
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-```shell
+
+
 
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
+2. Install the package using the following command:
 
+```bash
+apt install ./apache-pulsar-client*.deb
 ```
 
-After you install the components successfully, the files `libpulsar.so` and `libpulsar.a` are in the `lib` folder of the repository. The tools `perfProducer` and `perfConsumer` are in the `perf` directory.
-
-### Install Dependencies
-
-> Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can download and install those packages directly.
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
-After you download and install RPM or DEB, the `libpulsar.so`, `libpulsarnossl.so`, `libpulsar.a`, and `libpulsarwithdeps.a` libraries are in your `/usr/lib` directory.
+### RPM
 
-By default, they are built in code path `${PULSAR_HOME}/pulsar-client-cpp`. You can build with the command below.
+1. Download any one of the RPM packages:
 
- `cmake . -DBUILD_TESTS=OFF -DLINK_STATIC=ON && make pulsarShared pulsarSharedNossl pulsarStatic pulsarStaticWithDeps -j 3`.
-
-These libraries rely on some other libraries. If you want to get detailed version of dependencies, see [RPM](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/rpm/Dockerfile) or [DEB](https://github.com/apache/pulsar/blob/master/pulsar-client-cpp/pkg/deb/Dockerfile) files.
-
-1. `libpulsar.so` is a shared library, containing statically linked `boost` and `openssl`. It also dynamically links all other necessary libraries. You can use this Pulsar library with the command below.
+
+
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.so -I/usr/local/ssl/include
-
+wget @pulsar:dist_rpm:client@
 ```
 
-2. `libpulsarnossl.so` is a shared library, similar to `libpulsar.so` except that the libraries `openssl` and `crypto` are dynamically linked. You can use this Pulsar library with the command below.
-
-```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarnossl.so -lssl -lcrypto -I/usr/local/ssl/include -L/usr/local/ssl/lib
-
-```
+This package contains shared libraries: `libpulsar.so` and `libpulsarnossl.so`.
 
-3. `libpulsar.a` is a static library. You need to load dependencies before using this library. You can use this Pulsar library with the command below.
+
+
 
 ```bash
-
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsar.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib -lboost_system -lboost_regex -lcurl -lprotobuf -lzstd -lz
-
+wget @pulsar:dist_rpm:client-debuginfo@
 ```
 
-4. `libpulsarwithdeps.a` is a static library, based on `libpulsar.a`. It is archived in the dependencies of `libboost_regex`, `libboost_system`, `libcurl`, `libprotobuf`, `libzstd` and `libz`. You can use this Pulsar library with the command below.
-
-```bash
+This package contains debug symbols for `libpulsar.so`.
 
- g++ --std=c++11  PulsarTest.cpp -o test /usr/lib/libpulsarwithdeps.a -lssl -lcrypto -ldl -lpthread  -I/usr/local/ssl/include -L/usr/local/ssl/lib
+
+
 
+```bash
+wget @pulsar:dist_rpm:client-devel@
 ```
 
-The `libpulsarwithdeps.a` does not include library openssl related libraries `libssl` and `libcrypto`, because these two libraries are related to security. It is more reasonable and easier to use the versions provided by the local system to handle security issues and upgrade libraries.
-
-### Install RPM
-
-1. Download a RPM package from the links in the table. 
+This package contains static libraries: `libpulsar.a`, `libpulsarwithdeps.a` and C/C++ headers.
 
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:dist_rpm:client@) | [asc](@pulsar:dist_rpm:client@.asc), [sha512](@pulsar:dist_rpm:client@.sha512) |
-| [client-debuginfo](@pulsar:dist_rpm:client-debuginfo@) | [asc](@pulsar:dist_rpm:client-debuginfo@.asc),  [sha512](@pulsar:dist_rpm:client-debuginfo@.sha512) |
-| [client-devel](@pulsar:dist_rpm:client-devel@) | [asc](@pulsar:dist_rpm:client-devel@.asc),  [sha512](@pulsar:dist_rpm:client-devel@.sha512) |
+
+
 
-2. Install the package using the following command.
+2. Install the package using the following command:
 
 ```bash
-
-$ rpm -ivh apache-pulsar-client*.rpm
-
+rpm -ivh apache-pulsar-client*.rpm
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` directory.
+Now, you can see Pulsar C++ client libraries installed under the `/usr/lib` directory.
 
 :::note
 
-If you get the error that `libpulsar.so: cannot open shared object file: No such file or directory` when starting Pulsar client, you may need to run `ldconfig` first.
+If you get an error like "libpulsar.so: cannot open shared object file: No such file or directory" when starting a Pulsar client, you need to run `ldconfig` first.
 
 :::
 
-### Install Debian
-
-1. Download a Debian package from the links in the table. 
-
-| Link | Crypto files |
-|------|--------------|
-| [client](@pulsar:deb:client@) | [asc](@pulsar:dist_deb:client@.asc), [sha512](@pulsar:dist_deb:client@.sha512) |
-| [client-devel](@pulsar:deb:client-devel@) | [asc](@pulsar:dist_deb:client-devel@.asc),  [sha512](@pulsar:dist_deb:client-devel@.sha512) |
-
-2. Install the package using the following command.
-
-```bash
-
-$ apt install ./apache-pulsar-client*.deb
-
-```
-
-After you install DEB successfully, Pulsar libraries are in the `/usr/lib` directory.
-
-### Build
-
-> If you want to build RPM and Debian packages from the latest master, follow the instructions below. You should run all the instructions at the root directory of your cloned Pulsar repository.
-
-There are recipes that build RPM and Debian packages containing a
-statically linked `libpulsar.so` / `libpulsarnossl.so` / `libpulsar.a` / `libpulsarwithdeps.a` with all required dependencies.
-
-To build the C++ library packages, you need to build the Java packages first.
-
-```shell
-
-mvn install -DskipTests
-
-```
-
-#### RPM
-
-To build the RPM inside a Docker container, use the command below. The RPMs are in the `pulsar-client-cpp/pkg/rpm/RPMS/x86_64/` path.
-
-```shell
-
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
-
-```
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-devel | Static library `libpulsar.a`, `libpulsarwithdeps.a`and C++ and C headers |
-| pulsar-client-debuginfo | Debug symbols for `libpulsar.so` |
-
-#### Debian
-
-To build Debian packages, enter the following command.
-
-```shell
-
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
-
-```
-
-Debian packages are created in the `pulsar-client-cpp/pkg/deb/BUILD/DEB/` path.
-
-| Package name | Content |
-|-----|-----|
-| pulsar-client | Shared library `libpulsar.so` and `libpulsarnossl.so` |
-| pulsar-client-dev | Static library `libpulsar.a`, `libpulsarwithdeps.a` and C++ and C headers |
-
-## MacOS
-
-### Compilation
-
-1. Clone the Pulsar repository.
-
-```shell
-
-$ git clone https://github.com/apache/pulsar
-
-```
-
-2. Install all necessary dependencies.
-
-```shell
-
-# OpenSSL installation
-$ brew install openssl
-$ export OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/
-$ export OPENSSL_ROOT_DIR=/usr/local/opt/openssl/
-
-# Protocol Buffers installation
-$ brew install protobuf boost boost-python log4cxx
-# If you are using python3, you need to install boost-python3 
-
-# Google Test installation
-$ git clone https://github.com/google/googletest.git
-$ cd googletest
-$ git checkout release-1.12.1
-$ cmake .
-$ make install
-
-```
-
-3. Compile the Pulsar client library in the repository that you cloned.
-
-```shell
-
-$ cd pulsar-client-cpp
-$ cmake .
-$ make
-
-```
-
-### Install `libpulsar`
-
-Pulsar releases are available in the [Homebrew](https://brew.sh/) core repository. You can install the C++ client library with the following command. The package is installed with the library and headers.
-
-```shell
-
-brew install libpulsar
-
-```
-
-## Windows (64-bit)
-
-### Compilation
-
-1. Clone the Pulsar repository.
-
-```shell
+### Source
 
-$ git clone https://github.com/apache/pulsar
-
-```
-
-2. Install all necessary dependencies.
-
-```shell
-
-cd ${PULSAR_HOME}/pulsar-client-cpp
-vcpkg install --feature-flags=manifests --triplet x64-windows
-
-```
-
-3. Build C++ libraries.
-
-```shell
-
-cmake -B ./build -A x64 -DBUILD_PYTHON_WRAPPER=OFF -DBUILD_TESTS=OFF -DVCPKG_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=Release -S .
-cmake --build ./build --config Release
-
-```
-
-> **NOTE**
->
-> 1. For Windows 32-bit, you need to use `-A Win32` and `-DVCPKG_TRIPLET=x86-windows`.
-> 2. For MSVC Debug mode, you need to replace `Release` with `Debug` for both `CMAKE_BUILD_TYPE` variable and `--config` option.
-
-4. Client libraries are available in the following places.
-
-```
-
-${PULSAR_HOME}/pulsar-client-cpp/build/lib/Release/pulsar.lib
-${PULSAR_HOME}/pulsar-client-cpp/build/lib/Release/pulsar.dll
-
-```
+For how to build Pulsar C++ client on different platforms from source code, see [compliation](https://github.com/apache/pulsar-client-cpp#compilation).
 
 ## Connection URLs
 
@@ -330,7 +123,7 @@ pulsar://localhost:6650
 
 ```
 
-In a Pulsar cluster in production, the URL looks as follows. 
+In a Pulsar cluster in production, the URL looks as follows.
 
 ```http
 
@@ -597,7 +390,7 @@ Client client("pulsar+ssl://my-broker.com:6651", config);
 
 ```
 
-For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples).
+For complete examples, refer to [C++ client examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
 ## Schema
 
@@ -609,7 +402,7 @@ schema, see [Pulsar schema](schema-get-started.md).
 - The following example shows how to create a producer with an Avro schema.
 
   ```cpp
-  
+
   static const std::string exampleSchema =
       "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
       "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
@@ -617,13 +410,13 @@ schema, see [Pulsar schema](schema-get-started.md).
   ProducerConfiguration producerConf;
   producerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
   client.createProducer("topic-avro", producerConf, producer);
-  
+
   ```
 
 - The following example shows how to create a consumer with an Avro schema.
 
   ```cpp
-  
+
   static const std::string exampleSchema =
       "{\"type\":\"record\",\"name\":\"Example\",\"namespace\":\"test\","
       "\"fields\":[{\"name\":\"a\",\"type\":\"int\"},{\"name\":\"b\",\"type\":\"int\"}]}";
@@ -631,14 +424,14 @@ schema, see [Pulsar schema](schema-get-started.md).
   Consumer consumer;
   consumerConf.setSchema(SchemaInfo(AVRO, "Avro", exampleSchema));
   client.subscribe("topic-avro", "sub-2", consumerConf, consumer)
-  
+
   ```
 
 ### ProtobufNative schema
 
 The following example shows how to create a producer and a consumer with a ProtobufNative schema.
 ​
-1. Generate the `User` class using Protobuf3. 
+1. Generate the `User` class using Protobuf3.
 
    :::note
 
@@ -649,14 +442,14 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```protobuf
-   
+
    syntax = "proto3";
-   
+
    message User {
        string name = 1;
        int32 age = 2;
    }
-   
+
    ```
 
 ​
@@ -664,9 +457,9 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```cpp
-   
+
    #include 
-   
+
    ```
 
 ​
@@ -674,7 +467,7 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```cpp
-   
+
    ProducerConfiguration producerConf;
    producerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
    Producer producer;
@@ -685,7 +478,7 @@ The following example shows how to create a producer and a consumer with a Proto
    std::string content;
    user.SerializeToString(&content);
    producer.send(MessageBuilder().setContent(content).build());
-   
+
    ```
 
 ​
@@ -693,7 +486,7 @@ The following example shows how to create a producer and a consumer with a Proto
 ​
 
    ```cpp
-   
+
    ConsumerConfiguration consumerConf;
    consumerConf.setSchema(createProtobufNativeSchema(User::GetDescriptor()));
    consumerConf.setSubscriptionInitialPosition(InitialPositionEarliest);
@@ -703,6 +496,6 @@ The following example shows how to create a producer and a consumer with a Proto
    consumer.receive(msg);
    User user2;
    user2.ParseFromArray(msg.getData(), msg.getLength());
-   
+
    ```
 
diff --git a/site2/website/versioned_docs/version-2.9.x/client-libraries-python.md b/site2/website/versioned_docs/version-2.9.x/client-libraries-python.md
index 90cc840daa0a8..779704290f013 100644
--- a/site2/website/versioned_docs/version-2.9.x/client-libraries-python.md
+++ b/site2/website/versioned_docs/version-2.9.x/client-libraries-python.md
@@ -5,15 +5,15 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [Python directory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](@pulsar:apidoc:cpp@). You can find the code in the [Python directory](https://github.com/apache/pulsar-client-python) of the C++ client code.
 
 All the methods in producer, consumer, and reader of a Python client are thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
-You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp).
+You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from [source](https://github.com/apache/pulsar-client-cpp).
 
 ### Install using pip
 
@@ -64,7 +64,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at [api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website/versioned_docs/version-2.9.x/helm-deploy.md b/site2/website/versioned_docs/version-2.9.x/helm-deploy.md
index 0e7815e4f4d90..c047763bd3b4b 100644
--- a/site2/website/versioned_docs/version-2.9.x/helm-deploy.md
+++ b/site2/website/versioned_docs/version-2.9.x/helm-deploy.md
@@ -153,38 +153,38 @@ The Pulsar Helm chart is designed to enable controlled upgrades. So it can confi
 images:
   zookeeper:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   bookie:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   autorecovery:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   broker:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   proxy:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
     pullPolicy: IfNotPresent
   functions:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: @pulsar:version@
   prometheus:
     repository: prom/prometheus
-    tag: v1.6.3
+    tag: v2.17.2
     pullPolicy: IfNotPresent
   grafana:
     repository: streamnative/apache-pulsar-grafana-dashboard-k8s
-    tag: 0.0.4
+    tag: 0.0.16
     pullPolicy: IfNotPresent
   pulsar_manager:
     repository: apachepulsar/pulsar-manager
-    tag: v0.1.0
+    tag: v0.3.0
     pullPolicy: IfNotPresent
     hasCommand: false
 
diff --git a/site2/website/versioned_sidebars/version-2.1.0-incubating-sidebars.json b/site2/website/versioned_sidebars/version-2.1.0-incubating-sidebars.json
deleted file mode 100644
index ac6a4daf13afe..0000000000000
--- a/site2/website/versioned_sidebars/version-2.1.0-incubating-sidebars.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "version-2.1.0-incubating/docsSidebar": [
-    {
-      "type": "doc",
-      "id": "version-2.1.0-incubating/about"
-    },
-    {
-      "type": "category",
-      "label": "Getting Started",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/pulsar-2.0"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/getting-started-standalone"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/getting-started-docker"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/client-libraries"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Concepts and Architecture",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-messaging"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-architecture-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-clients"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-replication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-multi-tenancy"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-authentication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-topic-compaction"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-tiered-storage"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/concepts-schema-registry"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Pulsar Functions",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-quickstart"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-api"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-deploying"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-guarantees"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-state"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/functions-metrics"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Pulsar IO",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/io-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/io-quickstart"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/io-managing"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/io-connectors"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/io-develop"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Deployment",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/deploy-aws"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/deploy-kubernetes"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/deploy-bare-metal"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/deploy-bare-metal-multi-cluster"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/deploy-monitoring"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Administration",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/administration-zk-bk"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/administration-geo"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/administration-dashboard"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/administration-stats"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/administration-load-distribution"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/administration-proxy"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Security",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-tls-transport"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-tls-authentication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-athenz"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-authorization"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-encryption"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/security-extending"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Client Libraries",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/client-libraries-java"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/client-libraries-go"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/client-libraries-python"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/client-libraries-cpp"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/client-libraries-websocket"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Admin API",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-clusters"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-tenants"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-brokers"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-namespaces"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-permissions"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-persistent-topics"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-non-persistent-topics"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-partitioned-topics"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/admin-api-schemas"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Adaptors",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/adaptors-kafka"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/adaptors-spark"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/adaptors-storm"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Cookbooks",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-tiered-storage"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-compaction"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-deduplication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-non-persistent"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-partitioned"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-retention-expiry"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-encryption"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/cookbooks-message-queue"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Development",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/develop-tools"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/developing-binary-protocol"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/develop-schema"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/develop-load-manager"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/develop-cpp"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Reference",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/reference-terminology"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/reference-cli-tools"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/pulsar-admin"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/reference-configuration"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.0-incubating/reference-rest-api-overview"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/site2/website/versioned_sidebars/version-2.1.1-incubating-sidebars.json b/site2/website/versioned_sidebars/version-2.1.1-incubating-sidebars.json
deleted file mode 100644
index 6a4c4ff6ba1dd..0000000000000
--- a/site2/website/versioned_sidebars/version-2.1.1-incubating-sidebars.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "version-2.1.1-incubating/docsSidebar": [
-    {
-      "type": "doc",
-      "id": "version-2.1.1-incubating/about"
-    },
-    {
-      "type": "category",
-      "label": "Getting Started",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/pulsar-2.0"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/getting-started-standalone"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/getting-started-docker"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/client-libraries"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Concepts and Architecture",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-messaging"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-architecture-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-clients"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-replication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-multi-tenancy"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-authentication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-topic-compaction"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-tiered-storage"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/concepts-schema-registry"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Pulsar Functions",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-quickstart"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-api"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-deploying"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-guarantees"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-state"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/functions-metrics"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Pulsar IO",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/io-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/io-quickstart"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/io-managing"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/io-connectors"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/io-develop"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Deployment",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/deploy-aws"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/deploy-kubernetes"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/deploy-bare-metal"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/deploy-bare-metal-multi-cluster"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/deploy-monitoring"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Administration",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/administration-zk-bk"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/administration-geo"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/administration-dashboard"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/administration-stats"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/administration-load-distribution"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/administration-proxy"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Security",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-tls-transport"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-tls-authentication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-athenz"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-authorization"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-encryption"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/security-extending"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Client Libraries",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/client-libraries-java"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/client-libraries-go"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/client-libraries-python"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/client-libraries-cpp"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/client-libraries-websocket"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Admin API",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-overview"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-clusters"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-tenants"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-brokers"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-namespaces"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-permissions"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-persistent-topics"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-non-persistent-topics"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-partitioned-topics"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/admin-api-schemas"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Adaptors",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/adaptors-kafka"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/adaptors-spark"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/adaptors-storm"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Cookbooks",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-tiered-storage"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-compaction"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-deduplication"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-non-persistent"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-partitioned"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-retention-expiry"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-encryption"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/cookbooks-message-queue"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Development",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/develop-tools"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/developing-binary-protocol"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/develop-schema"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/develop-load-manager"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/develop-cpp"
-        }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Reference",
-      "items": [
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/reference-terminology"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/reference-cli-tools"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/pulsar-admin"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/reference-configuration"
-        },
-        {
-          "type": "doc",
-          "id": "version-2.1.1-incubating/reference-rest-api-overview"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/site2/website/versions.json b/site2/website/versions.json
index b2a3ee57c77c0..270b0693288cf 100644
--- a/site2/website/versions.json
+++ b/site2/website/versions.json
@@ -23,7 +23,5 @@
   "2.3.1",
   "2.3.0",
   "2.2.1",
-  "2.2.0",
-  "2.1.1-incubating",
-  "2.1.0-incubating"
+  "2.2.0"
 ]
diff --git a/src/check-binary-license.sh b/src/check-binary-license.sh
index 64e5bd4320ae4..e3df9673a64f1 100755
--- a/src/check-binary-license.sh
+++ b/src/check-binary-license.sh
@@ -98,7 +98,7 @@ if [ "$NO_PRESTO" -ne 1 ]; then
   # check pulsar sql jars
   JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'trino/' | grep -v pulsar-client | grep -v bouncy-castle-bc | grep -v pulsar-metadata | grep -v 'managed-ledger' | grep -v  'pulsar-client-admin' | grep -v  'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v 'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' | grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v 'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v 'pulsar-transaction-common' | grep -v 'pulsar-package-core' | sed 's!.*/!!' | sort)
   if [ -n "$JARS" ]; then
-    LICENSEPATH=$(tar -tf $TARBALL  | awk '/^[^\/]*\/lib\/presto\/LICENSE/')
+    LICENSEPATH=$(tar -tf $TARBALL  | awk '/^[^\/]*\/trino\/LICENSE/')
     LICENSE=$(tar -O -xf $TARBALL "$LICENSEPATH")
     LICENSEJARS=$(echo "$LICENSE" | sed -nE 's!.* (.*\.jar).*!\1!gp')
 
diff --git a/src/stage-release.sh b/src/stage-release.sh
index 0057ac6a7fd97..d9911e520a3f9 100755
--- a/src/stage-release.sh
+++ b/src/stage-release.sh
@@ -35,6 +35,8 @@ popd
 cp $PULSAR_PATH/target/apache-pulsar-$VERSION-src.tar.gz $DEST_PATH
 cp $PULSAR_PATH/distribution/server/target/apache-pulsar-$VERSION-bin.tar.gz $DEST_PATH
 cp $PULSAR_PATH/distribution/offloaders/target/apache-pulsar-offloaders-$VERSION-bin.tar.gz $DEST_PATH
+cp $PULSAR_PATH/distribution/shell/target/apache-pulsar-shell-$VERSION-shell.tar.gz $DEST_PATH
+cp $PULSAR_PATH/distribution/shell/target/apache-pulsar-shell-$VERSION-shell.zip $DEST_PATH
 
 cp -r $PULSAR_PATH/distribution/io/target/apache-pulsar-io-connectors-$VERSION-bin $DEST_PATH/connectors
 
diff --git a/structured-event-log/pom.xml b/structured-event-log/pom.xml
index 178bcc8d4af09..e5e6a72816f0d 100644
--- a/structured-event-log/pom.xml
+++ b/structured-event-log/pom.xml
@@ -37,11 +37,6 @@
       org.slf4j
       slf4j-api
     
-    
-      org.testng
-      testng
-      test
-    
     
       org.hamcrest
       hamcrest
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/Event.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/Event.java
index 3074617023850..21569a76da2a4 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/Event.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/Event.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventGroup.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventGroup.java
index 6e24a25bce94d..0d76dd8ccec5b 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventGroup.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventGroup.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResources.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResources.java
index 499525e5e24e4..1605c1fe20dec 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResources.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResourcesImpl.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResourcesImpl.java
index 710f56dce41f9..b2278933d7ec7 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResourcesImpl.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/EventResourcesImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/StructuredEventLog.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/StructuredEventLog.java
index bf2a00215c9fb..bc64545416b7f 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/StructuredEventLog.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/StructuredEventLog.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/package-info.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/package-info.java
index 0106ace349272..5450299d95100 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/package-info.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jEvent.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jEvent.java
index 3fef22e29a765..56cc683092649 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jEvent.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jStructuredEventLog.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jStructuredEventLog.java
index 5a88a714c35e1..1a94f5a4a29e6 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jStructuredEventLog.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/Slf4jStructuredEventLog.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/package-info.java b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/package-info.java
index 971ac050d73d9..5e677a102efbe 100644
--- a/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/package-info.java
+++ b/structured-event-log/src/main/java/org/apache/pulsar/structuredeventlog/slf4j/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/structured-event-log/src/test/java/org/apache/pulsar/structuredeventlog/slf4j/StructuredEventLogTest.java b/structured-event-log/src/test/java/org/apache/pulsar/structuredeventlog/slf4j/StructuredEventLogTest.java
index c28cd8c9dfca9..2da8294784432 100644
--- a/structured-event-log/src/test/java/org/apache/pulsar/structuredeventlog/slf4j/StructuredEventLogTest.java
+++ b/structured-event-log/src/test/java/org/apache/pulsar/structuredeventlog/slf4j/StructuredEventLogTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/BookKeeperTestClient.java b/testmocks/src/main/java/org/apache/bookkeeper/client/BookKeeperTestClient.java
index c478432b0161c..d023427e3be31 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/client/BookKeeperTestClient.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/client/BookKeeperTestClient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java
index 50df4b6b0df0f..8d6c39d9a82a1 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockLedgerHandle.java b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockLedgerHandle.java
index 7842959ee25db..2790160a72141 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockLedgerHandle.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockLedgerHandle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockReadHandle.java b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockReadHandle.java
index 51dedde5b54c7..a4361f62254e4 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockReadHandle.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockReadHandle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/TestStatsProvider.java b/testmocks/src/main/java/org/apache/bookkeeper/client/TestStatsProvider.java
index 9a7b59a0ca750..f015306cb048c 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/client/TestStatsProvider.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/client/TestStatsProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/package-info.java b/testmocks/src/main/java/org/apache/bookkeeper/client/package-info.java
index 878b83520d01e..76185fe300eb0 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/client/package-info.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/client/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/test/ServerTester.java b/testmocks/src/main/java/org/apache/bookkeeper/test/ServerTester.java
index 804a92cc0490d..f519394d09235 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/test/ServerTester.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/test/ServerTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/bookkeeper/test/package-info.java b/testmocks/src/main/java/org/apache/bookkeeper/test/package-info.java
index 03345b00afe65..920a4979a9c69 100644
--- a/testmocks/src/main/java/org/apache/bookkeeper/test/package-info.java
+++ b/testmocks/src/main/java/org/apache/bookkeeper/test/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java b/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java
index 190720e5bcc36..0c0f7ec9ed1d4 100644
--- a/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java
+++ b/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeperSession.java b/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeperSession.java
index de1fbdc1dcb55..a7c35844e8129 100644
--- a/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeperSession.java
+++ b/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeperSession.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/testmocks/src/main/java/org/apache/zookeeper/package-info.java b/testmocks/src/main/java/org/apache/zookeeper/package-info.java
index 8c313f51d3a1c..ee611465ef29f 100644
--- a/testmocks/src/main/java/org/apache/zookeeper/package-info.java
+++ b/testmocks/src/main/java/org/apache/zookeeper/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 349c3f1daa58d..3b088d77c5719 100644
--- a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index b2510709c0def..a4ab09c363da1 100644
--- a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 349c3f1daa58d..3b088d77c5719 100644
--- a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index b2510709c0def..a4ab09c363da1 100644
--- a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 349c3f1daa58d..3b088d77c5719 100644
--- a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index b2510709c0def..a4ab09c363da1 100644
--- a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/certificate-authority/RemoveJksPassword.java b/tests/certificate-authority/RemoveJksPassword.java
index 65a26ce3dcc8d..e6c22c81d3d56 100644
--- a/tests/certificate-authority/RemoveJksPassword.java
+++ b/tests/certificate-authority/RemoveJksPassword.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package main;
 
 import java.io.FileInputStream;
diff --git a/tests/certificate-authority/index.txt b/tests/certificate-authority/index.txt
index b56dd8cc554e3..376f86725c21a 100644
--- a/tests/certificate-authority/index.txt
+++ b/tests/certificate-authority/index.txt
@@ -4,3 +4,4 @@ V	210318101354Z		1002	unknown	/CN=ivan
 V	22920409135604Z		1003	unknown	/CN=proxy
 V	22920410132517Z		1004	unknown	/CN=superproxy
 V	22920411084025Z		1005	unknown	/CN=user1
+V	22960802101401Z		1006	unknown	/CN=proxy.pulsar.apache.org
diff --git a/tests/certificate-authority/newcerts/1006.pem b/tests/certificate-authority/newcerts/1006.pem
new file mode 100644
index 0000000000000..02caee5826346
--- /dev/null
+++ b/tests/certificate-authority/newcerts/1006.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEjzCCAnegAwIBAgICEAYwDQYJKoZIhvcNAQENBQAwETEPMA0GA1UEAwwGZm9v
+YmFyMCAXDTIyMTAxODEwMTQwMVoYDzIyOTYwODAyMTAxNDAxWjAiMSAwHgYDVQQD
+DBdwcm94eS5wdWxzYXIuYXBhY2hlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPPnBnkHqKvXuv7BKOoQ8nAa7gEVAjzRANhOx2Yk3/JpN1/Ash48
+UltPjHtop1kXLrnjM3DahQuolz1A/N5sN2RGoe+/Y/aI/FRDF25yGzEoM/kwZDjm
+ejQj2Hb6YsupI+YYtPr5ZDSeIBvvlVurXfXJkZf5CXYeEjqr1pEpLpNCZoWoOiiC
+73/0KBoOToR5+akw+Db2Qr5FSz7AuTQ9KUZ1HZNl4xZBuEha6avESdRykH2XQzDs
+qMBVruByHbzO1pg/op4iOhqQ6DFu67veKjWzMLxKR7x/A8UOd9f9D3+pabBoU72b
+NqgwbKCnERoo3Y0ge1B1x7GORR7GHrWSKlUCAwEAAaOB3TCB2jAJBgNVHRMEAjAA
+MBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5l
+cmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBQqVR7lwaEgKHsI8+D8
+nNxPmgWZ7TBBBgNVHSMEOjA4gBRXC+nLI+i/Rz5Qej9FfqEYQ50VJ6EVpBMwETEP
+MA0GA1UEAwwGZm9vYmFyggkA1+KHT6B54gwwDgYDVR0PAQH/BAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBDQUAA4ICAQBtoQTZ5u6NpDIKHo6V
+yZqkRrMcg9J61zRm0tbf4D/iIsfWNiJrAWSudK4OgkUrXj4LFWKvzzcZtPltuUr5
+yODXZgz8lnyLbw6GyrKFU4Gpbr8Be30Y1yF7dfTV0yp5ZoIXNILfKhU3not1yL41
+0owaO7N0PyDAzQ7erPbbB9UG7xhYM5qFfAnevwX1rde12JHJULfeE9Ushuv+DcK5
+JmNvkRE+nB/dljsST9pW+zjBDuhwTiDZMPtUPyM0tPn6+x5zwF0pWFKhCkO8lVhr
+TxCG/bMF3j/0MxjQvDvcijJFHaZqLHsw/FqgEM5SNgAsTuuY7wBohSNRddfvahV1
+xPdXUrALuDH/NmIzaYZW6hh6mOhl+R7lP2XXZbFTpTGVdoosdBTGkjbPGKMrT/L8
+hwLvFezXaHZzqj4hLnmqFbhu+dDH55EE1HT5RP7kxGCq1AMuwlsjOVxURS0FZi87
+Oaq19NKsyWfdf8igONsk0GBt5HeG+93fJkW/SxssTJdz1xc91KgGDlP3nAW3xBAz
+TRvgiKIeMzOh+SWkTyz/cJugyxD+wXaAEL7VYsgOwilV+rbWKTDPvnNORqrLO/md
+MHZqYWkFlld2kw8i4LYc6zXOsOWlOv0ZM7VcEs7ufBADQEiZPkDNvWlzM97oDabE
+n/htdqxnoZ3NHJ1HJnz03jKSfg==
+-----END CERTIFICATE-----
diff --git a/tests/certificate-authority/serial b/tests/certificate-authority/serial
index 9540e56f97ca2..fb35a14c02716 100644
--- a/tests/certificate-authority/serial
+++ b/tests/certificate-authority/serial
@@ -1 +1 @@
-1006
+1007
diff --git a/tests/certificate-authority/server-keys/proxy.cert.pem b/tests/certificate-authority/server-keys/proxy.cert.pem
new file mode 100644
index 0000000000000..02caee5826346
--- /dev/null
+++ b/tests/certificate-authority/server-keys/proxy.cert.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEjzCCAnegAwIBAgICEAYwDQYJKoZIhvcNAQENBQAwETEPMA0GA1UEAwwGZm9v
+YmFyMCAXDTIyMTAxODEwMTQwMVoYDzIyOTYwODAyMTAxNDAxWjAiMSAwHgYDVQQD
+DBdwcm94eS5wdWxzYXIuYXBhY2hlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPPnBnkHqKvXuv7BKOoQ8nAa7gEVAjzRANhOx2Yk3/JpN1/Ash48
+UltPjHtop1kXLrnjM3DahQuolz1A/N5sN2RGoe+/Y/aI/FRDF25yGzEoM/kwZDjm
+ejQj2Hb6YsupI+YYtPr5ZDSeIBvvlVurXfXJkZf5CXYeEjqr1pEpLpNCZoWoOiiC
+73/0KBoOToR5+akw+Db2Qr5FSz7AuTQ9KUZ1HZNl4xZBuEha6avESdRykH2XQzDs
+qMBVruByHbzO1pg/op4iOhqQ6DFu67veKjWzMLxKR7x/A8UOd9f9D3+pabBoU72b
+NqgwbKCnERoo3Y0ge1B1x7GORR7GHrWSKlUCAwEAAaOB3TCB2jAJBgNVHRMEAjAA
+MBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5l
+cmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1UdDgQWBBQqVR7lwaEgKHsI8+D8
+nNxPmgWZ7TBBBgNVHSMEOjA4gBRXC+nLI+i/Rz5Qej9FfqEYQ50VJ6EVpBMwETEP
+MA0GA1UEAwwGZm9vYmFyggkA1+KHT6B54gwwDgYDVR0PAQH/BAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBDQUAA4ICAQBtoQTZ5u6NpDIKHo6V
+yZqkRrMcg9J61zRm0tbf4D/iIsfWNiJrAWSudK4OgkUrXj4LFWKvzzcZtPltuUr5
+yODXZgz8lnyLbw6GyrKFU4Gpbr8Be30Y1yF7dfTV0yp5ZoIXNILfKhU3not1yL41
+0owaO7N0PyDAzQ7erPbbB9UG7xhYM5qFfAnevwX1rde12JHJULfeE9Ushuv+DcK5
+JmNvkRE+nB/dljsST9pW+zjBDuhwTiDZMPtUPyM0tPn6+x5zwF0pWFKhCkO8lVhr
+TxCG/bMF3j/0MxjQvDvcijJFHaZqLHsw/FqgEM5SNgAsTuuY7wBohSNRddfvahV1
+xPdXUrALuDH/NmIzaYZW6hh6mOhl+R7lP2XXZbFTpTGVdoosdBTGkjbPGKMrT/L8
+hwLvFezXaHZzqj4hLnmqFbhu+dDH55EE1HT5RP7kxGCq1AMuwlsjOVxURS0FZi87
+Oaq19NKsyWfdf8igONsk0GBt5HeG+93fJkW/SxssTJdz1xc91KgGDlP3nAW3xBAz
+TRvgiKIeMzOh+SWkTyz/cJugyxD+wXaAEL7VYsgOwilV+rbWKTDPvnNORqrLO/md
+MHZqYWkFlld2kw8i4LYc6zXOsOWlOv0ZM7VcEs7ufBADQEiZPkDNvWlzM97oDabE
+n/htdqxnoZ3NHJ1HJnz03jKSfg==
+-----END CERTIFICATE-----
diff --git a/tests/certificate-authority/server-keys/proxy.csr.pem b/tests/certificate-authority/server-keys/proxy.csr.pem
new file mode 100644
index 0000000000000..8dbf74bb819ad
--- /dev/null
+++ b/tests/certificate-authority/server-keys/proxy.csr.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICZzCCAU8CAQAwIjEgMB4GA1UEAwwXcHJveHkucHVsc2FyLmFwYWNoZS5vcmcw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDz5wZ5B6ir17r+wSjqEPJw
+Gu4BFQI80QDYTsdmJN/yaTdfwLIePFJbT4x7aKdZFy654zNw2oULqJc9QPzebDdk
+RqHvv2P2iPxUQxduchsxKDP5MGQ45no0I9h2+mLLqSPmGLT6+WQ0niAb75Vbq131
+yZGX+Ql2HhI6q9aRKS6TQmaFqDoogu9/9CgaDk6EefmpMPg29kK+RUs+wLk0PSlG
+dR2TZeMWQbhIWumrxEnUcpB9l0Mw7KjAVa7gch28ztaYP6KeIjoakOgxbuu73io1
+szC8Ske8fwPFDnfX/Q9/qWmwaFO9mzaoMGygpxEaKN2NIHtQdcexjkUexh61kipV
+AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAMBYwlvpcPsZQQMwUbts7GsX35Hcn
+FAl8iWcKr9uw/9sSrZkstI9Aa8As+KYPeY3Z2p5TYY1TXokZa936NB00CWnY+gxY
+lfKXy31yPqEHSwir1pQDU+WTILwZfbptFpAFEBy0SCDWrBZJUbM1ngqcVDg9jlQi
+iZMDYbsnZ828Hn4e97P83bOubSBWIf1Rp6LcbIzJtwGCGVp+XPJYPMFXmpzAtwrT
+tSgzCnHXseYKwIbjr+ReW58jE8Z59UqBm3/VeidLg94VfITuN5et42yypWd9Z7DU
+C/qE8gjrqlvl49Xi6ye/RxKTMN+8TiQigU5ngEnYvNKbpKhU4veXHKjfrg==
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/certificate-authority/server-keys/proxy.key-pk8.pem b/tests/certificate-authority/server-keys/proxy.key-pk8.pem
new file mode 100644
index 0000000000000..114fe2fb04d09
--- /dev/null
+++ b/tests/certificate-authority/server-keys/proxy.key-pk8.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDz5wZ5B6ir17r+
+wSjqEPJwGu4BFQI80QDYTsdmJN/yaTdfwLIePFJbT4x7aKdZFy654zNw2oULqJc9
+QPzebDdkRqHvv2P2iPxUQxduchsxKDP5MGQ45no0I9h2+mLLqSPmGLT6+WQ0niAb
+75Vbq131yZGX+Ql2HhI6q9aRKS6TQmaFqDoogu9/9CgaDk6EefmpMPg29kK+RUs+
+wLk0PSlGdR2TZeMWQbhIWumrxEnUcpB9l0Mw7KjAVa7gch28ztaYP6KeIjoakOgx
+buu73io1szC8Ske8fwPFDnfX/Q9/qWmwaFO9mzaoMGygpxEaKN2NIHtQdcexjkUe
+xh61kipVAgMBAAECggEBAJ/DuDC1fJ477OiNPLC+MyCN81NQIKwXt/b4+5KEGxHe
+LACT59j4aHYZkIsSDXTFQ71N/1cwPLBbWd4s4LcNqecMgWzbMK7AIpFLdWDKa9dy
+X0EemrfO+UOIK3YcI3UGsVY63un7TNFOtve1o19tzFmBFNa4saLmpcg64Y0qrbCV
+KcHslT1T07szp5s+weiMxgsD17foNSBEXLxP7+1F9NPlWuiHh+Rl2/t+K2tjrXeI
+EN9dtv29q4v9jCRU4yhIunAjLEvrMYCSGhXEGa+MRkgXkTPhhVN5nWX6M0uDyKgK
+aJJBv+/H6QVj4XetubYdLjII0L2q/vckoD5JsaYfz40CgYEA/7ID5OWbp/OOCjK1
+wbMByKwLUL5tHapZIoYdNg/w6zjjYl1TM9e18p1llOb+oPTEk+p8LigkkkDvPrEZ
+zAhAU3Z3nRWGkVOLNYycuSed283Up0Kml08vsRNGDa78bma4GaWnJpOuPx5fB1HN
+njjq9XhYzIEAHO4dT2dAQB003JMCgYEA9DFp0FnfsZsuAMLwBJJ08yHn4CjoYpMq
+TAg3JScEjnm1ELJBvqLYRHzqHVeSKUHTtVDwaAqMe43qEnQ3IuFS+dhJGfOX41Cf
+Yw7WDZvIeuPZER7WXUY27wmjGbjx6SdIuDYnYYA0P3RSGm3VcGZqaLoW7MvfDB0y
+pYpVSV6pFncCgYEAz5/dSaCoJFjAncdPj1mruSb6iTYXpF8OwdnlHmETX+1xtg3R
+4ebm93qXYbGwUUJv3SwqadBu4dOYcW+dYu/QS/WGaydvfdI41+K14CMrK7CXXLni
+TDsgnsjnuXS9xWfjVfANKmYAt4AR6f+i1zegknKGqIiXbuZrJm7Q3T7aDcECgYEA
+7tXBm6G7kzemt+Hx5VblgcOgyfLYz0kG7pR+cx0FbOCHAsyGVxFpGxtd09MJxsZ2
+bXm7mNbwbgvwa5o1Ly1Y/brYTMSewxrguX8SRv8eB2wAq6kQmuwI4KT5XDgyiwr8
+Kgf1XnyJHaMEhor0XlodK08PCw2fm3aXSafSIM+v66MCgYEAiGDfCy25tcI4UpAb
+v8WjI2Y7EXE2vJQ/mqMhKzmfME8HMzBvuzhwAERJgPHh1lNOIwH1LnF4lZS7jr75
+A78lgfTj6ZKNHpr5s5+5zdllvFwQ51SczCUnZv0flb/S5Qeciqh0a//pe9FQvL3+
+3cqpvX158ljL8FYfcPQOBuIUdjw=
+-----END PRIVATE KEY-----
diff --git a/tests/certificate-authority/server-keys/proxy.key.pem b/tests/certificate-authority/server-keys/proxy.key.pem
new file mode 100644
index 0000000000000..ec79e9ddf234c
--- /dev/null
+++ b/tests/certificate-authority/server-keys/proxy.key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEA8+cGeQeoq9e6/sEo6hDycBruARUCPNEA2E7HZiTf8mk3X8Cy
+HjxSW0+Me2inWRcuueMzcNqFC6iXPUD83mw3ZEah779j9oj8VEMXbnIbMSgz+TBk
+OOZ6NCPYdvpiy6kj5hi0+vlkNJ4gG++VW6td9cmRl/kJdh4SOqvWkSkuk0Jmhag6
+KILvf/QoGg5OhHn5qTD4NvZCvkVLPsC5ND0pRnUdk2XjFkG4SFrpq8RJ1HKQfZdD
+MOyowFWu4HIdvM7WmD+iniI6GpDoMW7ru94qNbMwvEpHvH8DxQ531/0Pf6lpsGhT
+vZs2qDBsoKcRGijdjSB7UHXHsY5FHsYetZIqVQIDAQABAoIBAQCfw7gwtXyeO+zo
+jTywvjMgjfNTUCCsF7f2+PuShBsR3iwAk+fY+Gh2GZCLEg10xUO9Tf9XMDywW1ne
+LOC3DannDIFs2zCuwCKRS3VgymvXcl9BHpq3zvlDiCt2HCN1BrFWOt7p+0zRTrb3
+taNfbcxZgRTWuLGi5qXIOuGNKq2wlSnB7JU9U9O7M6ebPsHojMYLA9e36DUgRFy8
+T+/tRfTT5Vroh4fkZdv7fitrY613iBDfXbb9vauL/YwkVOMoSLpwIyxL6zGAkhoV
+xBmvjEZIF5Ez4YVTeZ1l+jNLg8ioCmiSQb/vx+kFY+F3rbm2HS4yCNC9qv73JKA+
+SbGmH8+NAoGBAP+yA+Tlm6fzjgoytcGzAcisC1C+bR2qWSKGHTYP8Os442JdUzPX
+tfKdZZTm/qD0xJPqfC4oJJJA7z6xGcwIQFN2d50VhpFTizWMnLknndvN1KdCppdP
+L7ETRg2u/G5muBmlpyaTrj8eXwdRzZ446vV4WMyBABzuHU9nQEAdNNyTAoGBAPQx
+adBZ37GbLgDC8ASSdPMh5+Ao6GKTKkwINyUnBI55tRCyQb6i2ER86h1XkilB07VQ
+8GgKjHuN6hJ0NyLhUvnYSRnzl+NQn2MO1g2byHrj2REe1l1GNu8Joxm48eknSLg2
+J2GAND90Uhpt1XBmami6FuzL3wwdMqWKVUleqRZ3AoGBAM+f3UmgqCRYwJ3HT49Z
+q7km+ok2F6RfDsHZ5R5hE1/tcbYN0eHm5vd6l2GxsFFCb90sKmnQbuHTmHFvnWLv
+0Ev1hmsnb33SONfiteAjKyuwl1y54kw7IJ7I57l0vcVn41XwDSpmALeAEen/otc3
+oJJyhqiIl27mayZu0N0+2g3BAoGBAO7VwZuhu5M3prfh8eVW5YHDoMny2M9JBu6U
+fnMdBWzghwLMhlcRaRsbXdPTCcbGdm15u5jW8G4L8GuaNS8tWP262EzEnsMa4Ll/
+Ekb/HgdsAKupEJrsCOCk+Vw4MosK/CoH9V58iR2jBIaK9F5aHStPDwsNn5t2l0mn
+0iDPr+ujAoGBAIhg3wstubXCOFKQG7/FoyNmOxFxNryUP5qjISs5nzBPBzMwb7s4
+cABESYDx4dZTTiMB9S5xeJWUu46++QO/JYH04+mSjR6a+bOfuc3ZZbxcEOdUnMwl
+J2b9H5W/0uUHnIqodGv/6XvRULy9/t3Kqb19efJYy/BWH3D0DgbiFHY8
+-----END RSA PRIVATE KEY-----
diff --git a/tests/compose/tls/docker-compose.yml b/tests/compose/tls/docker-compose.yml
index d379876cdd78f..ca7d3455ff8a5 100644
--- a/tests/compose/tls/docker-compose.yml
+++ b/tests/compose/tls/docker-compose.yml
@@ -83,9 +83,9 @@ services:
       configurationStoreServers: zk:2181
       brokerServicePortTls: 6651
       webServicePortTls: 8443
-      tlsCertificateFilePath: /pulsar/ssl/broker.cert.pem
-      tlsKeyFilePath: /pulsar/ssl/broker.key-pk8.pem
-      tlsTrustCertsFilePath: /pulsar/ssl/ca.cert.pem
+      tlsCertificateFilePath: /pulsar/certificate-authority/server-keys/broker.cert.pem
+      tlsKeyFilePath: /pulsar/certificate-authority/server-keys/broker.key-pk8.pem
+      tlsTrustCertsFilePath: /pulsar/certificate-authority/certs/ca.cert.pem
       authenticationEnabled: "true"
       authenticationProviders: org.apache.pulsar.broker.authentication.AuthenticationProviderTls
       authorizationEnabled: "true"
@@ -105,15 +105,15 @@ services:
       configurationStoreServers: zk:2181
       servicePortTls: 6651
       webServicePortTls: 8443
-      tlsCertificateFilePath: /pulsar/ssl/broker.cert.pem
-      tlsKeyFilePath: /pulsar/ssl/broker.key-pk8.pem
-      tlsTrustCertsFilePath: /pulsar/ssl/ca.cert.pem
-      brokerClientTrustCertsFilePath: /pulsar/ssl/ca.cert.pem
+      tlsCertificateFilePath: /pulsar/certificate-authority/server-keys/broker.cert.pem
+      tlsKeyFilePath: /pulsar/certificate-authority/server-keys/broker.key-pk8.pem
+      tlsTrustCertsFilePath: /pulsar/certificate-authority/certs/ca.cert.pem
+      brokerClientTrustCertsFilePath: /pulsar/certificate-authority/certs/ca.cert.pem
       authenticationEnabled: "true"
       authenticationProviders: org.apache.pulsar.broker.authentication.AuthenticationProviderTls
       tlsEnabledWithBroker: "true"
       brokerClientAuthenticationPlugin: org.apache.pulsar.client.impl.auth.AuthenticationTls
-      brokerClientAuthenticationParameters: tlsCertFile:/pulsar/ssl/superproxy.cert.pem,tlsKeyFile:/pulsar/ssl/superproxy.key-pk8.pem
+      brokerClientAuthenticationParameters: tlsCertFile:/pulsar/certificate-authority/client-keys/superproxy.cert.pem,tlsKeyFile:/pulsar/certificate-authority/client-keys/superproxy.key-pk8.pem
     networks:
       pulsar:
 
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/ExceptionFunction.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/ExceptionFunction.java
index c2a13e271642d..66545771d79d3 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/ExceptionFunction.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/ExceptionFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/GenericObjectFunction.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/GenericObjectFunction.java
index 3c5edaa48d056..ad7ffa970e172 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/GenericObjectFunction.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/GenericObjectFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldFunction.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldFunction.java
index cc2a81bde645b..efa7c9f281e48 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldFunction.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,8 @@
  */
 package org.apache.pulsar.tests.integration.functions;
 
+import java.io.ByteArrayOutputStream;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericDatumWriter;
@@ -33,11 +35,8 @@
 import org.apache.pulsar.functions.api.Function;
 import org.apache.pulsar.functions.api.Record;
 
-import java.io.ByteArrayOutputStream;
-import java.util.stream.Collectors;
-
 /**
- * This function removes a "field" from a AVRO message
+ * This function removes a "field" from a AVRO message.
  */
 @Slf4j
 public class RemoveAvroFieldFunction implements Function {
@@ -70,18 +69,22 @@ public Void process(GenericObject genericObject, Context context) throws Excepti
                     org.apache.avro.Schema.Parser parser = new org.apache.avro.Schema.Parser();
                     org.apache.avro.Schema originalAvroSchema = parser.parse(avroSchema.toString(false));
                     org.apache.avro.Schema modified = org.apache.avro.Schema.createRecord(
-                            originalAvroSchema.getName(), originalAvroSchema.getDoc(), originalAvroSchema.getNamespace(), originalAvroSchema.isError(),
+                            originalAvroSchema.getName(),
+                            originalAvroSchema.getDoc(),
+                            originalAvroSchema.getNamespace(),
+                            originalAvroSchema.isError(),
                             originalAvroSchema.getFields().
                                     stream()
                                     .filter(f->!f.name().equals(FIELD_TO_REMOVE))
-                                    .map(f-> new org.apache.avro.Schema.Field(f.name(), f.schema(), f.doc(), f.defaultVal(), f.order()))
+                                    .map(f-> new org.apache.avro.Schema.Field(
+                                            f.name(), f.schema(), f.doc(), f.defaultVal(), f.order()))
                                     .collect(Collectors.toList()));
 
                     KeyValue originalObject = (KeyValue) nativeObject;
 
                     GenericRecord value = (GenericRecord) originalObject.getValue();
-                    org.apache.avro.generic.GenericRecord genericRecord
-                            = (org.apache.avro.generic.GenericRecord) value.getNativeObject();
+                    org.apache.avro.generic.GenericRecord genericRecord =
+                            (org.apache.avro.generic.GenericRecord) value.getNativeObject();
 
                     org.apache.avro.generic.GenericRecord newRecord = new GenericData.Record(modified);
                     for (org.apache.avro.Schema.Field field : modified.getFields()) {
@@ -105,15 +108,19 @@ public Void process(GenericObject genericObject, Context context) throws Excepti
                 org.apache.avro.Schema.Parser parser = new org.apache.avro.Schema.Parser();
                 org.apache.avro.Schema originalAvroSchema = parser.parse(avroSchema.toString(false));
                 org.apache.avro.Schema modified = org.apache.avro.Schema.createRecord(
-                        originalAvroSchema.getName(), originalAvroSchema.getDoc(), originalAvroSchema.getNamespace(), originalAvroSchema.isError(),
+                        originalAvroSchema.getName(),
+                        originalAvroSchema.getDoc(),
+                        originalAvroSchema.getNamespace(),
+                        originalAvroSchema.isError(),
                         originalAvroSchema.getFields().
                                 stream()
                                 .filter(f -> !f.name().equals(FIELD_TO_REMOVE))
-                                .map(f -> new org.apache.avro.Schema.Field(f.name(), f.schema(), f.doc(), f.defaultVal(), f.order()))
+                                .map(f -> new org.apache.avro.Schema.Field(
+                                        f.name(), f.schema(), f.doc(), f.defaultVal(), f.order()))
                                 .collect(Collectors.toList()));
 
-                org.apache.avro.generic.GenericRecord genericRecord
-                        = (org.apache.avro.generic.GenericRecord) nativeObject;
+                org.apache.avro.generic.GenericRecord genericRecord =
+                        (org.apache.avro.generic.GenericRecord) nativeObject;
                 org.apache.avro.generic.GenericRecord newRecord = new GenericData.Record(modified);
                 for (org.apache.avro.Schema.Field field : modified.getFields()) {
                     newRecord.put(field.name(), genericRecord.get(field.name()));
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldRecordFunction.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldRecordFunction.java
index 27502c104344a..bf8afe28468cc 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldRecordFunction.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/RemoveAvroFieldRecordFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/package-info.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/package-info.java
new file mode 100644
index 0000000000000..49427d1dddc23
--- /dev/null
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/functions/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.functions;
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/GenericRecordSource.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/GenericRecordSource.java
index f36b3df0c82cd..de17a17a8c0f7 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/GenericRecordSource.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/GenericRecordSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestByteStateSource.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestByteStateSource.java
index 4fe382f5ce758..dc8de9256abfc 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestByteStateSource.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestByteStateSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestGenericObjectSink.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestGenericObjectSink.java
index fa8a3fe2211c5..a4911bde21e17 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestGenericObjectSink.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestGenericObjectSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,6 +19,7 @@
 package org.apache.pulsar.tests.integration.io;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.pulsar.client.api.schema.GenericObject;
@@ -28,7 +29,6 @@
 import org.apache.pulsar.functions.api.Record;
 import org.apache.pulsar.io.core.Sink;
 import org.apache.pulsar.io.core.SinkContext;
-import java.util.Map;
 
 @Slf4j
 public class TestGenericObjectSink implements Sink {
@@ -49,7 +49,11 @@ public void write(Record record) {
         String expectedRecordType = record.getProperties().getOrDefault("expectedType", "MISSING");
         log.info("expectedRecordType {}", expectedRecordType);
         if (!expectedRecordType.equals(record.getSchema().getSchemaInfo().getType().name())) {
-            throw new RuntimeException("Unexpected record type " + record.getSchema().getSchemaInfo().getType().name() + " is not " + expectedRecordType);
+            final String message = String.format(
+                    "Unexpected record type %s is not %s",
+                    record.getSchema().getSchemaInfo().getType().name(),
+                    expectedRecordType);
+            throw new RuntimeException(message);
         }
 
         log.info("value {}", record.getValue());
@@ -67,9 +71,11 @@ public void write(Record record) {
             log.info("kvkey {}", keyValue.getKey());
             log.info("kvvalue {}", keyValue.getValue());
         }
-        log.info("value {}", record.getValue());
-        log.info("value schema type {}", record.getValue().getSchemaType());
-        log.info("value native object {} class {}", record.getValue().getNativeObject(), record.getValue().getNativeObject().getClass());
+
+        final GenericObject value = record.getValue();
+        log.info("value {}", value);
+        log.info("value schema type {}", value.getSchemaType());
+        log.info("value native object {} class {}", value.getNativeObject(), value.getNativeObject().getClass());
 
         String expectedSchemaDefinition = record.getProperties().getOrDefault("expectedSchemaDefinition", "");
         log.info("schemaDefinition {}", record.getSchema().getSchemaInfo().getSchemaDefinition());
@@ -77,7 +83,9 @@ public void write(Record record) {
         if (!expectedSchemaDefinition.isEmpty()) {
             String schemaDefinition = record.getSchema().getSchemaInfo().getSchemaDefinition();
             if (!expectedSchemaDefinition.equals(schemaDefinition)) {
-                throw new RuntimeException("Unexpected schema definition " + schemaDefinition + " is not " + expectedSchemaDefinition);
+                final String message = String.format(
+                        "Unexpected schema definition %s is not %s", schemaDefinition, expectedSchemaDefinition);
+                throw new RuntimeException(message);
             }
         }
 
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestLoggingSink.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestLoggingSink.java
index e6c7aa53874aa..f5cbd109bfa41 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestLoggingSink.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestLoggingSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
index 5809cc7c6946b..0b4577c44ff7d 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestPropertySource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,13 +18,12 @@
  */
 package org.apache.pulsar.tests.integration.io;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.pulsar.functions.api.Record;
 import org.apache.pulsar.io.core.Source;
 import org.apache.pulsar.io.core.SourceContext;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class TestPropertySource implements Source {
 
     @Override
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSink.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSink.java
index d1d074065e3cf..ce5e86c7cdeda 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSink.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSink.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,13 +18,12 @@
  */
 package org.apache.pulsar.tests.integration.io;
 
+import java.nio.ByteBuffer;
+import java.util.Map;
 import org.apache.pulsar.functions.api.Record;
 import org.apache.pulsar.io.core.Sink;
 import org.apache.pulsar.io.core.SinkContext;
 
-import java.nio.ByteBuffer;
-import java.util.Map;
-
 public class TestStateSink implements Sink {
 
     private SinkContext sinkContext;
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSource.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSource.java
index ebbd8097b21cb..0a718b80af360 100644
--- a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSource.java
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/TestStateSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,16 +18,14 @@
  */
 package org.apache.pulsar.tests.integration.io;
 
+import java.nio.ByteBuffer;
+import java.util.Map;
 import org.apache.pulsar.functions.api.Record;
 import org.apache.pulsar.io.core.Source;
 import org.apache.pulsar.io.core.SourceContext;
 
-import java.nio.ByteBuffer;
-import java.util.Map;
-
 public class TestStateSource implements Source {
 
-
     private SourceContext sourceContext;
     private int count;
 
diff --git a/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/package-info.java b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/package-info.java
new file mode 100644
index 0000000000000..1f9797a80334f
--- /dev/null
+++ b/tests/docker-images/java-test-functions/src/main/java/org/apache/pulsar/tests/integration/io/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.io;
diff --git a/tests/docker-images/java-test-image/Dockerfile b/tests/docker-images/java-test-image/Dockerfile
index 26d0609917cdc..5e5a0ca068689 100644
--- a/tests/docker-images/java-test-image/Dockerfile
+++ b/tests/docker-images/java-test-image/Dockerfile
@@ -61,12 +61,13 @@ RUN apt-get install -y supervisor procps curl less netcat dnsutils iputils-ping
 
 RUN mkdir -p /var/log/pulsar \
     && mkdir -p /var/run/supervisor/ \
-    && mkdir -p /pulsar/ssl
+    && mkdir -p /pulsar/certificate-authority
 
 COPY target/conf /etc/supervisord/conf.d/
 RUN mv /etc/supervisord/conf.d/supervisord.conf /etc/supervisord.conf
 
-COPY target/ssl /pulsar/ssl/
+# TLS certificates
+COPY target/certificate-authority /pulsar/certificate-authority/
 
 COPY target/java-test-functions.jar /pulsar/examples/
 
diff --git a/tests/docker-images/java-test-image/pom.xml b/tests/docker-images/java-test-image/pom.xml
index 9ef4db7809136..9ed363827b99d 100644
--- a/tests/docker-images/java-test-image/pom.xml
+++ b/tests/docker-images/java-test-image/pom.xml
@@ -124,8 +124,8 @@
                       false
                     
                     
-                      ${project.basedir}/../latest-version-image/ssl
-                      ssl
+                      ${project.basedir}/../../certificate-authority
+                      certificate-authority
                       false
                     
                     
diff --git a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoChannelHandler.java b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoChannelHandler.java
index c12c2d4afca38..05bf0c715a4b8 100644
--- a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoChannelHandler.java
+++ b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoChannelHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoProtocolHandler.java b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoProtocolHandler.java
index 56e80e399c05b..dfb072a207803 100644
--- a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoProtocolHandler.java
+++ b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/EchoProtocolHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/LoggingBrokerInterceptor.java b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/LoggingBrokerInterceptor.java
index 18c73d21abc59..992c6dd69a6b2 100644
--- a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/LoggingBrokerInterceptor.java
+++ b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/LoggingBrokerInterceptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/PatternEntryFilter.java b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/PatternEntryFilter.java
index 43d08bcdd22a2..253556ef35aa1 100644
--- a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/PatternEntryFilter.java
+++ b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/PatternEntryFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/RandomAdditionalServlet.java b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/RandomAdditionalServlet.java
index e924040700ae8..9d4f7e18a6db8 100644
--- a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/RandomAdditionalServlet.java
+++ b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/RandomAdditionalServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/package-info.java b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/package-info.java
index b665e7c094f35..dff75c6d0048d 100644
--- a/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/package-info.java
+++ b/tests/docker-images/java-test-plugins/src/main/java/org/apache/pulsar/tests/integration/plugins/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/docker-images/latest-version-image/Dockerfile b/tests/docker-images/latest-version-image/Dockerfile
index b23e35a2e5d61..f0093fa1eafc5 100644
--- a/tests/docker-images/latest-version-image/Dockerfile
+++ b/tests/docker-images/latest-version-image/Dockerfile
@@ -66,19 +66,12 @@ RUN rm -rf /var/lib/apt/lists/* && apt update
 
 RUN apt-get clean && apt-get update && apt-get install -y supervisor vim procps curl
 
-RUN mkdir -p /var/log/pulsar && mkdir -p /var/run/supervisor/ && mkdir -p /pulsar/ssl
+RUN mkdir -p /var/log/pulsar && mkdir -p /var/run/supervisor/
 
 COPY conf/supervisord.conf /etc/supervisord.conf
 COPY conf/global-zk.conf conf/local-zk.conf conf/bookie.conf conf/broker.conf conf/functions_worker.conf \
      conf/proxy.conf conf/presto_worker.conf conf/websocket.conf /etc/supervisord/conf.d/
 
-COPY ssl/ca.cert.pem ssl/broker.key-pk8.pem ssl/broker.cert.pem \
-     ssl/admin.key-pk8.pem ssl/admin.cert.pem \
-     ssl/user1.key-pk8.pem ssl/user1.cert.pem \
-     ssl/proxy.key-pk8.pem ssl/proxy.cert.pem \
-     ssl/superproxy.key-pk8.pem ssl/superproxy.cert.pem \
-     /pulsar/ssl/
-
 COPY scripts/init-cluster.sh scripts/run-global-zk.sh scripts/run-local-zk.sh \
      scripts/run-bookie.sh scripts/run-broker.sh scripts/run-functions-worker.sh scripts/run-proxy.sh scripts/run-presto-worker.sh \
      scripts/run-standalone.sh scripts/run-websocket.sh \
@@ -101,6 +94,10 @@ COPY target/java-test-functions.jar /pulsar/examples/
 # copy go test examples
 COPY --from=pulsar-function-go /go/bin /pulsar/examples/go-examples
 
+# TLS certificates
+RUN mkdir -p /pulsar/certificate-authority
+COPY target/certificate-authority /pulsar/certificate-authority/
+
 # copy broker plugins
 COPY target/plugins/ /pulsar/examples/
 
diff --git a/tests/docker-images/latest-version-image/pom.xml b/tests/docker-images/latest-version-image/pom.xml
index 06ba2c2264760..b7c3ed630a2ad 100644
--- a/tests/docker-images/latest-version-image/pom.xml
+++ b/tests/docker-images/latest-version-image/pom.xml
@@ -119,6 +119,23 @@
                   
                 
               
+              
+                copy-pulsar-certificate-authority
+                generate-resources
+                
+                  copy-resources
+                
+                
+                  ${project.build.directory}/certificate-authority
+                  true
+                  
+                    
+                      ${project.basedir}/../../certificate-authority
+                      false
+                    
+                  
+                
+              
             
           
           
diff --git a/tests/docker-images/latest-version-image/ssl/admin.cert.pem b/tests/docker-images/latest-version-image/ssl/admin.cert.pem
deleted file mode 100644
index 0665edbdc126c..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/admin.cert.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZTCCAk2gAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwETEPMA0GA1UEAwwGZm9v
-YmFyMCAXDTE4MDYyMjA4NTcwNloYDzIyOTIwNDA2MDg1NzA2WjAQMQ4wDAYDVQQD
-DAVhZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJw3Jfbn0xkW
-36kqQjES6Hn+YTZ2jXS5Co2MzsGBsIY0qJ2BbWHSSaMrja4IERUaCQp16SWxPmZ0
-srMm6ErDoap+O70CWXLT3ybYMV5aVwv3ca4uxsedzaw9MpFXfUDsJJ3yre1JpO+t
-A/QzJEGq1d6NN49InUP5kB1Rpay3vaxx8hduzqTO+E/Lptv92p6GjOpXi2icSjiA
-pgaan2ldGGKEKv2Sc2bfdIDkTq1yDyNmuPET0yD2dci106EW/mPyj81umPKG/o4K
-5W18yG/IhXw5W1zlgO1fWCuqva8NCBdu7s1c7hUX8DBx7km4/I7dllz/nYHIfCEQ
-Dmj38oQjYk8CAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIF
-oDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgQ2xpZW50IENlcnRp
-ZmljYXRlMB0GA1UdDgQWBBQTMzAAOJ9gXvQSS7Be3+qmrb1kVDAfBgNVHSMEGDAW
-gBRXC+nLI+i/Rz5Qej9FfqEYQ50VJzAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4ICAQAwy8f6hsG0
-85e3SOIztbUnaVxS7wzDeDzR3vCjpXpm4vTToYzN9zx3JHKSdJrB12emVxItwW/7
-bXqBk0n2EdQjRHCuebnY05eFMNGagMEEMVmSLOproQD7VsyALNxCss1JAyRikh70
-W7wgOVeAhqE53UqqrkzTE7Q+8Bag9t3FytHxApY17XglbWkiVcFpQwSURe9Emi3E
-aCJCryGJXrBNuCFXGzetSygDEy27+2FeH8S2XsMwUEGLqDDehzvMenVz1xjXtq+s
-KPkofAde52NHd4lLkSeBMSFnKe3V7Xxax2OEUsoQRF3bkbpcJSWsKS9ZAA2yrtuy
-Nz/aA1F42LuSFPAYQr1kcZ8eSS918RWz+BiJYU2JuUOPd1XUmJXVvZ4CJurWaC7+
-ZD51YdD8E245xd55fsA6/qLx3eE/Kp0dVq+Hxuz6b4yLET0zkGunOe4A3hnRgkOA
-XolXCL+VthhWtFGXn8CjpxDnzjahq69Io+dINehqd5aJEgvnHZIK2s7FTqqBBodU
-HhyAE94f64z7ziuRhEG54bmBF+MoGyPf6dVn1Mp3+o+YeQ5q6XlKgh+u8jMgmqRO
-ikdsVdMqopt/FXh9eFzvQrwOZFLK6JE/edUgb6xvS1jMF5zi2lIlIkq1RBQOr4HT
-XDwX4vRtfpDxpsetGVpeq9O07fbMvp+mkw==
------END CERTIFICATE-----
diff --git a/tests/docker-images/latest-version-image/ssl/admin.key-pk8.pem b/tests/docker-images/latest-version-image/ssl/admin.key-pk8.pem
deleted file mode 100644
index 6aaa22c44d746..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/admin.key-pk8.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcNyX259MZFt+p
-KkIxEuh5/mE2do10uQqNjM7BgbCGNKidgW1h0kmjK42uCBEVGgkKdeklsT5mdLKz
-JuhKw6Gqfju9Ally098m2DFeWlcL93GuLsbHnc2sPTKRV31A7CSd8q3tSaTvrQP0
-MyRBqtXejTePSJ1D+ZAdUaWst72scfIXbs6kzvhPy6bb/dqehozqV4tonEo4gKYG
-mp9pXRhihCr9knNm33SA5E6tcg8jZrjxE9Mg9nXItdOhFv5j8o/Nbpjyhv6OCuVt
-fMhvyIV8OVtc5YDtX1grqr2vDQgXbu7NXO4VF/Awce5JuPyO3ZZc/52ByHwhEA5o
-9/KEI2JPAgMBAAECggEAP+Ipq2Q4puz8wGBgu1LhMWp+9Nfcl1xI3YQ01VulBe0o
-+2h/g96McKcSBJaV7cw84ENB+kEWpK2amrsRiemhBmkjIvOAAv50Jp2I6u4E5Qbn
-PXUxo1Z8UrCgKmHd/hvUCafByuUwBzf5AvebHyOu3JlhnD302mSHtAW8u/pUHd3D
-sxJaw1zwQvmlD5ryM2IVYSji7NYCXF0H6V7HfyohTCrQFEWEAdqEDcFR1BUwbPCE
-raq7sAiEy+cBUnfV3IOEAffOZy0vSR90/WwERcwrzCdZmpWpTqtbcqtdBPqsSQzX
-shDvXd0e43+FSJzCtQsSQ8WzIrp3rgKJUDA1pJQW4QKBgQDJdTcB6qZz8r+4q9gc
-q1KAJyMy01Vio1yaqYzXr0C9Z5FW1GhL+4fwer2y9JyD45sb/lP4reFj9S193BNR
-C8cdxM5GrWEpzaQ0Dt1s8P1UbU8G6r4NqwI6ORF3CxXZKfXivQcgqBurJGrBdjIC
-NwqAzSkX5flBbhfTlJuUH87k3wKBgQDGgjzdIWXab7FZfdUzzrtEwNooBiSEFixm
-UAwP5sxL8VkM9wzAKPEVDDQBBoKIga9OESif4S9UUo4tu65AYfxF9Om26K4QrVj8
-HT/U+lfT7xFmPd/GINIbeTSmW0w7Ehpj8SbcQI4Sb2lVE562FlHh7QbHZd0/X/2J
-nbgT9MRAkQKBgQCVPAN3o/+SPOzRPFtnQXJoBJYKfIrv+twKpjbzP5vRsvrzO33X
-a4kUF5iXDKU0/lJUtl42BXjFt0Xvyit1CiiCYNv9d0pW0UMmXSyiGxNOi3rTQOlw
-7pFD2Cqb6NZSfMbtI+I3ytBUQzHiBlCdW3CoYVJjpbSzR37W+WsWm0mEOQKBgQCq
-ANObFYUjA1DBMZCrY7rhcL/kUw5myI6RuK/71k7UIwd+oP0cfHOq8N6AmlCkE1xM
-4UkHU1SzRFhbNkZPARuJ1etqJ+8afTqd/3axMQyShkVCaG8CQQ1vVegPKFUqqaBM
-QzRioC6L/zoYEEt16buKXvHVRpmqMszxVE9XV+HS4QKBgDvs5qloOowS5kcWInrj
-yecu5MJvFf2IZpMw7EiKV8VUPeKaiUlqgFj9d9cotUIMauXgBq6f5NBRg7Ike60t
-/JJrPtqXY+gdFLjxcKMUVYhomFlQYYg/RJZUBrtkyKBP68abopCYmb59r3ixeNNf
-qA1F36mmFtzdjSdtH/dTTecN
------END PRIVATE KEY-----
diff --git a/tests/docker-images/latest-version-image/ssl/broker.cert.pem b/tests/docker-images/latest-version-image/ssl/broker.cert.pem
deleted file mode 100644
index b5c7a5dc709a1..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/broker.cert.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEkDCCAnigAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwETEPMA0GA1UEAwwGZm9v
-YmFyMCAXDTE4MDYyMjA4NTUzMloYDzIyOTIwNDA2MDg1NTMyWjAjMSEwHwYDVQQD
-DBhicm9rZXIucHVsc2FyLmFwYWNoZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDQouKhZah4hMCqmg4aS5RhQG/Y1gA+yP9DGF9mlw35tfhfWs63
-EvNjEK4L/ZWSEV45L/wc6YV14RmM6bJ0V/0vXo4xmISbqptND/2kRIspkLZQ5F0O
-OQXVicqZLOc6igZQhRg8ANDYdTJUTF65DqauX4OJt3YMhF2FSt7jQtlj06IQBa01
-+ARO9OotMJtBY+vIU5bV6JydfgkhQH9rIDI7AMeY5j02gGkJJrelfm+WoOsUez+X
-aqTN3/tF8+MBcFB3G04s1qc2CJPJM3YGxvxEtHqTGI14t9J8p5O7X9JHpcY8X00s
-bxa4FGbKgfDobbkJ+GgblWCkAcLN95sKTqtHAgMBAAGjgd0wgdowCQYDVR0TBAIw
-ADARBglghkgBhvhCAQEEBAMCBkAwMwYJYIZIAYb4QgENBCYWJE9wZW5TU0wgR2Vu
-ZXJhdGVkIFNlcnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUaxFvJrkEGqk8azTA
-DyVyTyTbJAIwQQYDVR0jBDowOIAUVwvpyyPov0c+UHo/RX6hGEOdFSehFaQTMBEx
-DzANBgNVBAMMBmZvb2JhcoIJANfih0+geeIMMA4GA1UdDwEB/wQEAwIFoDATBgNV
-HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAgEA35QDGclHzQtHs3yQ
-ZzNOSKisg5srTiIoQgRzfHrXfkthNFCnBzhKjBxqk3EIasVtvyGuk0ThneC1ai3y
-ZK3BivnMZfm1SfyvieFoqWetsxohWfcpOSVkpvO37P6v/NmmaTIGkBN3gxKCx0QN
-zqApLQyNTM++X3wxetYH/afAGUrRmBGWZuJheQpB9yZ+FB6BRp8YuYIYBzANJyW9
-spvXW03TpqX2AIoRBoGMLzK72vbhAbLWiCIfEYREhbZVRkP+yvD338cWrILlOEur
-x/n8L/FTmbf7mXzHg4xaQ3zg/5+0OCPMDPUBE4xWDBAbZ82hgOcTqfVjwoPgo2V0
-fbbx6redq44J3Vn5d9Xhi59fkpqEjHpX4xebr5iMikZsNTJMeLh0h3uf7DstuO9d
-mfnF5j+yDXCKb9XzCsTSvGCN+spmUh6RfSrbkw8/LrRvBUpKVEM0GfKSnaFpOaSS
-efM4UEi72FRjszzHEkdvpiLhYvihINLJmDXszhc3fCi42be/DGmUhuhTZWynOPmp
-0N0V/8/sGT5gh4fGEtGzS/8xEvZwO9uDlccJiG8Pi+aO0/K9urB9nppd/xKWXv3C
-cib/QrW0Qow4TADWC1fnGYCpFzzaZ2esPL2MvzOYXnW4/AbEqmb6Weatluai64ZK
-3N2cGJWRyvpvvmbP2hKCa4eLgEc=
------END CERTIFICATE-----
diff --git a/tests/docker-images/latest-version-image/ssl/broker.key-pk8.pem b/tests/docker-images/latest-version-image/ssl/broker.key-pk8.pem
deleted file mode 100644
index 2b51d015b8ace..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/broker.key-pk8.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDQouKhZah4hMCq
-mg4aS5RhQG/Y1gA+yP9DGF9mlw35tfhfWs63EvNjEK4L/ZWSEV45L/wc6YV14RmM
-6bJ0V/0vXo4xmISbqptND/2kRIspkLZQ5F0OOQXVicqZLOc6igZQhRg8ANDYdTJU
-TF65DqauX4OJt3YMhF2FSt7jQtlj06IQBa01+ARO9OotMJtBY+vIU5bV6Jydfgkh
-QH9rIDI7AMeY5j02gGkJJrelfm+WoOsUez+XaqTN3/tF8+MBcFB3G04s1qc2CJPJ
-M3YGxvxEtHqTGI14t9J8p5O7X9JHpcY8X00sbxa4FGbKgfDobbkJ+GgblWCkAcLN
-95sKTqtHAgMBAAECggEBALE1eMtfnk3nbAI74bih84D7C0Ug14p8jJv/qqBnsx4j
-WrgbWDMVrJa7Rym2FQHBMMfgIwKnso0iSeJvaPz683j1lk833YKe0VQOPgD1m0IN
-wV1J6mQ3OOZcKDIcerY1IBHqSmBEzR7dxIbnaxlCAX9gb0hdBK6zCwA5TMG5OQ5Y
-3cGOmevK5i2PiejhpruA8h7E48P1ATaGHUZif9YD724oi6AcilQ8H/DlOjZTvlmK
-r4aJ30f72NwGM8Ecet5CE2wyflAGtY0k+nChYkPRfy54u64Z/T9B53AvneFaj8jv
-yFepZgRTs2cWhEl0KQGuBHQ4+IeOfMt2LebhvjWW8YkCgYEA7BXVsnqPHKRDd8wP
-eNkolY4Fjdq4wu9ad+DaFiZcJuv7ugr+Kplltq6e4aU36zEdBYdPp/6KM/HGE/Xj
-bo0CELNUKs/Ny9H/UJc8DDbVEmoF3XGiIbKKq1T8NTXTETFnwrGkBFD8nl7YTsOF
-M4FZmSok0MhhkpEULAqxBS6YpQsCgYEA4jxM1egTVSWjTreg2UdYo2507jKa7maP
-PRtoPsNJzWNbOpfj26l3/8pd6oYKWck6se6RxIUxUrk3ywhNJIIOvWEC7TaOH1c9
-T4NQNcweqBW9+A1x5gyzT14gDaBfl45gs82vI+kcpVv/w2N3HZOQZX3yAUqWpfw2
-yw1uQDXtgDUCgYEAiYPWbBXTkp1j5z3nrT7g0uxc89n5USLWkYlZvxktCEbg4+dP
-UUT06EoipdD1F3wOKZA9p98uZT9pX2sUxOpBz7SFTEKq3xQ9IZZWFc9CoW08aVat
-V++FsnLYTa5CeXtLsy6CGTmLTDx2xrpAtlWb+QmBVFPD8fmrxFOd9STFKS0CgYAt
-6ztVN3OlFqyc75yQPXD6SxMkvdTAisSMDKIOCylRrNb5f5baIP2gR3zkeyxiqPtm
-3htsHfSy67EtXpP50wQW4Dft2eLi7ZweJXMEWFfomfEjBeeWYAGNHHe5DFIauuVZ
-2WexDEGqNpAlIm0s7aSjVPrn1DHbouOkNyenlMqN+QKBgQDVYVhk9widShSnCmUA
-G30moXDgj3eRqCf5T7NEr9GXD1QBD/rQSPh5agnDV7IYLpV7/wkYLI7l9x7mDwu+
-I9mRXkyAmTVEctLTdXQHt0jdJa5SfUaVEDUzQbr0fUjkmythTvqZ809+d3ELPeLI
-5qJ7jxgksHWji4lYfL4r4J6Zaw==
------END PRIVATE KEY-----
diff --git a/tests/docker-images/latest-version-image/ssl/ca.cert.pem b/tests/docker-images/latest-version-image/ssl/ca.cert.pem
deleted file mode 100644
index 0446700135d39..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/ca.cert.pem
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFCDCCAvCgAwIBAgIJANfih0+geeIMMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV
-BAMMBmZvb2JhcjAeFw0xODA2MjIwODQ2MjFaFw0zODA2MTcwODQ2MjFaMBExDzAN
-BgNVBAMMBmZvb2JhcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOVU
-UpTPeXCeyfUiQS824l9s9krZd4R6TA4D97eQ9EWm2D7ppV4gPApHO8j5f+joo/b6
-Iso4aFlHpJ8VV2a5Ol7rjQw43MJHaBgwDxB1XWgsNdfoI7ebtp/BWg2nM3r8wm+Z
-gKenf9d1/1Ol+6yFUehkLkIXUvldiVegmmje8FnwhcDNE1eTrh66XqSJXEXqgBKu
-NqsoYcVak72OyOO1/N8CESoSdyBkbSiH5vJyo0AUCjn7tULga7fxojmqBZDog9Pg
-e5Fi/hbCrdinbxBrMgIxQ7wqXw2sw6iOWu4FU8Ih/CuF4xaQy2YP7MEk4Ff0LCY0
-KMhFMWU7550r/fz/C2l7fKhREyCQPa/bVE+dfxgZ/gCZ+p7vQ154hCCjpd+5bECv
-SN1bcVIPG6ngQu4vMXa7QRBi/Od40jSVGVJXYY6kXvrYatad7035w2GGGGkvMsQm
-y53yh4tqQfH7ulHqB0J5LebTQRp6nRizWigVCLjNkxJYI+Dj51qvT1zdyWEegKr1
-CthBfYzXlfjeH3xri1f0UABeC12n24Wkacd9af7zs7S3rYntEK444w/3fB0F62Lh
-SESfMLAmUH0dF5plRShrFUXz23nUeS8EYgWmnGkpf/HDzB67vdfAK0tfJEtmmY78
-q06OSgMr+AOOqaomh4Ez2ZQG592bS71G8MrE7r2/AgMBAAGjYzBhMB0GA1UdDgQW
-BBRXC+nLI+i/Rz5Qej9FfqEYQ50VJzAfBgNVHSMEGDAWgBRXC+nLI+i/Rz5Qej9F
-fqEYQ50VJzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
-9w0BAQsFAAOCAgEAYd2PxdV+YOaWcmMG1fK7CGwSzDOGsgC7hi4gWPiNsVbz6fwQ
-m5Ac7Zw76dzin8gzOPKST7B8WIoc7ZWrMnyh3G6A3u29Ec8iWahqGa91NPA3bOIl
-0ldXnXfa416+JL/Q5utpiV6W2XDaB53v9GqpMk4rOTS9kCFOiuH5ZU8P69jp9mq6
-7pI/+hWFr+21ibmXH6ANxRLd/5+AqojRUYowAu2997Z+xmbpwx/2Svciq3LNY/Vz
-s9DudUHCBHj/DPgNxsEUt8QNohjQkRbFTY0a1aXodJ/pm0Ehk2kf9KwYYYduR7ak
-6UmPIPrZg6FePNahxwMZ0RtgX7EXmpiiIH1q9BsulddWkrFQclevsWO3ONQVrDs2
-gwY0HQuCRCJ+xgS2cyGiGohW5MkIsg1aI0i0j5GIUSppCIYgirAGCairARbCjhcx
-pbMe8RTuBhCqO3R2wZ0wXu7P7/ArI/Ltm1dU6IeHUAUmeneVj5ie0SdA19mHTS2o
-lG77N0jy6eq2zyEwJE6tuS/tyP1xrxdzXCYY7f6X9aNfsuPVQTcnrFajvDv8R6uD
-YnRStVCdS6fZEP0JzsLrqp9bgLIRRsiqsVVBCgJdK1I/X59qk2EyCLXWSgk8T9XZ
-iux8LlPpskt30YYt1KhlWB9zVz7k0uYAwits5foU6RfCRDPAyOa1q/QOXk0=
------END CERTIFICATE-----
diff --git a/tests/docker-images/latest-version-image/ssl/proxy.cert.pem b/tests/docker-images/latest-version-image/ssl/proxy.cert.pem
deleted file mode 100644
index 6c2f4295c9dbd..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/proxy.cert.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZTCCAk2gAwIBAgICEAMwDQYJKoZIhvcNAQELBQAwETEPMA0GA1UEAwwGZm9v
-YmFyMCAXDTE4MDYyNTEzNTYwNFoYDzIyOTIwNDA5MTM1NjA0WjAQMQ4wDAYDVQQD
-DAVwcm94eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMieX78Yj8OW
-eBHAneRaCCoO8Qrpj8zGo7h9lCdmi1lBDh1uR2sDbotiHGfJzQn836WcYmyeAvfn
-qvgr9HCXmXdLgmJ3GT/LVu5GEm6msSDiZQPr9so5lQVioisK4UwJROQsE/J52cyR
-9o3H6M4FKb6QpoobKa62fSfTumwwulaYaDJuRRGoGIkcRuUQ59EWAaDkD3IcDpAn
-9mTbnE4Iz+JxSrsZ5DJ3X/m/AqyLWtj6GAfyK9a1dhNdlf2x4JZT1QNtojiBXt95
-OIZyRBNbHMFniq5gel6wdBkmJWutfcTct7wKa2LCxLpKoDIc1HWoL3+RUzOKxYIP
-0qXEQ3bmONkCAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIF
-oDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgQ2xpZW50IENlcnRp
-ZmljYXRlMB0GA1UdDgQWBBSgsgfmDbXEkrrpHUC9GnDDjxaKizAfBgNVHSMEGDAW
-gBRXC+nLI+i/Rz5Qej9FfqEYQ50VJzAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4ICAQB+uZ2OWR+G
-sRqYHEeVqUI8G2p8Np8eC/onGpBL8Gj9SGxIQcIPtqHPUlCe9fd/96JOptOGRYEB
-BmUCaCmQ4IgMW6e6fArka5IB4XXIgHFXyQ6ImTvjDavzlVw06zn9S4dLwVzsRBg+
-GS9svtq23W+f5rEN5N+7LhtcbclfiG4VCCqDG5VhkzEok+SRamDI8rDRZtodMw0O
-/+L+xaaQPUPjX8KUlKn4uVpCDbxUzHonlCPzbkHHm5su0D4ysjJIy3/y3yow6JE/
-02L7PZkmkmw3/V+84T3X8/GD15sVUv/3v1gXEBxYwAs+RNTJ0APvMEMSvCq0AMfF
-bPMZBuAGNBG7lv7TovzHgGFKXT7du5OFF/qjAsEffhbo224CB96fgwvvndwHHBFh
-J06BvHZG1i9dDVhUKoB1owkWrE4RZv2ZKEtZYgizzSmzZRHtARo0t1Byc5djx1tX
-TkJOHshNqJZOY1ER0DPaVQgKI+PRTbEdj/xPGRX3ebSqDmilAfPXshqgElfch6Yl
-f2V58TyCnjXOibvkG9D5OyCdWLEECumOZgYar0KZgNfrvTOi1OKXnX1fsbh29fWA
-ICZRcdmjkz79zQXY2SuzCWlskuXPKAmW1AMqs+l6ormmKfzIUx3Yriy4LqIIYY1v
-uQD5vghZmd9HUg2KaXfSGD9stGCD8KhntA==
------END CERTIFICATE-----
diff --git a/tests/docker-images/latest-version-image/ssl/proxy.key-pk8.pem b/tests/docker-images/latest-version-image/ssl/proxy.key-pk8.pem
deleted file mode 100644
index 70e0107f2741f..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/proxy.key-pk8.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDInl+/GI/DlngR
-wJ3kWggqDvEK6Y/MxqO4fZQnZotZQQ4dbkdrA26LYhxnyc0J/N+lnGJsngL356r4
-K/Rwl5l3S4Jidxk/y1buRhJuprEg4mUD6/bKOZUFYqIrCuFMCUTkLBPyednMkfaN
-x+jOBSm+kKaKGymutn0n07psMLpWmGgybkURqBiJHEblEOfRFgGg5A9yHA6QJ/Zk
-25xOCM/icUq7GeQyd1/5vwKsi1rY+hgH8ivWtXYTXZX9seCWU9UDbaI4gV7feTiG
-ckQTWxzBZ4quYHpesHQZJiVrrX3E3Le8CmtiwsS6SqAyHNR1qC9/kVMzisWCD9Kl
-xEN25jjZAgMBAAECggEAJJyCbKVW1yLGlrbIGbw0cTh41Lz6+SvnBOwl9WrJU2iD
-4usVLXpa2iT1ehthx8jWJ6r6a0gK0qL8mH2tBj8kSpkFGmMRwIqjOqifBIJ3IMEw
-Hh8Z0p3fjDQL1D8QDohCgkFpAn8qOCMLE6S/35khnR1Yxytd1/yFqpcBFm1uFA85
-dYisjPqWm/IZIU5rH0zgKAIhtvl9abnoi93443EHsKpRAW1gwRXx9Aak7TV768bZ
-tELBsaTnXnNzamDiaimmxEOlqR9O0W8JE/31KFL26JcVmsTRG7sMpoUxCEMjOuGZ
-J30bXFZUW6NrDpFsQ7uTqD6TNn2971N8KFCLnC/JYQKBgQDo82axC7L7n7BYTu18
-dupeT7n5dTBD/I3l0KtT05xiZA8GZr2i+pt+/aWzCzK4/Ee4jb4/o8CRQRB5v5mo
-c9lc+BaoAIQiwiw+aufT+UojrcijrOMEL5Zk3zdZ2rcEoAsVvqtejNnwLCGI9Rnl
-gp7n9oRhwDIv9Fu09snUougE3wKBgQDceAGKUB8pGd3eEya/0jU9J60LsKbcJSsN
-4v1S5LiPtHOyhr0g4x/LibMP2PJhG3tJ1bgpaGmn9du2D20M6ukRhIYyn/7G+N+A
-oqryyvO1MMYnhc4IEQvWrzDnBM0hV2bdjp4s/1ASVHVRwk8+orqxysIJ1D75nnRX
-Tyfl6HgBRwKBgQCfVlWIhiMPv6OkU6BXgRNAHTJs8f5okmgQqNF3jgequRwZ2c6e
-muIfU6myNNel9lGsZ6+Y4g4GjMWTMT4OHeewkrUUhv3atIwEyaT2tc5DZ0wUwF2r
-cE1jg9bdbB/BVyMd5YRcMOWlRNpPTq8+8EB3E4RrREZPzMmplyBohGFFawKBgGjc
-P0dM8nU3E1rj2wNTdPUAYQL1Y3fDyeWR+BEsLkhTeNAJ2/y/akkB1oQMGMRtMMee
-ejhfrBkyC+1dCu4g8PffA4EirihvCMcDF7HhK+cbKrRzpNobWXkj3GuU0ggwrQFm
-Kv+V87y0JRTdCZnuBkQ3/vBz3fwWDJnWUVC9sA5TAoGBAN4t2gJCZax5yInUgyWi
-Tgumb2qVWsGBBLMTKIsrkK/KphzgAhHcVhDCybA79TmIM2FfIlpf6TE7Mv4NI055
-ZJzHX+GMT5Czy2Ku9MJD3PLTFN5MjYb6g92fKViLDMI6fwzTHB8xPJ7Ob9bV2srS
-ZlmKNXTkZFk3/orK4WdCZufz
------END PRIVATE KEY-----
diff --git a/tests/docker-images/latest-version-image/ssl/superproxy.cert.pem b/tests/docker-images/latest-version-image/ssl/superproxy.cert.pem
deleted file mode 100644
index 9656e2c8ba0d2..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/superproxy.cert.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEajCCAlKgAwIBAgICEAQwDQYJKoZIhvcNAQELBQAwETEPMA0GA1UEAwwGZm9v
-YmFyMCAXDTE4MDYyNjEzMjUxN1oYDzIyOTIwNDEwMTMyNTE3WjAVMRMwEQYDVQQD
-DApzdXBlcnByb3h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA43Sn
-ys/h3wxJ/IBEzbJdQAKCxU4of5KgTDzFoOaS8C63Nwbjgy0qcWYdRDceP4lJIKSA
-1+JZ+R1opyrfVIC2D9oDJFIJTFfXy9G9VYDccwAONPgAamvRzBnYcEu8fqM+Ohle
-kZltKktAHnX3WtG3RyxEL5nYzlMlGwUXJu3Rxc9SlkYSxERzjWHikGqGmXLX2qB0
-k6oyxTrK+4+EHk3khbEIqyQZSOFbD7NMfnRy0CWFv/9T1shgjAIBCake6jY7lwaT
-S7JvbLfG6ABf5xHMxoWLXa2qwb+Ar43Ff9g8kKZwFOxMeGcwkzyJPBbWytFxaWn+
-R2RHhTaVCGc22CjdfQIDAQABo4HFMIHCMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEB
-BAQDAgWgMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBDbGllbnQg
-Q2VydGlmaWNhdGUwHQYDVR0OBBYEFHEgLhfH0Z1QlLxeQbG7YZyBlz1MMB8GA1Ud
-IwQYMBaAFFcL6csj6L9HPlB6P0V+oRhDnRUnMA4GA1UdDwEB/wQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggIBAK9q
-3YnEa99Cq3Vo3g6PE/A/xOE97seVNuavqyBcVv9PrTydb5XG4jPkYU3xOYXIc8rA
-A4gzd+AsGO9rjGMPGGjQJI3JO/3BCeBJMkn50C/rM1yWVMHnVyFcJlg16xaWtj1e
-2Jk8egJW2gSYyF+N2TdzI7tOb002GNr36posnqO+IOoLapyHFBxxUjsPDRoo8fJn
-myWsV1Y9oRUZyJlfIAJsu85ew7gDBY2jaiEiopzour3uU3C0N7gYni2OmVwfr6J8
-R2/Jp43BSD5sYOW9RAJIEEXef+InYtz9HTJvKu2LsWwIBkaztk29tJcDE+1La6Sw
-0dF0YkUwnXoGQFjiV+8pXX3TF5glXKj1rU8WfNazF6lqslB6DmdgR3/FQ6Z2sE86
-d9hVtayZIGlzU0rWmBBtr++7Wo88nmzAtd/xbZMFG8U//+Q2AvJT2oVGtqM48+al
-rnsN/gYrLDr7RC14bHIuO1v6ZL/rAi7SPKrKYAyQVTAcRuW516SxxR6S1Xa1ITnh
-rwgKg13eQuwu3iigguIS9XL6nAXabBIxBxMl6o2YlyIPekKYIcQmpqhkavJ6VOgX
-iq9VdY6fIJVfmxNZuwM3/28k7UeUAfhI2SSVH4ZURbPiGGH2wukc1QkmtZ2cNa35
-C1y79aqJbIa3ErqLFPj/fM+34x8L7QHPq6RfaODa
------END CERTIFICATE-----
diff --git a/tests/docker-images/latest-version-image/ssl/superproxy.key-pk8.pem b/tests/docker-images/latest-version-image/ssl/superproxy.key-pk8.pem
deleted file mode 100644
index 2e4140b8fb392..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/superproxy.key-pk8.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDjdKfKz+HfDEn8
-gETNsl1AAoLFTih/kqBMPMWg5pLwLrc3BuODLSpxZh1ENx4/iUkgpIDX4ln5HWin
-Kt9UgLYP2gMkUglMV9fL0b1VgNxzAA40+ABqa9HMGdhwS7x+oz46GV6RmW0qS0Ae
-dfda0bdHLEQvmdjOUyUbBRcm7dHFz1KWRhLERHONYeKQaoaZctfaoHSTqjLFOsr7
-j4QeTeSFsQirJBlI4VsPs0x+dHLQJYW//1PWyGCMAgEJqR7qNjuXBpNLsm9st8bo
-AF/nEczGhYtdrarBv4CvjcV/2DyQpnAU7Ex4ZzCTPIk8FtbK0XFpaf5HZEeFNpUI
-ZzbYKN19AgMBAAECggEBAM1JAwuD1drmj3wKFI8F1S2pVndXFCwXnP9RthiDIckO
-kKNkX0CMKgtQ20cu6+jyMgL5FaRCkWvJxCNkCU6OIENsQ3urYuL5QTWeZeBevhg4
-y5m43z8tcptgFD09zbEKCmaLcRO9wo3yfrs/QvE/58efxyajFs8YsZuSW5Px/msl
-AFN8qGY0q0lQbQPK8cPYT4OnW9isqEjkvHq1Q+ryv4cxsGWtBZYmJVeLVHzClihi
-lODdN6YsDcu9jLwsA8o2WSBRsbLHK6caW4FdEwgOLckc0EGGEU64VEB9ZOwgcwYQ
-M9mZDs2w7qk63YnDH4KmpoP0Oc8N+bG7Pkifd7f8HqECgYEA8esMQya6Qln4O7Qo
-aI8X9t5gCpq+bh/P+7vYdBR/9St5VtE/P0yuaQdT2e5t+Ei4ujqHvJ0GTPmqYIJf
-2DNvJMu8EnXv+nqKQCsyMc/nqQN1CcRGqZssH1V/ZIQLRUA0cN4hzE0eHITwp6U9
-vD/WaE3mKX/XHthIjc8hnuoajOkCgYEA8LIYMgyD3wClWOKe5TkBumI0KvA9tP90
-IFHu1wLNl0tKBpsXkzzxiav1FMX3K7B29vxukrs946KRESHzRg4c5ULPnMmwcQyx
-AortKJWrGVsna/QDWPRutXSN1XmnjKWsHmTpQQqLfaRvLW+Hd34+EVdVh9sVt/y9
-RucnBvxcX3UCgYBebm/U7pMaP2BkfcigN+sU1G0M9qaK+iQHkaXGehIQs62js/5K
-STZzjQawNR/8IPbqytodR/YjqflVvs6G6FzkMhrx4dORJLA+qB3pz8wP72eKLnGe
-1xF8EbWumNSFbbCKtkrfIuM0IriF2Dym9QxOnsnPPTXNtoNrx4TKMXu3sQKBgBq9
-noSI8WmoF7adTsvmnnOHj4YptKFUNCGXGLLYg+DII4xCVMct4SPLb+oD6Gb5Lu5X
-sy0oEkMk/3roy68/yCQMXSZtHeYhY9UFfD2jCyRBBUswC+MpHNeaAFv0LRIqIcoq
-qeNo+YBW8WcZ2fIDm3+vtTfntiz/rkOfUK2tAdI1AoGAL2LVDF5e1meSRocEoy8e
-gqrshrhg+KBqYmcjtd4Iup4WvR6uyH4qE9yFLLHFZ04pZzXLHcPfqgOSP8qTxgH3
-h0uqtcYmejS/yl6PbC9OPXcSkMgntRkTbU9Ug05ijfN9NRnW+8WXvi8Z6DKed1P1
-9PxwA75P9o0h00mMk8PQitQ=
------END PRIVATE KEY-----
diff --git a/tests/docker-images/latest-version-image/ssl/user1.cert.pem b/tests/docker-images/latest-version-image/ssl/user1.cert.pem
deleted file mode 100644
index 072f2867fe62b..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/user1.cert.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZTCCAk2gAwIBAgICEAUwDQYJKoZIhvcNAQELBQAwETEPMA0GA1UEAwwGZm9v
-YmFyMCAXDTE4MDYyNzA4NDAyNVoYDzIyOTIwNDExMDg0MDI1WjAQMQ4wDAYDVQQD
-DAV1c2VyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM5iqgr4PUUZ
-AW9MDGP5cBaSJALSPV63m6M/IoovrMWJ9CGtcQfZTUHwDorIlXgQ6H/KufmsHW0Y
-OQbChLSTDB14D0jSMtyv6+ibSoE1ZEl2SbB1miLd0P5AS9YmzzEW2+bx0zJORLYD
-PzJ1Nh3/kQlRs04IECki291WZiVRzX2JRoL7kMtOAoKJqQfsT14Oi9EAw39VhLeB
-uc/Mx6Jsutq/YdXakoZtQbfZka2MMfLXgMDLIPDqbU+09q7au2dq8RjGzrWnxnOX
-o/XQssrIbwzJJYASBsgAAtnAw7bPzCX6+cL6PZVRyiEZov0HKXyRyvrbQ5hyEMuS
-3dHqoKt0fKMCAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIF
-oDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgQ2xpZW50IENlcnRp
-ZmljYXRlMB0GA1UdDgQWBBQ7NSD6lx6Vq38cEoD5l7FHs1Ej8DAfBgNVHSMEGDAW
-gBRXC+nLI+i/Rz5Qej9FfqEYQ50VJzAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4ICAQC+cU7ctY7o
-eTW+oHTq9EGJUMwW1fOww4QDrHtgZT4OYkO88zxQV2Cr050p8eaV5dHXZBf9/bRV
-7hPNV5+HpQhb9TZ9xK2WRZ2QV7a/UDyUnksVKGSK9tNZMZPueOEB19e4bIBcgnQa
-5i9sgZr93na7pFOY7lBQy6gfaOcnejYHmvVqIGaZBVH8rkEsGhhkJxy7qkpFNKgf
-PGiIRo9L0WYqDCSiaICeCiteJwIfjsUFJKF0YnpXZq1kFfQscnleg60MWZAXvacp
-tAciE51Ow60cqQWER66iwqnBSPD4l91SxAaGQAmalgCioGsYSbojXcOvRidhYJ2T
-3YwCpqlC0qC9D2ZmNoukb1a0Pi03MuSJwD/8v9eqwEW9dFAzdnWDzTZMN9CfdjVh
-2qiO5o5Si/X1Dmjdk2F/EM62YJQBAlkZBetFJ0o2QPGTSD+zrpfITIW8Pu+/5zcC
-MZdzyUf0p1GO2Kn7wmqPQjz59zABagmxCNks8HeqPnzmWuADMaggb0nOmrBACE2x
-b9XR6/xaXpwTRf0h5N3evivzUHo6XVw8A3gVUNoBm9Of3PlAsjM4I4SWFb6nrwYv
-RnI04c+R95Su1fMc2wky0PmW+iWRTaEN/cUdX1SF6jo1nRLELGcbMSGUI6UI8kff
-crvCz7uLu7Lr5/CKnEm2bSCZ4eIQpOs4nQ==
------END CERTIFICATE-----
diff --git a/tests/docker-images/latest-version-image/ssl/user1.key-pk8.pem b/tests/docker-images/latest-version-image/ssl/user1.key-pk8.pem
deleted file mode 100644
index eec5c94c0665c..0000000000000
--- a/tests/docker-images/latest-version-image/ssl/user1.key-pk8.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOYqoK+D1FGQFv
-TAxj+XAWkiQC0j1et5ujPyKKL6zFifQhrXEH2U1B8A6KyJV4EOh/yrn5rB1tGDkG
-woS0kwwdeA9I0jLcr+vom0qBNWRJdkmwdZoi3dD+QEvWJs8xFtvm8dMyTkS2Az8y
-dTYd/5EJUbNOCBApItvdVmYlUc19iUaC+5DLTgKCiakH7E9eDovRAMN/VYS3gbnP
-zMeibLrav2HV2pKGbUG32ZGtjDHy14DAyyDw6m1PtPau2rtnavEYxs61p8Zzl6P1
-0LLKyG8MySWAEgbIAALZwMO2z8wl+vnC+j2VUcohGaL9Byl8kcr620OYchDLkt3R
-6qCrdHyjAgMBAAECggEBAK8J8QvytAxJg/T/+7ZC1PTfp1kZNGGDuaV/o2ytuIul
-T//MGQQ+IY8d6Ud9jX9SX84agxalCiP/mkYIbgK0gF7x94yccfTH433ZTxw8yzye
-7SqS41JU7K7mmysaqTkKGSFK0gNlbFMud8f0rxxMJ5dOypMQtZwd63lSkLlwIqcn
-YhKcAdXM4WGv07MFdwAXvrK2trhBBkCA08ZzyVy4lWE+cVfEkwH6O8EdGchl7g4U
-LqIkYzufQWKdH9frt6N3qEV/qs0s1qipVzV07GaPpEdK/G5exJ7NjZaXJkHOuMbt
-7ae1zJBexW41/++fjzsWSYljvSEphjqwrGYrr+tMGNECgYEA+Sg1sHcYO4Bg16qG
-c8XM9g8DFL396X4MnMh+AFrDV8dbdz39x9fFtpKEfqaAZrG6I8fW3RkMLsJvJ4GI
-KDJNz2ezEMbNKlXE9UzvAsrdvWNWDGJvrDu0CbJg2wtBeVEBIUYetSdNHoEwY7ZJ
-QHnwbxYYrUFIJ34rI0SQ17/Z4vsCgYEA1A27jYTWr86JmvjQDUiJcJsbhpa/6OzZ
-n3KTu0n0oCvl7uvvjUfhlzmcq7kyY0oO1C5TQHLiqBaI5hXw+iYwnESLIn7BwhMX
-dcxglvXx95h1NqHYX9GnURl2QtrjmuY5yx+itfmZCRkRPO3c5e9uZyf01CeE4uwl
-hDNh0RrSXHkCgYBvlQhmXQ+nJhk4vI+2LXFbCOISWfvqo562YDu9oOg22Xsm7cZH
-x2QuHXPk3GBInXOFLqwVHHCOSFlLUgFOLykVp5VUABRFz1+Dk86+a2fetywEI9lr
-QtmgNhiWQHY0BIkDA8ogytcIwEaRgUNQ8sswlK68eK39sc1T4BMV7D+CHQKBgG3g
-+8lWBwSsKgOCYBQx/P27caTo4mJosE99yG0o4jhI5ulJmiSEFbINqVAWM7TdQBfU
-NVFU9nuQybknr2l/dnrSzaG/Otk8mVBx6a7vnETm2/3GGV91PJS6c9wqnfu6xkGp
-j99piVH8ikEfI/KFgZi0TJnOLH6FTN9W3J3EnzJJAoGAE4ZLLi+2RP4ZYXI11CJC
-BSM1AEpqemgTUSidZyTiJJMGGrC7tyEba+4TIqeGgvD74p57XFbN7LOJWmnAiK8b
-BLhQqPgOCXqrna00GnNKKx7AzgYHqlq03tGlX858aH18rkSRVk3UhkTkGTSr3iQn
-aJeN/0HbpGr67bimf4bqlCY=
------END PRIVATE KEY-----
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 7b842bc58b0cc..aaa3a51dc6aa4 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -290,6 +290,27 @@
               1
             
           
+          
+            maven-resources-plugin
+            
+              
+                copy-pulsar-certificate-authority-resources
+                generate-test-resources
+                
+                  copy-resources
+                
+                
+                  ${project.build.testOutputDirectory}/certificate-authority
+                  
+                    
+                      ${project.parent.basedir}/certificate-authority
+                      false
+                    
+                  
+                
+              
+            
+          
         
       
     
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/admin/AdminTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/admin/AdminTest.java
index 3400b6962f982..86d4dbf23261c 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/admin/AdminTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/admin/AdminTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
index 462437f6f2031..e986c7e5c7b76 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java
index f252e29f140d5..2ada6b286d6c1 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java
index 4bb6194dc5eb7..5272334ddd35c 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_2.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_2.java
index e4eb9cd0cf216..212ac48b638de 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_2.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_3.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_3.java
index d4703e0b07e5c..cb0b30766acaa 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_3.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_3.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_4.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_4.java
index 10bb57e98885d..0a83cb88499a3 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_4.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_4.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_5.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_5.java
index 590f5acf3da04..5d64210ad0484 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_5.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/ClientTest2_5.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_2.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_2.java
index c7cedfc9f226c..cd5cba224c44d 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_2.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_3.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_3.java
index 83dbb1b1dd2b8..9834566d2edfc 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_3.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_3.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_4.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_4.java
index 21fa83df2c89e..eb36bbc4258fe 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_4.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_4.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_5.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_5.java
index 1a9450fea7470..fdcb6b37a4ff4 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_5.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/PulsarStandaloneTestSuite2_5.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_2.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_2.java
index 9312fa18f9258..944032e46ebf5 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_2.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.backwardscompatibility;
 
 import java.util.function.Supplier;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_3.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_3.java
index e85798429da20..68d9ce508aef7 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_3.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_3.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.backwardscompatibility;
 
 import java.util.function.Supplier;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_4.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_4.java
index 7cd6a1ab52a69..35525584f1237 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_4.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_4.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.backwardscompatibility;
 
 import java.util.function.Supplier;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_5.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_5.java
index 24914ef209002..3dd170fa5f1e8 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_5.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/backwardscompatibility/SmokeTest2_5.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.backwardscompatibility;
 
 import java.util.function.Supplier;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/AdminMultiHostTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/AdminMultiHostTest.java
index 781e920c89e0c..a6c996a2c75b9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/AdminMultiHostTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/AdminMultiHostTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/CLITest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/CLITest.java
index 8f667d5e69450..7e8f55429244b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/CLITest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/CLITest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -83,6 +83,7 @@ public void testGetTopicListCommand() throws Exception {
         final String namespace = "public/" + namespaceLocalName;
         assertEquals(0, result.getExitCode());
 
+        @Cleanup
         PulsarClient client = PulsarClient.builder().serviceUrl(pulsarCluster.getPlainTextServiceUrl()).build();
 
         final String persistentTopicName = TopicName.get(
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
index 9e3fba5f286d2..c61411ad150a1 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClusterMetadataTearDownTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClusterMetadataTearDownTest.java
index 2fe2bbb867b0d..fcbc27d4dedd8 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClusterMetadataTearDownTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClusterMetadataTearDownTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java
index 08f5e50a2d9d9..982313cfab77f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FileSystemPackagesCliTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java
index a207be0574dad..7b63498e6bb73 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/HealthCheckTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/HealthCheckTest.java
index 04e189e2765b1..9a3559f142480 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/HealthCheckTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/HealthCheckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java
index 2ed201d6c2ffb..b49bb21495511 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PackagesCliTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
index f87d11531dc3a..9a0865a0085fd 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java
index c5a785e3e7fff..cad899865acf5 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PulsarVersionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/SchemaUpdateStrategyTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/SchemaUpdateStrategyTest.java
index 4592dcf13c796..c1efee5b276ae 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/SchemaUpdateStrategyTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/SchemaUpdateStrategyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/tenant/TenantTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/tenant/TenantTest.java
index 0ae701194ba4b..4755af3f18b75 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/tenant/TenantTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/tenant/TenantTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.cli.tenant;
 
 import static org.testng.Assert.assertEquals;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/topicpolicies/SchemaCompatibilityStrategyTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/topicpolicies/SchemaCompatibilityStrategyTest.java
index 56d89d6b5028a..6166d77e5f131 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/topicpolicies/SchemaCompatibilityStrategyTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/topicpolicies/SchemaCompatibilityStrategyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.cli.topicpolicies;
 
 import static org.testng.Assert.assertEquals;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/compaction/TestCompaction.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/compaction/TestCompaction.java
index 9f07a83798f40..a66c01e443896 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/compaction/TestCompaction.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/compaction/TestCompaction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BKContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BKContainer.java
index b294cac4e701e..9ff48b2e6a161 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BKContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BKContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BrokerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BrokerContainer.java
index 07558ce890df1..e0e85af024bc2 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BrokerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/BrokerContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,8 +28,8 @@ public class BrokerContainer extends PulsarContainer {
     public static final String NAME = "pulsar-broker";
 
     public BrokerContainer(String clusterName, String hostName) {
-        super(
-            clusterName, hostName, hostName, "bin/run-broker.sh", BROKER_PORT, BROKER_HTTP_PORT);
+        super(clusterName, hostName, hostName, "bin/run-broker.sh", BROKER_PORT, BROKER_PORT_TLS,
+                BROKER_HTTP_PORT, BROKER_HTTPS_PORT, DEFAULT_HTTP_PATH, DEFAULT_IMAGE_NAME);
         tailContainerLog();
     }
 
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
index 3544c4b5e7a65..3642b6f1d84e7 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CassandraContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CassandraContainer.java
index d4d505ca78195..c9cdcdf2c4355 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CassandraContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CassandraContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
index 5acfe56eb974d..90e6660103a2f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMongoDbContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMongoDbContainer.java
index 5385b6a8c9742..481725d145b2a 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMongoDbContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMongoDbContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMsSqlContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMsSqlContainer.java
index 1da7b7cbb4146..357fd8724d738 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMsSqlContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMsSqlContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMySQLContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMySQLContainer.java
index 6d87dd65eef15..27d624a6c828b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMySQLContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumMySQLContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumOracleDbContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumOracleDbContainer.java
index 477347d474692..8579f00dd9126 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumOracleDbContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumOracleDbContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumPostgreSqlContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumPostgreSqlContainer.java
index 8f32c05b2685e..479869c4183d1 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumPostgreSqlContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/DebeziumPostgreSqlContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/HdfsContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/HdfsContainer.java
index 58f781f3bad25..948f3ca468165 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/HdfsContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/HdfsContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
index 2119ba54d55a5..717dbab6e2be6 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java
index 617a6692756cb..53283447378f5 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ProxyContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -28,16 +28,8 @@ public class ProxyContainer extends PulsarContainer {
     public static final String NAME = "pulsar-proxy";
 
     public ProxyContainer(String clusterName, String hostName) {
-        super(
-            clusterName, hostName, hostName, "bin/run-proxy.sh", BROKER_PORT, BROKER_HTTP_PORT);
-    }
-
-    public String getPlainTextServiceUrl() {
-        return "pulsar://" + getHost() + ":" + getMappedPort(BROKER_PORT);
-    }
-
-    public String getHttpServiceUrl() {
-        return "http://" + getHost() + ":" + getMappedPort(BROKER_HTTP_PORT);
+        super(clusterName, hostName, hostName, "bin/run-proxy.sh", BROKER_PORT, BROKER_PORT_TLS, BROKER_HTTP_PORT,
+                BROKER_HTTPS_PORT, DEFAULT_HTTP_PATH, DEFAULT_IMAGE_NAME);
     }
 
     @Override
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
index 421a50885801e..cc722cc0891f9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -40,10 +40,13 @@ public abstract class PulsarContainer> exte
     public static final int CS_PORT = 2184;
     public static final int BOOKIE_PORT = 3181;
     public static final int BROKER_PORT = 6650;
+    public static final int BROKER_PORT_TLS = 6651;
     public static final int BROKER_HTTP_PORT = 8080;
+    public static final int BROKER_HTTPS_PORT = 8081;
 
     public static final String DEFAULT_IMAGE_NAME = System.getenv().getOrDefault("PULSAR_TEST_IMAGE_NAME",
             "apachepulsar/pulsar-test-latest-version:latest");
+    public static final String DEFAULT_HTTP_PATH = "/metrics";
     public static final String PULSAR_2_5_IMAGE_NAME = "apachepulsar/pulsar:2.5.0";
     public static final String PULSAR_2_4_IMAGE_NAME = "apachepulsar/pulsar:2.4.0";
     public static final String PULSAR_2_3_IMAGE_NAME = "apachepulsar/pulsar:2.3.0";
@@ -65,7 +68,9 @@ public abstract class PulsarContainer> exte
     private final String serviceName;
     private final String serviceEntryPoint;
     private final int servicePort;
+    private final int servicePortTls;
     private final int httpPort;
+    private final int httpsPort;
     private final String httpPath;
 
     public PulsarContainer(String clusterName,
@@ -96,12 +101,28 @@ public PulsarContainer(String clusterName,
                            int httpPort,
                            String httpPath,
                            String pulsarImageName) {
+        this(clusterName, hostname, serviceName, serviceEntryPoint, servicePort, 0, httpPort, 0, httpPath,
+                pulsarImageName);
+    }
+
+    public PulsarContainer(String clusterName,
+                           String hostname,
+                           String serviceName,
+                           String serviceEntryPoint,
+                           int servicePort,
+                           int servicePortTls,
+                           int httpPort,
+                           int httpsPort,
+                           String httpPath,
+                           String pulsarImageName) {
         super(clusterName, pulsarImageName);
         this.hostname = hostname;
         this.serviceName = serviceName;
         this.serviceEntryPoint = serviceEntryPoint;
         this.servicePort = servicePort;
+        this.servicePortTls = servicePortTls;
         this.httpPort = httpPort;
+        this.httpsPort = httpsPort;
         this.httpPath = httpPath;
 
         configureLeaveContainerRunning(this);
@@ -151,9 +172,15 @@ protected void configure() {
         if (httpPort > 0) {
             addExposedPorts(httpPort);
         }
+        if (httpsPort > 0) {
+            addExposedPorts(httpsPort);
+        }
         if (servicePort > 0) {
             addExposedPort(servicePort);
         }
+        if (servicePortTls > 0) {
+            addExposedPort(servicePortTls);
+        }
     }
 
     protected void beforeStart() {}
@@ -200,4 +227,20 @@ public int hashCode() {
         return 31 * super.hashCode() + Objects.hash(
                 getContainerId());
     }
+
+    public String getPlainTextServiceUrl() {
+        return "pulsar://" + getHost() + ":" + getMappedPort(servicePort);
+    }
+
+    public String getServiceUrlTls() {
+        return "pulsar+ssl://" + getHost() + ":" + getMappedPort(servicePortTls);
+    }
+
+    public String getHttpServiceUrl() {
+        return "http://" + getHost() + ":" + getMappedPort(httpPort);
+    }
+
+    public String getHttpsServiceUrl() {
+        return "https://" + getHost() + ":" + getMappedPort(httpsPort);
+    }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/RabbitMQContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/RabbitMQContainer.java
index 7379345e19b82..fbec62b32465a 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/RabbitMQContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/RabbitMQContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/S3Container.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/S3Container.java
index 42f0300896152..439b79990f6d9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/S3Container.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/S3Container.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java
index 0bdea9cb45f7e..3a7f679953300 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -66,12 +66,4 @@ protected void beforeStart() {
                 .forPath("/admin/v2/namespaces/public/default")
                 .withStartupTimeout(Duration.of(300, SECONDS));
     }
-
-    public String getPlainTextServiceUrl() {
-        return "pulsar://" + getHost() + ":" + getMappedPort(BROKER_PORT);
-    }
-
-    public String getHttpServiceUrl() {
-        return "http://" + getHost() + ":" + getMappedPort(BROKER_HTTP_PORT);
-    }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WebSocketContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WebSocketContainer.java
index 658f6e1016a92..aa87c045f10ff 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WebSocketContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WebSocketContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
index ac37acd76b213..9233b8f3f3623 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
index 975ca1805877a..898e5d241767a 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/package-info.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/package-info.java
index 0ef7fd7a7e108..c0b2978614d12 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/package-info.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecException.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecException.java
index 599b0ebfb00f5..ce724a3b27626 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecException.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResult.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResult.java
index 0e79bb6def058..1df417863b15e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResult.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResultBytes.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResultBytes.java
index 402ad4e0ab254..285fba1e28ec6 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResultBytes.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/docker/ContainerExecResultBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java
index 83a43d2adfa01..17804c19fab00 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java
index e80f811fd5e19..71f7a861cd8e2 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarStateTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarStateTest.java
index 7aba6c711e486..45f4ab5343557 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarStateTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarStateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoProcessTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoProcessTest.java
index 939f79150b954..61e985ae99944 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoProcessTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoProcessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoTest.java
index 734a1abd83e74..9ef2398c55c00 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoThreadTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoThreadTest.java
index a63e0b1f4b58e..52c76bd659470 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoThreadTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/go/PulsarFunctionsGoThreadTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaProcessTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaProcessTest.java
index 621352d540894..3acf5d0e44c99 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaProcessTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaProcessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaTest.java
index 923870cabb5c1..6828630940e2e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaThreadTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaThreadTest.java
index ee8c8c60c98c8..faf6482f5316e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaThreadTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarFunctionsJavaThreadTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainProcessTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainProcessTest.java
index 75740b0a15a63..11dec0b3863c7 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainProcessTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainProcessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainTest.java
index 0e9219f379d73..39db283f56090 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainThreadTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainThreadTest.java
index 031c8669efb5a..7112f78c419ab 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainThreadTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/java/PulsarWorkerRebalanceDrainThreadTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonProcessTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonProcessTest.java
index 82526d3b552aa..594d12222aef8 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonProcessTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonProcessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonTest.java
index 49bef07bc01e5..909da3d28583e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonThreadTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonThreadTest.java
index c25be1de8aa17..31fefcb0c007e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonThreadTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/python/PulsarFunctionsPythonThreadTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java
index 4edf4624c63d6..ab411e24dbe5f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/UploadDownloadCommandGenerator.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/UploadDownloadCommandGenerator.java
index a8bca83ddf768..225b4a4a742c4 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/UploadDownloadCommandGenerator.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/UploadDownloadCommandGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarGenericObjectSinkTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarGenericObjectSinkTest.java
index f57af01a979ca..6f3b31565b1b3 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarGenericObjectSinkTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarGenericObjectSinkTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestBase.java
index 16e961dfcf68b..92aa6fd0134e7 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,10 +23,15 @@
 import org.apache.pulsar.tests.integration.io.sinks.SinkTester;
 import org.apache.pulsar.tests.integration.io.sources.PulsarIOSourceRunner;
 import org.apache.pulsar.tests.integration.io.sources.SourceTester;
+import org.apache.pulsar.tests.integration.topologies.FunctionRuntimeType;
 import org.testcontainers.containers.GenericContainer;
 
 public abstract class PulsarIOTestBase extends PulsarFunctionsTestBase {
 
+    public PulsarIOTestBase(FunctionRuntimeType functionRuntimeType) {
+        super(functionRuntimeType);
+    }
+
     @SuppressWarnings({"unchecked", "rawtypes"})
     protected void testSink(SinkTester tester, boolean builtin) throws Exception {
         tester.startServiceContainer(pulsarCluster);
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java
index 83f1cc0126287..4492f6a407520 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/PulsarIOTestRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java
index 3ef9ace951093..eb9482e690dcb 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSourceTester.java
index a4508fd590f48..bccef1148c07e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/RabbitMQSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/SinkWithTransformFunctionTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/SinkWithTransformFunctionTest.java
index b5faf59d25a2d..afe9038003095 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/SinkWithTransformFunctionTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/SinkWithTransformFunctionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/CassandraSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/CassandraSinkTester.java
index d545ddfd08f04..e9cefb4f80c26 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/CassandraSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/CassandraSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,6 +23,7 @@
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.PulsarVersion;
 import org.apache.pulsar.tests.integration.containers.CassandraContainer;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 
@@ -52,6 +53,7 @@ public static CassandraSinkTester createTester(boolean builtin) {
     private static final String ROOTS = "cassandra";
     private static final String KEY = "key";
     private static final String COLUMN = "col";
+    private static final String ARCHIVE = "/pulsar/connectors/pulsar-io-cassandra-" + PulsarVersion.getVersion() + ".nar";
 
     private final String keySpace;
     private final String tableName;
@@ -60,7 +62,7 @@ public static CassandraSinkTester createTester(boolean builtin) {
     private Session session;
 
     private CassandraSinkTester() {
-        super(NAME, "/pulsar/connectors/pulsar-io-cassandra-2.2.0-incubating-SNAPSHOT.nar", "org.apache.pulsar.io.cassandra.CassandraStringSink");
+        super(NAME, ARCHIVE, "org.apache.pulsar.io.cassandra.CassandraStringSink");
 
         String suffix = randomName(8) + "_" + System.currentTimeMillis();
         this.keySpace = "keySpace_" + suffix;
@@ -96,24 +98,25 @@ protected CassandraContainer createSinkService(PulsarCluster cluster) {
     public void prepareSink() {
         // build the sink
         cluster = Cluster.builder()
-            .addContactPoint("localhost")
-            .withPort(serviceContainer.getCassandraPort())
-            .build();
+                .addContactPoint("localhost")
+                .withPort(serviceContainer.getCassandraPort())
+                .withoutJMXReporting()
+                .build();
 
         // connect to the cluster
         session = cluster.connect();
         log.info("Connecting to cassandra cluster at localhost:{}", serviceContainer.getCassandraPort());
 
         String createKeySpace =
-            "CREATE KEYSPACE " + keySpace
-                + " WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}; ";
+                "CREATE KEYSPACE " + keySpace
+                        + " WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}; ";
         log.info(createKeySpace);
         session.execute(createKeySpace);
         session.execute("USE " + keySpace);
 
         String createTable = "CREATE TABLE " + tableName
-            + "(" + KEY + " text PRIMARY KEY, "
-            + COLUMN + " text);";
+                + "(" + KEY + " text PRIMARY KEY, "
+                + COLUMN + " text);";
         log.info(createTable);
         session.execute(createTable);
     }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch7SinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch7SinkTester.java
index 699f99d491350..65b38c677bfc5 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch7SinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch7SinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,18 +18,23 @@
  */
 package org.apache.pulsar.tests.integration.io.sinks;
 
+import java.util.Optional;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 public class ElasticSearch7SinkTester extends ElasticSearchSinkTester {
 
+    public static final String ELASTICSEARCH_7 = Optional.ofNullable(System.getenv("ELASTICSEARCH_IMAGE_V7"))
+            .orElse("docker.elastic.co/elasticsearch/elasticsearch:7.17.7");
+
+
     public ElasticSearch7SinkTester(boolean schemaEnable) {
         super(schemaEnable);
     }
 
     @Override
     protected ElasticsearchContainer createSinkService(PulsarCluster cluster) {
-        return new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.16.3-amd64")
+        return new ElasticsearchContainer(ELASTICSEARCH_7)
                 .withEnv("ES_JAVA_OPTS", "-Xms128m -Xmx256m");
     }
 
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch8SinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch8SinkTester.java
index e24f23fac89ec..bb52c4ff03fea 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch8SinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch8SinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,18 +18,23 @@
  */
 package org.apache.pulsar.tests.integration.io.sinks;
 
+import java.util.Optional;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 public class ElasticSearch8SinkTester extends ElasticSearchSinkTester {
 
+    public static final String ELASTICSEARCH_8 = Optional.ofNullable(System.getenv("ELASTICSEARCH_IMAGE_V8"))
+            .orElse("docker.elastic.co/elasticsearch/elasticsearch:8.5.1");
+
+
     public ElasticSearch8SinkTester(boolean schemaEnable) {
         super(schemaEnable);
     }
 
     @Override
     protected ElasticsearchContainer createSinkService(PulsarCluster cluster) {
-        return new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.1.0")
+        return new ElasticsearchContainer(ELASTICSEARCH_8)
                 .withEnv("ES_JAVA_OPTS", "-Xms128m -Xmx256m")
                 .withEnv("xpack.security.enabled", "false")
                 .withEnv("xpack.security.http.ssl.enabled", "false");
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearchSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearchSinkTester.java
index 52a44fd86db25..605b58a796f1e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearchSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearchSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/HdfsSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/HdfsSinkTester.java
index b6320a58e2e24..9e2c3dd623d09 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/HdfsSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/HdfsSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/JdbcPostgresSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/JdbcPostgresSinkTester.java
index 80e04c485eab1..5b049e6d3de14 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/JdbcPostgresSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/JdbcPostgresSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KafkaSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KafkaSinkTester.java
index fb3376c298867..ceb0c820b629f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KafkaSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KafkaSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,7 @@
 import static org.apache.pulsar.tests.integration.topologies.PulsarTestBase.randomName;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import com.google.common.collect.ImmutableMap;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -34,7 +35,6 @@
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 /**
  * A tester for testing kafka sink.
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KinesisSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KinesisSinkTester.java
index eb119b9302218..3eb13fa42cda4 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KinesisSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/KinesisSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/OpenSearchSinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/OpenSearchSinkTester.java
index dadf6d295a943..1e10cc4189c1a 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/OpenSearchSinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/OpenSearchSinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.tests.integration.io.sinks;
 
+import java.util.Optional;
 import org.apache.http.HttpHost;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 import org.awaitility.Awaitility;
@@ -36,6 +37,9 @@
 
 public class OpenSearchSinkTester extends ElasticSearchSinkTester {
 
+    public static final String OPENSEARCH = Optional.ofNullable(System.getenv("OPENSEARCH_IMAGE"))
+            .orElse("opensearchproject/opensearch:1.2.4");
+
     private RestHighLevelClient elasticClient;
 
 
@@ -45,7 +49,7 @@ public OpenSearchSinkTester(boolean schemaEnable) {
 
     @Override
     protected ElasticsearchContainer createSinkService(PulsarCluster cluster) {
-        DockerImageName dockerImageName = DockerImageName.parse("opensearchproject/opensearch:1.2.4")
+        DockerImageName dockerImageName = DockerImageName.parse(OPENSEARCH)
                 .asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch");
         return new ElasticsearchContainer(dockerImageName)
                 .withEnv("OPENSEARCH_JAVA_OPTS", "-Xms128m -Xmx256m")
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java
index 5fa96d77565cf..e5b524ebbef8b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarIOSinkRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -55,7 +55,7 @@ public PulsarIOSinkRunner(PulsarCluster cluster, String functionRuntimeType) {
 		super(cluster, functionRuntimeType);
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({ "rawtypes" })
 	public  void runSinkTester(SinkTester tester, boolean builtin) throws Exception {
         final String tenant = TopicName.PUBLIC_TENANT;
         final String namespace = TopicName.DEFAULT_NAMESPACE;
@@ -201,7 +201,7 @@ protected void updateSinkConnector(@SuppressWarnings("rawtypes") SinkTester test
         } else {
             commands = new String[] {
                     PulsarCluster.ADMIN_SCRIPT,
-                    "sink", "create",
+                    "sink", "update",
                     "--tenant", tenant,
                     "--namespace", namespace,
                     "--name", sinkName,
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarSinksTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarSinksTest.java
index bec9c99e8a8dd..0663b4d44ff0f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarSinksTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/PulsarSinksTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,12 +23,17 @@
 import org.apache.pulsar.tests.integration.io.RabbitMQSinkTester;
 import org.apache.pulsar.tests.integration.io.RabbitMQSourceTester;
 import org.apache.pulsar.tests.integration.io.sources.KafkaSourceTester;
+import org.apache.pulsar.tests.integration.topologies.FunctionRuntimeType;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 
 public class PulsarSinksTest extends PulsarIOTestBase {
 
+    public PulsarSinksTest() {
+        super(FunctionRuntimeType.PROCESS);
+    }
+
     @DataProvider(name = "withSchema")
     public Object[][] withSchema() {
         return new Object[][]{{Boolean.TRUE}, {Boolean.FALSE}};
@@ -40,12 +45,12 @@ public void testKafkaSink() throws Exception {
         testSink(new KafkaSinkTester(kafkaContainerName), true, new KafkaSourceTester(kafkaContainerName));
     }
 
-    @Test(enabled = false, groups = "sink")
+    @Test(groups = "sink")
     public void testCassandraSink() throws Exception {
         testSink(CassandraSinkTester.createTester(true), true);
     }
 
-    @Test(enabled = false, groups = "sink")
+    @Test(groups = "sink")
     public void testCassandraArchiveSink() throws Exception {
         testSink(CassandraSinkTester.createTester(false), false);
     }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/SinkTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/SinkTester.java
index 86db160911460..3966faf7fe848 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/SinkTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/SinkTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/AvroKafkaSourceTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/AvroKafkaSourceTest.java
index 5bf49e25c4f4d..5fcf4bd284d28 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/AvroKafkaSourceTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/AvroKafkaSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.tests.integration.io.sources;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
 import lombok.Cleanup;
 import lombok.Data;
@@ -44,7 +45,6 @@
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 import org.testcontainers.utility.DockerImageName;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/BatchSourceTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/BatchSourceTest.java
index 3c69d56624592..19f74bf3878fe 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/BatchSourceTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/BatchSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/GenericRecordSourceTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/GenericRecordSourceTest.java
index d9484ac0f34b5..8525f5e20bec3 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/GenericRecordSourceTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/GenericRecordSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/KafkaSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/KafkaSourceTester.java
index b7ec88909fcc5..9eab00840915c 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/KafkaSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/KafkaSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,7 @@
 import static org.apache.pulsar.tests.integration.topologies.PulsarClusterTestBase.randomName;
 import static org.testng.Assert.assertTrue;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -35,7 +36,6 @@
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 /**
  * A tester for testing kafka source.
@@ -118,29 +118,30 @@ public void prepareUpdateEvent() throws Exception {
 
     @Override
     public Map produceSourceMessages(int numMessages) throws Exception{
-        KafkaProducer producer = new KafkaProducer<>(
+        try (KafkaProducer producer = new KafkaProducer<>(
                 ImmutableMap.of(
                         ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaContainer.getBootstrapServers(),
                         ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()
                 ),
                 new StringSerializer(),
                 new StringSerializer()
-        );
-        LinkedHashMap kvs = new LinkedHashMap<>();
-        for (int i = 0; i < numMessages; i++) {
-            String key = "key-" + i;
-            String value = "value-" + i;
-            ProducerRecord record = new ProducerRecord<>(
-                kafkaTopicName,
-                key,
-                value
-            );
-            kvs.put(key, value);
-            producer.send(record).get();
+        )) {
+            LinkedHashMap kvs = new LinkedHashMap<>();
+            for (int i = 0; i < numMessages; i++) {
+                String key = "key-" + i;
+                String value = "value-" + i;
+                ProducerRecord record = new ProducerRecord<>(
+                        kafkaTopicName,
+                        key,
+                        value
+                );
+                kvs.put(key, value);
+                producer.send(record).get();
+            }
+
+            log.info("Successfully produced {} messages to kafka topic {}", numMessages, kafkaTopicName);
+            return kvs;
         }
-
-        log.info("Successfully produced {} messages to kafka topic {}", numMessages, kafkaTopicName);
-        return kvs;
     }
 
     @Override
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/MongoSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/MongoSourceTester.java
index 273a1ecdd48e4..762ad33cb7e9f 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/MongoSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/MongoSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.pulsar.tests.integration.io.sources;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java
index d1e5049bdcf8e..b843e146e2985 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarIOSourceRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarSourcePropertyTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarSourcePropertyTest.java
index 32e666f1f5c72..25b4b75472353 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarSourcePropertyTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/PulsarSourcePropertyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/SourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/SourceTester.java
index 7157c22821672..37e241a873b6c 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/SourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/SourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMongoDbSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMongoDbSourceTester.java
index ac5c71e35aac5..8c4a7a91a15fa 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMongoDbSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMongoDbSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMsSqlSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMsSqlSourceTester.java
index d13e10e66fcc8..a745cae60409d 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMsSqlSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMsSqlSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.tests.integration.io.sources.debezium;
 
+import com.google.common.base.Preconditions;
 import java.util.Map;
 import lombok.Getter;
 import lombok.SneakyThrows;
@@ -27,7 +28,6 @@
 import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
 import org.apache.pulsar.tests.integration.io.sources.SourceTester;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
-import org.testcontainers.shaded.com.google.common.base.Preconditions;
 import org.testng.Assert;
 import org.testng.util.Strings;
 
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMySqlSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMySqlSourceTester.java
index 27e10cf64ed07..2f2bb8a2c0c25 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMySqlSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumMySqlSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumOracleDbSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumOracleDbSourceTester.java
index 115d3eba8ffbb..17eaf319b3be2 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumOracleDbSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumOracleDbSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.tests.integration.io.sources.debezium;
 
+import com.google.common.base.Preconditions;
 import java.util.Map;
 import lombok.Getter;
 import lombok.SneakyThrows;
@@ -27,7 +28,6 @@
 import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
 import org.apache.pulsar.tests.integration.io.sources.SourceTester;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
-import org.testcontainers.shaded.com.google.common.base.Preconditions;
 import org.testng.util.Strings;
 
 /**
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumPostgreSqlSourceTester.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumPostgreSqlSourceTester.java
index 1f0a7fe3a593d..5f82cc52e7c40 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumPostgreSqlSourceTester.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/DebeziumPostgreSqlSourceTester.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumOracleSourceTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumOracleSourceTest.java
index b2f686f52ee15..76413d0843c0e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumOracleSourceTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumOracleSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.tests.integration.io.sources.debezium;
 
+import com.google.common.collect.Sets;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.client.admin.PulsarAdmin;
@@ -28,7 +29,7 @@
 import org.apache.pulsar.common.policies.data.TenantInfoImpl;
 import org.apache.pulsar.tests.integration.containers.DebeziumOracleDbContainer;
 import org.apache.pulsar.tests.integration.io.PulsarIOTestBase;
-import org.testcontainers.shaded.com.google.common.collect.Sets;
+import org.apache.pulsar.tests.integration.topologies.FunctionRuntimeType;
 import org.testng.annotations.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ -38,6 +39,10 @@ public class PulsarDebeziumOracleSourceTest extends PulsarIOTestBase {
 
     protected final AtomicInteger testId = new AtomicInteger(0);
 
+    public PulsarDebeziumOracleSourceTest() {
+        super(FunctionRuntimeType.PROCESS);
+    }
+
     @Test(groups = "source", timeOut = 1800000)
     public void testDebeziumOracleDbSource() throws Exception{
         testDebeziumOracleDbConnect("org.apache.kafka.connect.json.JsonConverter", true);
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumSourcesTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumSourcesTest.java
index 246b52b5dd9fc..9da1f10e74afa 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumSourcesTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarDebeziumSourcesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.tests.integration.io.sources.debezium;
 
+import com.google.common.collect.Sets;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.pulsar.client.admin.PulsarAdmin;
@@ -32,7 +33,7 @@
 import org.apache.pulsar.tests.integration.containers.DebeziumMySQLContainer;
 import org.apache.pulsar.tests.integration.containers.DebeziumPostgreSqlContainer;
 import org.apache.pulsar.tests.integration.io.PulsarIOTestBase;
-import org.testcontainers.shaded.com.google.common.collect.Sets;
+import org.apache.pulsar.tests.integration.topologies.FunctionRuntimeType;
 import org.testng.annotations.Test;
 
 import lombok.Cleanup;
@@ -43,6 +44,10 @@ public class PulsarDebeziumSourcesTest extends PulsarIOTestBase {
 
     protected final AtomicInteger testId = new AtomicInteger(0);
 
+    public PulsarDebeziumSourcesTest() {
+        super(FunctionRuntimeType.PROCESS);
+    }
+
     @Test(groups = "source")
     public void testDebeziumMySqlSourceJson() throws Exception {
         testDebeziumMySqlConnect("org.apache.kafka.connect.json.JsonConverter", true, false);
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java
index 9b361a8991f54..762dd34e17c91 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sources/debezium/PulsarIODebeziumSourceRunner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
index 7a204279eedf4..effaef5c19698 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/GeoReplicationTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/GeoReplicationTest.java
index e4f89e8849ec6..863ee22185961 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/GeoReplicationTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/GeoReplicationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/MessagingBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/MessagingBase.java
index 44135a07afb08..0e7106ef65ea1 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/MessagingBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/MessagingBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
index 4199febc518a5..e7eff6a2d2dbf 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonDurableConsumerMessagingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java
index 51fc85ae1c799..0b379af3957c7 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java
index ba7a649326cd3..5675aa88ec6cc 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/ReaderMessagingTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/ReaderMessagingTest.java
index cdae130edd910..4bfd964e98e23 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/ReaderMessagingTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/ReaderMessagingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/TopicMessagingBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/TopicMessagingBase.java
index 3b37993a0c740..97e642adf37db 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/TopicMessagingBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/TopicMessagingBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestBaseOffload.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestBaseOffload.java
index 1d7fb21062136..7d38aa77bf027 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestBaseOffload.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestBaseOffload.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,6 +20,8 @@
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.client.BookKeeper;
@@ -32,14 +34,17 @@
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats;
 import org.apache.pulsar.tests.integration.suites.PulsarTieredStorageTestSuite;
+import org.awaitility.Awaitility;
 import org.testng.Assert;
 
 @Slf4j
 public abstract class TestBaseOffload extends PulsarTieredStorageTestSuite {
-    private static final int ENTRY_SIZE = 1024;
+    protected int getEntrySize() {
+        return 1024;
+    };
 
-    private static byte[] buildEntry(String pattern) {
-        byte[] entry = new byte[ENTRY_SIZE];
+    private byte[] buildEntry(String pattern) {
+        byte[] entry = new byte[getEntrySize()];
         byte[] patternBytes = pattern.getBytes();
 
         for (int i = 0; i < entry.length; i++) {
@@ -64,15 +69,24 @@ protected void testPublishOffloadAndConsumeViaCLI(String serviceUrl, String admi
         long firstLedger = -1;
         try(PulsarClient client = PulsarClient.builder().serviceUrl(serviceUrl).build();
             Producer producer = client.newProducer().topic(topic)
+                    .maxPendingMessages(getNumEntriesPerLedger() / 2).sendTimeout(60, TimeUnit.SECONDS)
                     .blockIfQueueFull(true).enableBatching(false).create();) {
             client.newConsumer().topic(topic).subscriptionName("my-sub").subscribe().close();
 
             // write enough to topic to make it roll
             int i = 0;
-            for (; i < ENTRIES_PER_LEDGER * 1.5; i++) {
-                producer.sendAsync(buildEntry("offload-message" + i));
+            AtomicBoolean success = new AtomicBoolean(true);
+
+            for (; i < getNumEntriesPerLedger() * 1.5; i++) {
+                producer.sendAsync(buildEntry("offload-message" + i))
+                        .exceptionally(e -> {
+                            log.error("failed to send a message", e);
+                            success.set(false);
+                            return null;
+                        });;
             }
             producer.flush();
+            Assert.assertTrue(success.get());
         }
 
         try (PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(adminUrl).build()) {
@@ -113,7 +127,7 @@ protected void testPublishOffloadAndConsumeViaCLI(String serviceUrl, String admi
         try(PulsarClient client = PulsarClient.builder().serviceUrl(serviceUrl).build();
             Consumer consumer = client.newConsumer().topic(topic).subscriptionName("my-sub").subscribe()) {
             // read back from topic
-            for (int i = 0; i < ENTRIES_PER_LEDGER * 1.5; i++) {
+            for (int i = 0; i < getNumEntriesPerLedger() * 1.5; i++) {
                 Message m = consumer.receive(1, TimeUnit.MINUTES);
                 Assert.assertEquals(buildEntry("offload-message" + i), m.getData());
             }
@@ -138,25 +152,32 @@ protected void testPublishOffloadAndConsumeViaThreshold(String serviceUrl, Strin
         long firstLedger = 0;
         try(PulsarClient client = PulsarClient.builder().serviceUrl(serviceUrl).build();
             Producer producer = client.newProducer().topic(topic)
-                    .blockIfQueueFull(true).enableBatching(false).create();
-        ) {
+                    .maxPendingMessages(getNumEntriesPerLedger() / 2).sendTimeout(60, TimeUnit.SECONDS)
+                    .blockIfQueueFull(true).enableBatching(false).create()) {
 
             client.newConsumer().topic(topic).subscriptionName("my-sub").subscribe().close();
 
+            AtomicBoolean success = new AtomicBoolean(true);
             // write enough to topic to make it roll twice
-            for (int i = 0; i < ENTRIES_PER_LEDGER * 2.5; i++) {
-                producer.sendAsync(buildEntry("offload-message" + i));
+            for (int i = 0; i < getNumEntriesPerLedger() * 2.5; i++) {
+                producer.sendAsync(buildEntry("offload-message" + i))
+                        .exceptionally(e -> {
+                            log.error("failed to send a message", e);
+                            success.set(false);
+                            return null;
+                        });;
             }
 
             producer.flush();
+            Assert.assertTrue(success.get());
         }
 
         try (PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(adminUrl).build()) {
             firstLedger = admin.topics().getInternalStats(topic).ledgers.get(0).ledgerId;
 
             // wait up to 30 seconds for offload to occur
-            for (int i = 0; i < 300 && !admin.topics().getInternalStats(topic).ledgers.get(0).offloaded; i++) {
-                Thread.sleep(100);
+            for (int i = 0; i < 100 && !admin.topics().getInternalStats(topic).ledgers.get(0).offloaded; i++) {
+                Thread.sleep(300);
             }
             Assert.assertTrue(admin.topics().getInternalStats(topic).ledgers.get(0).offloaded);
 
@@ -175,8 +196,9 @@ protected void testPublishOffloadAndConsumeViaThreshold(String serviceUrl, Strin
         try (PulsarClient client = PulsarClient.builder().serviceUrl(serviceUrl).build();
              Consumer consumer = client.newConsumer().topic(topic).subscriptionName("my-sub").subscribe()) {
             // read back from topic
-            for (int i = 0; i < ENTRIES_PER_LEDGER * 2.5; i++) {
+            for (int i = 0; i < getNumEntriesPerLedger() * 2.5; i++) {
                 Message m = consumer.receive(1, TimeUnit.MINUTES);
+                Assert.assertNotNull(m);
                 Assert.assertEquals(buildEntry("offload-message" + i), m.getData());
             }
         }
@@ -197,30 +219,52 @@ private boolean ledgerOffloaded(List le
                 .map(l -> l.offloaded).findFirst().get();
     }
 
-    private long writeAndWaitForOffload(String serviceUrl, String adminUrl, String topic) throws Exception {
+    private long writeAndWaitForOffload(String serviceUrl, String adminUrl, String topic)
+            throws Exception {
+        return writeAndWaitForOffload(serviceUrl, adminUrl, topic, -1);
+    }
+
+    private long writeAndWaitForOffload(String serviceUrl, String adminUrl, String topic, int partitionNum)
+            throws Exception {
         try(PulsarClient client = PulsarClient.builder().serviceUrl(serviceUrl).build();
             Producer producer = client.newProducer().topic(topic)
+                    .maxPendingMessages(getNumEntriesPerLedger() / 2).sendTimeout(60, TimeUnit.SECONDS)
                     .blockIfQueueFull(true).enableBatching(false).create();
             PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(adminUrl).build()) {
 
-            List ledgers = admin.topics().getInternalStats(topic).ledgers;
+            String topicToCheck = partitionNum >= 0
+                    ? topic + "-partition-" + partitionNum
+                    : topic;
+
+            List ledgers = admin.topics()
+                    .getInternalStats(topicToCheck).ledgers;
             long currentLedger = ledgers.get(ledgers.size() - 1).ledgerId;
 
             client.newConsumer().topic(topic).subscriptionName("my-sub").subscribe().close();
 
+            AtomicBoolean success = new AtomicBoolean(true);
             // write enough to topic to make it roll twice
-            for (int i = 0; i < ENTRIES_PER_LEDGER * 2.5; i++) {
-                producer.sendAsync(buildEntry("offload-message" + i));
+            for (int i = 0;
+                 i < getNumEntriesPerLedger() * 2.5 * (partitionNum > 0 ? partitionNum + 1 : 1);
+                 i++) {
+                producer.sendAsync(buildEntry("offload-message" + i))
+                        .exceptionally(e -> {
+                            log.error("failed to send a message", e);
+                            success.set(false);
+                            return null;
+                        });
             }
+            producer.flush();
             producer.send(buildEntry("final-offload-message"));
+            Assert.assertTrue(success.get());
 
             // wait up to 30 seconds for offload to occur
             for (int i = 0;
-                 i < 300 && !ledgerOffloaded(admin.topics().getInternalStats(topic).ledgers, currentLedger);
+                 i < 100 && !ledgerOffloaded(admin.topics().getInternalStats(topicToCheck).ledgers, currentLedger);
                  i++) {
-                Thread.sleep(100);
+                Thread.sleep(300);
             }
-            Assert.assertTrue(ledgerOffloaded(admin.topics().getInternalStats(topic).ledgers, currentLedger));
+            Assert.assertTrue(ledgerOffloaded(admin.topics().getInternalStats(topicToCheck).ledgers, currentLedger));
 
             return currentLedger;
         }
@@ -295,4 +339,130 @@ protected void testPublishOffloadAndConsumeDeletionLag(String serviceUrl, String
         Thread.sleep(5000);
         Assert.assertTrue(ledgerExistsInBookKeeper(offloadedLedger));
     }
+
+    protected void testDeleteOffloadedTopic(String serviceUrl, String adminUrl,
+                                            boolean unloadBeforeDelete, int numPartitions) throws Exception {
+        final String tenant = "offload-test-cli-" + randomName(4);
+        final String namespace = tenant + "/ns1";
+        final String topic = "persistent://" + namespace + "/topic1";
+
+        pulsarCluster.runAdminCommandOnAnyBroker("tenants",
+                "create", "--allowed-clusters", pulsarCluster.getClusterName(),
+                "--admin-roles", "offload-admin", tenant);
+
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "create", "--clusters", pulsarCluster.getClusterName(), namespace);
+
+        // set threshold to offload runs immediately after role
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "set-offload-threshold", "--size", "0", namespace);
+
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "set-retention", "--size", "100M", "--time", "100m", namespace);
+
+        String output = pulsarCluster.runAdminCommandOnAnyBroker(
+                "namespaces", "get-offload-deletion-lag", namespace).getStdout();
+        Assert.assertTrue(output.contains("Unset for namespace"));
+
+        if (numPartitions > 0) {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics",
+                    "create-partitioned-topic", topic,
+                    "--partitions", Integer.toString(numPartitions));
+        } else {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "create", topic);
+        }
+
+        long offloadedLedger = writeAndWaitForOffload(serviceUrl, adminUrl, topic, numPartitions - 1);
+        // give it up to 5 seconds to delete, it shouldn't
+        // so we wait this every time
+        Thread.sleep(5000);
+        Assert.assertTrue(ledgerExistsInBookKeeper(offloadedLedger));
+
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces", "set-offload-deletion-lag", namespace,
+                "--lag", "0m");
+        output = pulsarCluster.runAdminCommandOnAnyBroker(
+                "namespaces", "get-offload-deletion-lag", namespace).getStdout();
+        Assert.assertTrue(output.contains("0 minute(s)"));
+
+        offloadedLedger = writeAndWaitForOffload(serviceUrl, adminUrl, topic, numPartitions - 1);
+        // wait up to 10 seconds for ledger to be deleted
+        for (int i = 0; i < 10 && ledgerExistsInBookKeeper(offloadedLedger); i++) {
+            writeAndWaitForOffload(serviceUrl, adminUrl, topic, numPartitions - 1);
+            Thread.sleep(1000);
+        }
+
+        Assert.assertFalse(ledgerExistsInBookKeeper(offloadedLedger));
+        Assert.assertTrue(offloadedLedgerExists(topic, numPartitions - 1, offloadedLedger));
+
+        if (unloadBeforeDelete) {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "unload", topic);
+        }
+        if (numPartitions > 0) {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "delete-partitioned-topic", topic);
+        } else {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "delete", topic);
+        }
+        final long ledgerId = offloadedLedger;
+        Awaitility.await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            Assert.assertFalse(offloadedLedgerExists(topic, numPartitions - 1, ledgerId));
+        });
+    }
+
+    protected void testDeleteOffloadedTopicExistsInBk(String serviceUrl, String adminUrl,
+                                            boolean unloadBeforeDelete, int numPartitions) throws Exception {
+        final String tenant = "offload-test-cli-" + randomName(4);
+        final String namespace = tenant + "/ns1";
+        final String topic = "persistent://" + namespace + "/topic1";
+
+        pulsarCluster.runAdminCommandOnAnyBroker("tenants",
+                "create", "--allowed-clusters", pulsarCluster.getClusterName(),
+                "--admin-roles", "offload-admin", tenant);
+
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "create", "--clusters", pulsarCluster.getClusterName(), namespace);
+
+        // set threshold to offload runs immediately after role
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "set-offload-threshold", "--size", "0", namespace);
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "set-retention", "--size", "100M", "--time", "100m", namespace);
+
+        if (numPartitions > 0) {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics",
+                    "create-partitioned-topic", topic,
+                    "--partitions", Integer.toString(numPartitions));
+        } else {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "create", topic);
+        }
+
+        String output = pulsarCluster.runAdminCommandOnAnyBroker(
+                "namespaces", "get-offload-deletion-lag", namespace).getStdout();
+        Assert.assertTrue(output.contains("Unset for namespace"));
+
+        long offloadedLedger = writeAndWaitForOffload(serviceUrl, adminUrl, topic, numPartitions - 1);
+        // give it up to 5 seconds to delete, it shouldn't
+        // so we wait this every time
+        Thread.sleep(5000);
+        Assert.assertTrue(ledgerExistsInBookKeeper(offloadedLedger));
+
+        Assert.assertTrue(offloadedLedgerExists(topic, numPartitions - 1, offloadedLedger));
+
+        if (unloadBeforeDelete) {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "unload", topic);
+        }
+        if (numPartitions > 0) {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "delete-partitioned-topic", topic);
+        } else {
+            pulsarCluster.runAdminCommandOnAnyBroker("topics", "delete", topic);
+        }
+        final long ledgerId = offloadedLedger;
+        Awaitility.await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            Assert.assertFalse(offloadedLedgerExists(topic, numPartitions - 1, ledgerId));
+        });
+        Assert.assertFalse(ledgerExistsInBookKeeper(offloadedLedger));
+    }
+
+    protected boolean offloadedLedgerExists(String topic, int partitionNum, long firstLedger) {
+        throw new RuntimeException("not implemented");
+    }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
index 808aae62e7419..4504b58ca920b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestFileSystemOffload.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -41,18 +41,17 @@ public void testPublishOffloadAndConsumeViaThreshold(Supplier serviceUrl
     @Test(dataProvider =  "ServiceAndAdminUrls")
     public void testPublishOffloadAndConsumeDeletionLag(Supplier serviceUrl, Supplier adminUrl) throws Exception {
         super.testPublishOffloadAndConsumeDeletionLag(serviceUrl.get(), adminUrl.get());
-
     }
 
-
     @Override
     protected Map getEnv() {
         Map result = new HashMap<>();
-        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(ENTRIES_PER_LEDGER));
+        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(getNumEntriesPerLedger()));
         result.put("managedLedgerMinLedgerRolloverTimeMinutes", "0");
         result.put("managedLedgerOffloadDriver", "filesystem");
         result.put("fileSystemURI", "file:///");
 
         return result;
     }
+
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java
new file mode 100644
index 0000000000000..bd1d2a49f7ba4
--- /dev/null
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestOffloadDeletionFS.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.offload;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.tests.integration.docker.ContainerExecException;
+import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+@Slf4j
+public class TestOffloadDeletionFS extends TestBaseOffload {
+
+    @Override
+    protected int getEntrySize() {
+        return 512;
+    }
+
+    @Override
+    protected int getNumEntriesPerLedger() {
+        return 200;
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteOffloadedTopic(Supplier serviceUrl, Supplier adminUrl) throws Exception {
+        super.testDeleteOffloadedTopic(serviceUrl.get(), adminUrl.get(), false, 0);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteUnloadedOffloadedTopic(Supplier serviceUrl, Supplier adminUrl)
+            throws Exception {
+        super.testDeleteOffloadedTopic(serviceUrl.get(), adminUrl.get(), true, 0);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteOffloadedTopicExistsInBk(Supplier serviceUrl, Supplier adminUrl)
+            throws Exception {
+        super.testDeleteOffloadedTopicExistsInBk(serviceUrl.get(), adminUrl.get(), false, 0);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteUnloadedOffloadedTopicExistsInBk(Supplier serviceUrl, Supplier adminUrl)
+            throws Exception {
+        super.testDeleteOffloadedTopicExistsInBk(serviceUrl.get(), adminUrl.get(), true, 0);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteOffloadedPartitionedTopic(Supplier serviceUrl, Supplier adminUrl) throws Exception {
+        super.testDeleteOffloadedTopic(serviceUrl.get(), adminUrl.get(), false, 3);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteUnloadedOffloadedPartitionedTopic(Supplier serviceUrl, Supplier adminUrl)
+            throws Exception {
+        super.testDeleteOffloadedTopic(serviceUrl.get(), adminUrl.get(), true, 3);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteOffloadedPartitionedTopicExistsInBk(Supplier serviceUrl, Supplier adminUrl)
+            throws Exception {
+        super.testDeleteOffloadedTopicExistsInBk(serviceUrl.get(), adminUrl.get(), false, 3);
+    }
+
+    @Test(dataProvider =  "ServiceAndAdminUrls")
+    public void testDeleteUnloadedOffloadedPartitionedTopicExistsInBk(Supplier serviceUrl,
+                                                                      Supplier adminUrl) throws Exception {
+        super.testDeleteOffloadedTopicExistsInBk(serviceUrl.get(), adminUrl.get(), true, 3);
+    }
+
+    @Override
+    protected Map getEnv() {
+        Map result = new HashMap<>();
+        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(getNumEntriesPerLedger()));
+        result.put("managedLedgerMinLedgerRolloverTimeMinutes", "0");
+        result.put("managedLedgerOffloadDriver", "filesystem");
+        result.put("fileSystemURI", "file:///");
+
+        return result;
+    }
+
+    @Override
+    protected boolean offloadedLedgerExists(String topic, int partitionNum, long ledger) {
+        log.info("offloadedLedgerExists(topic = {}, partitionNum={},ledger={})",
+                topic, partitionNum, ledger);
+        if (partitionNum > -1) {
+            topic = topic + "-partition-" + partitionNum;
+        }
+        String managedLedgerName = TopicName.get(topic).getPersistenceNamingEncoding();
+        String rootPath = "pulsar/";
+        String dirPath = rootPath + managedLedgerName + "/";
+
+        List result = new LinkedList<>();
+        String[] cmds = {
+                "ls",
+                "-1",
+                dirPath
+                };
+        pulsarCluster.getBrokers().forEach(broker -> {
+            try {
+                ContainerExecResult res = broker.execCmd(cmds);
+                log.info("offloadedLedgerExists broker {} 'ls -1 {}' got {}",
+                        broker.getContainerName(), dirPath, res.getStdout());
+                Arrays.stream(res.getStdout().split("\n"))
+                        .filter(x -> x.startsWith(ledger + "-"))
+                        .forEach(x -> result.add(x));
+            } catch (ContainerExecException ce) {
+                log.info("offloadedLedgerExists broker {} 'ls -1 {}' got error code {}",
+                        broker.getContainerName(), dirPath, ce.getResult().getExitCode());
+                // ignore 2 (No such file or directory)
+                if (ce.getResult().getExitCode() != 2) {
+                    throw new RuntimeException(ce);
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        return !result.isEmpty();
+    }
+
+}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestS3Offload.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestS3Offload.java
index edbbcfeba5e10..eb87aeb9751b7 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestS3Offload.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestS3Offload.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -73,7 +73,7 @@ public void testPublishOffloadAndConsumeDeletionLag(Supplier serviceUrl,
     @Override
     protected Map getEnv() {
         Map result = new HashMap<>();
-        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(ENTRIES_PER_LEDGER));
+        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(getNumEntriesPerLedger()));
         result.put("managedLedgerMinLedgerRolloverTimeMinutes", "0");
         result.put("managedLedgerOffloadDriver", "aws-s3");
         result.put("s3ManagedLedgerOffloadBucket", "pulsar-integtest");
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestUniversalConfigurations.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestUniversalConfigurations.java
index 9c53d801ea1eb..516b8cdab4b04 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestUniversalConfigurations.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/offload/TestUniversalConfigurations.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -72,7 +72,7 @@ public void testPublishOffloadAndConsumeDeletionLag(Supplier serviceUrl,
     @Override
     protected Map getEnv() {
         Map result = new HashMap<>();
-        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(ENTRIES_PER_LEDGER));
+        result.put("managedLedgerMaxEntriesPerLedger", String.valueOf(getNumEntriesPerLedger()));
         result.put("managedLedgerMinLedgerRolloverTimeMinutes", "0");
         result.put("managedLedgerOffloadDriver", "aws-s3");
         result.put("managedLedgerOffloadBucket", "pulsar-integtest");
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestAdditionalServlets.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestAdditionalServlets.java
index e8d3647178b34..8914397be3eaf 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestAdditionalServlets.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestAdditionalServlets.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestBrokerInterceptors.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestBrokerInterceptors.java
index 3f5f02e5b9374..98000c6f40636 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestBrokerInterceptors.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestBrokerInterceptors.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestEntryFilters.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestEntryFilters.java
index cd2a642ff01ca..f41551b248db0 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestEntryFilters.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestEntryFilters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestProtocolHandlers.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestProtocolHandlers.java
index 152212958aaad..8cb2c7dcdd2ff 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestProtocolHandlers.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/plugins/TestProtocolHandlers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/Stock.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/Stock.java
index f5d85f159cd20..93b2d91838b0b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/Stock.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/Stock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/StockProtoMessage.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/StockProtoMessage.java
index 3e952ba7bd198..67941a923ca67 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/StockProtoMessage.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/StockProtoMessage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestBasicPresto.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestBasicPresto.java
index 46db046431d86..7658883441f5b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestBasicPresto.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestBasicPresto.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java
index a3610c2e64ea6..5fba3b5eba60c 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPrestoQueryTieredStorage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLAuth.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLAuth.java
index 8d841348ef24f..3f0a6e0338f3d 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLAuth.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java
index b85ce455b0043..2833be67bc8e3 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestPulsarSQLBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/proxy/TestProxy.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/proxy/TestProxy.java
index 5ac37a11004f3..11019b27e0c12 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/proxy/TestProxy.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/proxy/TestProxy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/python/PythonSchemaTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/python/PythonSchemaTest.java
index 53f000ea804e8..5812150da2504 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/python/PythonSchemaTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/python/PythonSchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/JodaTimeTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/JodaTimeTest.java
index be22114b4557f..d0b02645a6c5a 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/JodaTimeTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/JodaTimeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/SchemaTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/SchemaTest.java
index 05337ab38e557..8bb6de74c661d 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/SchemaTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/SchemaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/Schemas.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/Schemas.java
index ccdf20b370ad2..4f9f082549dcd 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/Schemas.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/schema/Schemas.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java
index e5980bd856ff9..0d523ff56eae9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/standalone/SmokeTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/standalone/SmokeTest.java
index 5d142297a915f..b435ecf9649aa 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/standalone/SmokeTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/standalone/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarCliTestSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarCliTestSuite.java
index 9921cf11e26ab..2ddd20f12b151 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarCliTestSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarCliTestSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarSQLTestSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarSQLTestSuite.java
index 8c72ef8f94695..029f408ef6661 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarSQLTestSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarSQLTestSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarStandaloneTestSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarStandaloneTestSuite.java
index ea08e15def55c..6b38f6000e7b9 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarStandaloneTestSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarStandaloneTestSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTestSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTestSuite.java
index 4b13888c15bff..02c4e3c7ec60d 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTestSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTestSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTieredStorageTestSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTieredStorageTestSuite.java
index 7811b38e0fd92..6bf4061760b01 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTieredStorageTestSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/suites/PulsarTieredStorageTestSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -31,7 +31,9 @@
 @Slf4j
 public abstract class PulsarTieredStorageTestSuite extends PulsarClusterTestBase {
 
-    protected static final int ENTRIES_PER_LEDGER = 1024;
+    protected int getNumEntriesPerLedger() {
+        return 1024;
+    }
 
     @BeforeClass(alwaysRun = true)
     @Override
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/tls/ClientTlsTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/tls/ClientTlsTest.java
new file mode 100644
index 0000000000000..59ff978cafa06
--- /dev/null
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/tls/ClientTlsTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.tls;
+
+import com.google.common.io.Resources;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+import java.util.function.Supplier;
+import lombok.Cleanup;
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class ClientTlsTest extends PulsarTestSuite {
+    private final static String tlsTrustCertsFilePath = loadCertificateAuthorityFile("certs/ca.cert.pem");
+    private final static String tlsKeyFilePath = loadCertificateAuthorityFile("client-keys/admin.key-pk8.pem");
+    private final static String tlsCertificateFilePath = loadCertificateAuthorityFile("client-keys/admin.cert.pem");
+
+    private static String loadCertificateAuthorityFile(String name) {
+        return Resources.getResource("certificate-authority/" + name).getPath();
+    }
+
+    @DataProvider(name = "adminUrls")
+    public Object[][] adminUrls() {
+        return new Object[][]{
+                {stringSupplier(() -> getPulsarCluster().getAnyBrokersHttpsServiceUrl())},
+                {stringSupplier(() -> getPulsarCluster().getProxy().getHttpsServiceUrl())}
+        };
+    }
+
+    @DataProvider(name = "serviceUrls")
+    public Object[][] serviceUrls() {
+        return new Object[][]{
+                {stringSupplier(() -> getPulsarCluster().getProxy().getServiceUrlTls())},
+        };
+    }
+
+    @Test(dataProvider = "adminUrls")
+    public void testAdmin(Supplier urlSupplier) throws PulsarAdminException, PulsarClientException {
+        @Cleanup
+        PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(urlSupplier.get())
+                .tlsTrustCertsFilePath(tlsTrustCertsFilePath)
+                .tlsKeyFilePath(tlsKeyFilePath)
+                .tlsCertificateFilePath(tlsCertificateFilePath)
+                .build();
+        admin.tenants().getTenants();
+    }
+
+    @Test(dataProvider = "serviceUrls")
+    public void testClient(Supplier urlSupplier) throws PulsarClientException {
+        @Cleanup
+        PulsarClient client = PulsarClient.builder().serviceUrl(urlSupplier.get())
+                .tlsTrustCertsFilePath(tlsTrustCertsFilePath)
+                .tlsKeyFilePath(tlsKeyFilePath)
+                .tlsCertificateFilePath(tlsCertificateFilePath)
+                .build();
+        @Cleanup
+        Producer producer = client.newProducer().topic(UUID.randomUUID().toString()).create();
+        producer.send("Hello".getBytes(StandardCharsets.UTF_8));
+    }
+}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topics/TestTopicDeletion.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topics/TestTopicDeletion.java
new file mode 100644
index 0000000000000..044d17bac6156
--- /dev/null
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topics/TestTopicDeletion.java
@@ -0,0 +1,183 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.topics;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.tests.integration.docker.ContainerExecException;
+import org.apache.pulsar.tests.integration.docker.ContainerExecResult;
+import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
+import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.fail;
+
+/**
+ * Test cases for compaction.
+ */
+@Slf4j
+public class TestTopicDeletion extends PulsarTestSuite {
+
+    final private boolean unload = false;
+    final private int numBrokers = 2;
+
+    public void setupCluster() throws Exception {
+        brokerEnvs.put("managedLedgerMaxEntriesPerLedger", "10");
+        brokerEnvs.put("brokerDeleteInactivePartitionedTopicMetadataEnabled", "false");
+        brokerEnvs.put("brokerDeleteInactiveTopicsEnabled", "false");
+        this.setupCluster("");
+    }
+
+    protected PulsarClusterSpec.PulsarClusterSpecBuilder beforeSetupCluster(
+            String clusterName,
+            PulsarClusterSpec.PulsarClusterSpecBuilder specBuilder) {
+        specBuilder.numBrokers(numBrokers);
+        specBuilder.enableContainerLog(true);
+        return specBuilder;
+    }
+
+    @Test(dataProvider = "ServiceUrls", timeOut=300_000)
+    public void testPartitionedTopicForceDeletion(Supplier serviceUrl) throws Exception {
+
+        log.info("Creating tenant and namespace");
+
+        final String tenant = "test-partitioned-topic-" + randomName(4);
+        final String namespace = tenant + "/ns1";
+        final String topic = "persistent://" + namespace + "/partitioned-topic";
+        final int numPartitions = numBrokers * 3;
+        final int numKeys = numPartitions * 50;
+        final String subscriptionName = "sub1";
+
+        this.createTenantName(tenant, pulsarCluster.getClusterName(), "admin");
+
+        this.createNamespace(namespace);
+
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "set-clusters", "--clusters", pulsarCluster.getClusterName(), namespace);
+
+        pulsarCluster.runAdminCommandOnAnyBroker("namespaces",
+                "set-retention", "--size", "100M", "--time", "100m", namespace);
+
+        this.createPartitionedTopic(topic, numPartitions);
+
+        try (PulsarClient client = PulsarClient.builder().serviceUrl(serviceUrl.get()).build()) {
+
+            log.info("Creating consumer");
+            Consumer consumer = client.newConsumer()
+                    .topic(topic)
+                    .subscriptionName(subscriptionName)
+                    .subscribe();
+
+            log.info("Producing messages");
+            try(Producer producer = client.newProducer()
+                .topic(topic)
+                .create()
+            ) {
+                for (int i = 0; i < numKeys; i++) {
+                    producer.newMessage()
+                        .key("" + i)
+                        .value(("value-" + i).getBytes(UTF_8))
+                        .sendAsync();
+                }
+                producer.flush();
+                log.info("Successfully wrote {} values", numKeys);
+            }
+
+            log.info("Consuming half of the messages");
+            for (int i = 0; i < numKeys / 2; i++) {
+                Message m = consumer.receive(1, TimeUnit.MINUTES);
+                log.info("Read value {}", m.getKey());
+            }
+
+            if (unload) {
+                log.info("Unloading topic");
+                pulsarCluster.runAdminCommandOnAnyBroker("topics",
+                        "unload", topic);
+            }
+
+            ContainerExecResult res;
+            log.info("Deleting the topic");
+            try {
+                res = pulsarCluster.runAdminCommandOnAnyBroker("topics",
+                        "delete-partitioned-topic", "--force", topic);
+                assertNotEquals(0, res.getExitCode());
+            } catch (ContainerExecException e) {
+                log.info("Second delete failed with ContainerExecException, could be ok", e);
+                if (!e.getMessage().contains("with error code 1")) {
+                    fail("Expected different error code");
+                }
+            }
+
+            log.info("Close the consumer and delete the topic again");
+            consumer.close();
+
+            res = pulsarCluster.runAdminCommandOnAnyBroker("topics",
+                    "delete-partitioned-topic", "--force", topic);
+            assertNotEquals(0, res.getExitCode());
+
+            Thread.sleep(5000);
+            // should succeed
+            log.info("Creating the topic again");
+            this.createPartitionedTopic(topic, numBrokers * 2);
+        }
+    }
+
+
+    private ContainerExecResult createTenantName(final String tenantName,
+                                                 final String allowedClusterName,
+                                                 final String adminRoleName) throws Exception {
+        ContainerExecResult result = pulsarCluster.runAdminCommandOnAnyBroker(
+            "tenants", "create", "--allowed-clusters", allowedClusterName,
+            "--admin-roles", adminRoleName, tenantName);
+        assertEquals(0, result.getExitCode());
+        return result;
+    }
+
+    private ContainerExecResult createNamespace(final String Ns) throws Exception {
+        ContainerExecResult result = pulsarCluster.runAdminCommandOnAnyBroker(
+                "namespaces",
+                "create",
+                "--clusters",
+                pulsarCluster.getClusterName(), Ns);
+        assertEquals(0, result.getExitCode());
+        return result;
+    }
+
+    private ContainerExecResult createPartitionedTopic(final String partitionedTopicName, int numPartitions)
+            throws Exception {
+        ContainerExecResult result = pulsarCluster.runAdminCommandOnAnyBroker(
+            "topics",
+            "create-partitioned-topic",
+            "--partitions", "" + numPartitions,
+            partitionedTopicName);
+        assertEquals(0, result.getExitCode());
+        return result;
+    }
+
+
+}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/ClientTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/ClientTestBase.java
index c38d74279e7ef..2426039e58b45 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/ClientTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/ClientTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/FunctionRuntimeType.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/FunctionRuntimeType.java
index e59dc0306de63..f772ac2469008 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/FunctionRuntimeType.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/FunctionRuntimeType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
index 1ef0bba1b6803..a15a0e56f4afb 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -19,7 +19,9 @@
 package org.apache.pulsar.tests.integration.topologies;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.pulsar.tests.integration.containers.PulsarContainer.BROKER_HTTPS_PORT;
 import static org.apache.pulsar.tests.integration.containers.PulsarContainer.BROKER_HTTP_PORT;
+import static org.apache.pulsar.tests.integration.containers.PulsarContainer.BROKER_PORT_TLS;
 import static org.apache.pulsar.tests.integration.containers.PulsarContainer.CS_PORT;
 import static org.apache.pulsar.tests.integration.containers.PulsarContainer.PULSAR_CONTAINERS_LEAVE_RUNNING;
 import static org.apache.pulsar.tests.integration.containers.PulsarContainer.ZK_PORT;
@@ -132,12 +134,21 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s
         this.workerContainers = Maps.newTreeMap();
 
         this.proxyContainer = new ProxyContainer(appendClusterName("pulsar-proxy"), ProxyContainer.NAME)
-            .withNetwork(network)
-            .withNetworkAliases(appendClusterName("pulsar-proxy"))
-            .withEnv("zkServers", appendClusterName(ZKContainer.NAME))
-            .withEnv("zookeeperServers", appendClusterName(ZKContainer.NAME))
-            .withEnv("configurationStoreServers", CSContainer.NAME + ":" + CS_PORT)
-            .withEnv("clusterName", clusterName);
+                .withNetwork(network)
+                .withNetworkAliases(appendClusterName("pulsar-proxy"))
+                .withEnv("zkServers", appendClusterName(ZKContainer.NAME))
+                .withEnv("zookeeperServers", appendClusterName(ZKContainer.NAME))
+                .withEnv("configurationStoreServers", CSContainer.NAME + ":" + CS_PORT)
+                .withEnv("clusterName", clusterName)
+                // enable mTLS
+                .withEnv("webServicePortTls", String.valueOf(BROKER_HTTPS_PORT))
+                .withEnv("servicePortTls", String.valueOf(BROKER_PORT_TLS))
+                .withEnv("forwardAuthorizationCredentials", "true")
+                .withEnv("tlsRequireTrustedClientCertOnConnect", "true")
+                .withEnv("tlsAllowInsecureConnection", "false")
+                .withEnv("tlsCertificateFilePath", "/pulsar/certificate-authority/server-keys/proxy.cert.pem")
+                .withEnv("tlsKeyFilePath", "/pulsar/certificate-authority/server-keys/proxy.key-pk8.pem")
+                .withEnv("tlsTrustCertsFilePath", "/pulsar/certificate-authority/certs/ca.cert.pem");
         if (spec.proxyEnvs != null) {
             spec.proxyEnvs.forEach(this.proxyContainer::withEnv);
         }
@@ -164,7 +175,7 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s
         // create brokers
         brokerContainers.putAll(
             runNumContainers("broker", spec.numBrokers(), (name) -> {
-                    BrokerContainer brokerContainer = new BrokerContainer(clusterName, appendClusterName(name))
+                BrokerContainer brokerContainer = new BrokerContainer(clusterName, appendClusterName(name))
                         .withNetwork(network)
                         .withNetworkAliases(appendClusterName(name))
                         .withEnv("zkServers", appendClusterName(ZKContainer.NAME))
@@ -174,9 +185,17 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s
                         .withEnv("brokerServiceCompactionMonitorIntervalInSeconds", "1")
                         .withEnv("loadBalancerOverrideBrokerNicSpeedGbps", "1")
                         // used in s3 tests
-                        .withEnv("AWS_ACCESS_KEY_ID", "accesskey")
-                        .withEnv("AWS_SECRET_KEY", "secretkey")
-                        .withEnv("maxMessageSize", "" + spec.maxMessageSize);
+                        .withEnv("AWS_ACCESS_KEY_ID", "accesskey").withEnv("AWS_SECRET_KEY", "secretkey")
+                        .withEnv("maxMessageSize", "" + spec.maxMessageSize)
+                        // enable mTLS
+                        .withEnv("webServicePortTls", String.valueOf(BROKER_HTTPS_PORT))
+                        .withEnv("brokerServicePortTls", String.valueOf(BROKER_PORT_TLS))
+                        .withEnv("authenticateOriginalAuthData", "true")
+                        .withEnv("tlsRequireTrustedClientCertOnConnect", "true")
+                        .withEnv("tlsAllowInsecureConnection", "false")
+                        .withEnv("tlsCertificateFilePath", "/pulsar/certificate-authority/server-keys/broker.cert.pem")
+                        .withEnv("tlsKeyFilePath", "/pulsar/certificate-authority/server-keys/broker.key-pk8.pem")
+                        .withEnv("tlsTrustCertsFilePath", "/pulsar/certificate-authority/certs/ca.cert.pem");
                     if (spec.queryLastMessage) {
                         brokerContainer.withEnv("bookkeeperExplicitLacIntervalInMills", "10");
                         brokerContainer.withEnv("bookkeeperUseV2WireProtocol", "false");
@@ -213,6 +232,14 @@ public String getHttpServiceUrl() {
         return proxyContainer.getHttpServiceUrl();
     }
 
+    public String getAnyBrokersHttpsServiceUrl() {
+        return getAnyBroker().getHttpsServiceUrl();
+    }
+
+    public String getAnyBrokersServiceUrlTls() {
+        return getAnyBroker().getServiceUrlTls();
+    }
+
     public String getAllBrokersHttpServiceUrl() {
         String multiUrl = "http://";
         Iterator brokers = getBrokers().iterator();
@@ -440,7 +467,7 @@ private PrestoWorkerContainer buildPrestoWorkerContainer(String hostName, boolea
                 .withEnv("clusterName", clusterName)
                 .withEnv("zkServers", ZKContainer.NAME)
                 .withEnv("zookeeperServers", ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
-                .withEnv("pulsar.zookeeper-uri", ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
+                .withEnv("pulsar.metadata-url", "zk:" + ZKContainer.NAME + ":" + ZKContainer.ZK_PORT)
                 .withEnv("pulsar.web-service-url", "http://pulsar-broker-0:8080")
                 .withEnv("SQL_PREFIX_pulsar.max-message-size", "" + spec.maxMessageSize)
                 .withClasspathResourceMapping(
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java
index 6f93ce9f2561a..385af99a6644b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterSpec.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java
index cf0b64bb2aa4b..d7a1906ec582e 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarClusterTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -92,7 +92,7 @@ public PulsarCluster getPulsarCluster() {
         return pulsarCluster;
     }
 
-    private static Supplier stringSupplier(Supplier supplier) {
+    protected static Supplier stringSupplier(Supplier supplier) {
         return supplier;
     }
 
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoCluster.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoCluster.java
index 9be3c382b7035..4099aa06e5ece 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoCluster.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoCluster.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoClusterTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoClusterTestBase.java
index 51c74eee50b18..07047c7111121 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoClusterTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarGeoClusterTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarStandaloneTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarStandaloneTestBase.java
index 85d7b46c7113e..411b5217501cf 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarStandaloneTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarStandaloneTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
index 8ea5f2c6aeb2d..f10ae550f4ca2 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTest.java
index 20110cd544ae5..e4bb384ff2c87 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTestBase.java
index 8f85ea907c9bd..101530f6f22d3 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/transaction/TransactionTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarZKDowngradeTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarZKDowngradeTest.java
index ecdf8358ac375..22e963675ec7b 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarZKDowngradeTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarZKDowngradeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java
index 2dbf77d19cd1a..262ed5b9676e2 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/TestWebSocket.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/TestWebSocket.java
index 312b64b6a0921..9915f2a2b1325 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/TestWebSocket.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/TestWebSocket.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/WebSocketTestSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/WebSocketTestSuite.java
index 75f77c6675ae7..906910f7fb8e3 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/WebSocketTestSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/websocket/WebSocketTestSuite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/integration/src/test/resources/pulsar-tls.xml b/tests/integration/src/test/resources/pulsar-tls.xml
new file mode 100644
index 0000000000000..153d14b62a725
--- /dev/null
+++ b/tests/integration/src/test/resources/pulsar-tls.xml
@@ -0,0 +1,28 @@
+
+
+
+    
+        
+            
+        
+    
+
diff --git a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 4220415ba6149..c6058492e842c 100644
--- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
index 3e33cd13a47b8..d8ad93d570a33 100644
--- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
+++ b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,20 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import lombok.Cleanup;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.api.CompressionType;
@@ -29,7 +43,6 @@
 import org.apache.pulsar.client.api.CryptoKeyReader;
 import org.apache.pulsar.client.api.EncryptionKeyInfo;
 import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageCrypto;
 import org.apache.pulsar.client.api.MessageRoutingMode;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
@@ -55,21 +68,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.Security;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 public class SimpleProducerConsumerTest extends TestRetrySupport {
     private static final Logger log = LoggerFactory.getLogger(SimpleProducerConsumerTest.class);
 
diff --git a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index 23b893074fdc8..990a0a8211c71 100644
--- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 4220415ba6149..c6058492e842c 100644
--- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
index d66502f6c92c2..69ee2d0ebcbd0 100644
--- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
+++ b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +18,15 @@
  */
 package org.apache.pulsar.tests.integration;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.Security;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,6 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import lombok.Cleanup;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.api.CompressionType;
@@ -33,7 +43,6 @@
 import org.apache.pulsar.client.api.CryptoKeyReader;
 import org.apache.pulsar.client.api.EncryptionKeyInfo;
 import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageCrypto;
 import org.apache.pulsar.client.api.MessageRoutingMode;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
@@ -59,18 +68,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.Security;
-import java.util.concurrent.TimeUnit;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
 public class SimpleProducerConsumerTest extends TestRetrySupport {
     private static final Logger log = LoggerFactory.getLogger(SimpleProducerConsumerTest.class);
 
diff --git a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index 1271d708794e2..e5eef415a513d 100644
--- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
index 4220415ba6149..c6058492e842c 100644
--- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
+++ b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
index 9f6f23595c1d0..23cdac6d0934a 100644
--- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
+++ b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,6 +21,20 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import lombok.Cleanup;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.api.CompressionType;
@@ -29,7 +43,6 @@
 import org.apache.pulsar.client.api.CryptoKeyReader;
 import org.apache.pulsar.client.api.EncryptionKeyInfo;
 import org.apache.pulsar.client.api.Message;
-import org.apache.pulsar.client.api.MessageCrypto;
 import org.apache.pulsar.client.api.MessageRoutingMode;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
@@ -55,21 +68,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.Security;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 public class SimpleProducerConsumerTest extends TestRetrySupport {
     private static final Logger log = LoggerFactory.getLogger(SimpleProducerConsumerTest.class);
 
diff --git a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
index 1fc0cf6fd771f..cf2f8d1fa9235 100644
--- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
+++ b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java
index c7876f9941a84..8853ddf3da8ac 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileStoreBackedReadHandleImpl.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileStoreBackedReadHandleImpl.java
index 5d10b63de3449..bdeb88e9ac93c 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileStoreBackedReadHandleImpl.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileStoreBackedReadHandleImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
index 8e87c230adb15..d5e09ba725421 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/package-info.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/package-info.java
index 44c30e5da3e34..14f75f56351a4 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/package-info.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/package-info.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/package-info.java
index 38cfef98492a3..a41f5206f78fb 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/package-info.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java b/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java
index b3a02a4f7f618..3e6cd8745dc01 100644
--- a/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java
+++ b/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloaderTest.java b/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloaderTest.java
index 3f9dbb35551ad..1aebab571c971 100644
--- a/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloaderTest.java
+++ b/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BackedInputStream.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BackedInputStream.java
index 31ad75d962498..34ee4ea0f13e2 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BackedInputStream.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BackedInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BlockAwareSegmentInputStream.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BlockAwareSegmentInputStream.java
index 3432f76458e92..c25f162566f60 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BlockAwareSegmentInputStream.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/BlockAwareSegmentInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/DataBlockHeader.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/DataBlockHeader.java
index 0a3565c508ae7..ce0d6222c1e3d 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/DataBlockHeader.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/DataBlockHeader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java
index c7293696c2f32..e10575f5ddbb4 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlock.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlock.java
index 01b610a036e38..077f16a2beb90 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlock.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockBuilder.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockBuilder.java
index 41a7009c90b8d..cf73cf7f0b632 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockBuilder.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2.java
index 6144d7c26ed86..9dc3f00771a23 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2Builder.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2Builder.java
index a79bc9f8916a9..8373b7eb54125 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2Builder.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexBlockV2Builder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexEntry.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexEntry.java
index 99d2206ac7540..935bb54f602c0 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexEntry.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/OffloadIndexEntry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java
index 07af1e68af853..aa27df46c5e65 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -182,6 +182,7 @@ public void close() {
 
     @Override
     public int available() throws IOException {
-        return (int) (objectLen - cursor) + buffer.readableBytes();
+        long available = objectLen - cursor + buffer.readableBytes();
+        return available > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) available;
     }
 }
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java
index 499084ab9cd01..cdabe5ece0ba2 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java
index 495a6e2fcb35e..2e3d0b08970ca 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
index 606934b5f0e36..6d69b5edbc3fb 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamImpl.java
index 52d069b0f990b..d07fbdb92477b 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -278,7 +278,7 @@ public void close() throws IOException {
         // And through debug, writeBlobStore.uploadMultipartPart in the offload method also will trigger
         // the close method.
         // So we add the close variable to avoid release paddingBuf twice.
-        if (!close.compareAndSet(false, true)) {
+        if (close.compareAndSet(false, true)) {
             super.close();
             dataBlockHeaderStream.close();
             if (!entriesByteBuf.isEmpty()) {
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStream.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStream.java
index 3a323ce2d7fa0..f25c16b951ca1 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStream.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderImpl.java
index 941d79e62877f..d7631d01dd199 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtils.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtils.java
index 82f3f16599928..c5b656682dc86 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtils.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockImpl.java
index a3fa14e763a06..ef7c84e917268 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2BuilderImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2BuilderImpl.java
index fa8bc1429facd..d5761fa0e4f72 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2BuilderImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2BuilderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2Impl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2Impl.java
index 4a51e2d78ba0f..93ae53abce392 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2Impl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexBlockV2Impl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexEntryImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexEntryImpl.java
index 0a5ebb167dd13..20e9dd68cd27a 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexEntryImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexEntryImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/StreamingDataBlockHeaderImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/StreamingDataBlockHeaderImpl.java
index 4e89630b6f718..3ce1e1fecf025 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/StreamingDataBlockHeaderImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/StreamingDataBlockHeaderImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/package-info.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/package-info.java
index 7ec2725ab967a..628a0b91175cc 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/package-info.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/package-info.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/package-info.java
index 9cb573ce4d726..4667971f6a51e 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/package-info.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/BlobStoreLocation.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/BlobStoreLocation.java
index 6810651d92e9a..c7cc6b4617ff8 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/BlobStoreLocation.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/BlobStoreLocation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java
index 421551acb72c6..f859f2b73284b 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfiguration.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfiguration.java
index 18e3bbf0db8fe..d7a4e4d449f61 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfiguration.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/package-info.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/package-info.java
index 325b3e4d7444e..6cd2f3a86ccc7 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/package-info.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
index 3e7fe4577f3a7..775310925a1a3 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java
index e0da777b2c32d..497fbff3b06d2 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderBase.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderBase.java
index 1b52b39b134ea..b424496d73c39 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderBase.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderBase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java
index 952e758f0e014..9056281a308f2 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
index 6f499d153e21c..ef0bea29e35c3 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamTest.java
index 0cd4bbd70a9e6..5ca4d6da20bee 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlockAwareSegmentInputStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -30,6 +30,7 @@
 import io.netty.buffer.Unpooled;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -798,4 +799,18 @@ public void testReadTillLacWithSmallBuffer() throws Exception {
 
         inputStream.close();
     }
+
+    @Test
+    public void testCloseReleaseResources() throws Exception {
+        ReadHandle readHandle = new MockReadHandle(1, 10, 10);
+
+        BlockAwareSegmentInputStreamImpl inputStream = new BlockAwareSegmentInputStreamImpl(readHandle, 0, 1024);
+        inputStream.read();
+        Field field = BlockAwareSegmentInputStreamImpl.class.getDeclaredField("paddingBuf");
+        field.setAccessible(true);
+        ByteBuf paddingBuf = (ByteBuf) field.get(inputStream);
+        assertEquals(1, paddingBuf.refCnt());
+        inputStream.close();
+        assertEquals(0, paddingBuf.refCnt());
+    }
 }
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
index a5dc7ba17076f..e62ede777d132 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
index 917700a87218f..2e28458473f45 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
index 5233933dd015e..468f3cdfd021d 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtilsTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtilsTest.java
index 017c18d364e54..99fb862933edc 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtilsTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
index f838b06473a74..774b0143f956e 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexTest.java
index a5dd8a3d6a6d1..ca248ebf8aef1 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexV2Test.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexV2Test.java
index dd3df41cb1f39..b82f20ede2ce6 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexV2Test.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffloadIndexV2Test.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/AbstractJCloudBlobStoreFactoryTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/AbstractJCloudBlobStoreFactoryTest.java
index 0391d7da087f5..17a337cc22a3c 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/AbstractJCloudBlobStoreFactoryTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/AbstractJCloudBlobStoreFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProviderTests.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProviderTests.java
index 4f0c60bc00708..298eaaff6099f 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProviderTests.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProviderTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
index 85985b94a407f..9376ef18cd649 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TransientBlobStoreFactoryTests.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TransientBlobStoreFactoryTests.java
index ec5702300ba1d..7940051f42bd8 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TransientBlobStoreFactoryTests.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TransientBlobStoreFactoryTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
diff --git a/wiki/assets/release-note-guide-1.png b/wiki/assets/release-note-guide-1.png
deleted file mode 100644
index 25120c886e606..0000000000000
Binary files a/wiki/assets/release-note-guide-1.png and /dev/null differ
diff --git a/wiki/release/create-gpg-keys.md b/wiki/release/create-gpg-keys.md
deleted file mode 100644
index 66d467a1f227e..0000000000000
--- a/wiki/release/create-gpg-keys.md
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-# Create GPG keys to sign release artifacts
-
-This page provides instructions for Pulsar committers on how to do
-the initial gpg setup.
-
-This is a condensed version of instructions available at
-http://apache.org/dev/openpgp.html.
-
-
-Install GnuPG. For example on MacOS:
-
-```shell
-brew install gnupg
-```
-
-Set configuration to use `SHA512` keys by default.
-
-```shell
-mkdir ~/.gnupg
-cat <> ~/.gnupg/gpg.conf
-personal-digest-preferences SHA512
-cert-digest-algo SHA512
-default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
-EOL
-chmod 700 ~/.gnupg/gpg.conf
-```
-
-Check the version.
-
-```shell
-gpg --version
-
-gpg (GnuPG) 2.1.22
-libgcrypt 1.8.0
-Copyright (C) 2017 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later 
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Home: /Users/nkurihar/.gnupg
-Supported algorithms:
-Pubkey: RSA, ELG, DSA, ECDH, ECDSA, EDDSA
-Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
-        CAMELLIA128, CAMELLIA192, CAMELLIA256
-Hash: SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
-Compression: Uncompressed, ZIP, ZLIB, BZIP2
-```
-
-Generate new GPG key.
-Note that new **RSA** keys generated should be at least **4096** bits.
-
-```shell
-# For 1.x or 2.0.x
-gpg --gen-key
-
-# For 2.1.x
-gpg --full-gen-key
-
-gpg (GnuPG) 2.1.22; Copyright (C) 2017 Free Software Foundation, Inc.
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Please select what kind of key you want:
-   (1) RSA and RSA (default)
-   (2) DSA and Elgamal
-   (3) DSA (sign only)
-   (4) RSA (sign only)
-Your selection? 1
-RSA keys may be between 1024 and 4096 bits long.
-What keysize do you want? (2048) 4096
-Requested keysize is 4096 bits       
-Please specify how long the key should be valid.
-         0 = key does not expire
-        = key expires in n days
-      w = key expires in n weeks
-      m = key expires in n months
-      y = key expires in n years
-Key is valid for? (0) 0
-Key does not expire at all
-Is this correct? (y/N) y
-                        
-GnuPG needs to construct a user ID to identify your key.
-
-Real name: test user
-Email address: test@apache.org
-Comment: CODE SIGNING KEY     
-You selected this USER-ID:
-    "test user (CODE SIGNING KEY) "
-
-Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? O
-
-```
-
-#### Appending the key to KEYS files
-
-The GPG key needs to be appended to `KEYS` file that is stored in 2 SVN locations,
-one for proper releases and one for the release candidates.
-
-The credentials for SVN are the usual Apache account credentials.
-
-```shell
-# Checkout the SVN folder containing the KEYS file
-svn co https://dist.apache.org/repos/dist/dev/pulsar pulsar-dist-dev-keys --depth empty
-cd pulsar-dist-dev-keys
-svn up KEYS
-
-APACHEID=apacheid
-# Export the key in ascii format and append it to the file
-( gpg --list-sigs $APACHEID@apache.org
-  gpg --export --armor $APACHEID@apache.org ) >> KEYS
-
-# Commit to SVN
-svn ci -m "Added gpg key for $APACHEID"
-```
-
-Repeat the same operation for the release KEYS file:
-
-> :warning: You should ask a PMC member to complete this step.
-
-```shell
-# Checkout the SVN folder containing the KEYS file
-svn co https://dist.apache.org/repos/dist/release/pulsar pulsar-dist-release-keys --depth empty
-cd pulsar-dist-release-keys
-svn up KEYS
-
-APACHEID=apacheid
-# Export the key in ascii format and append it to the file
-( gpg --list-sigs $APACHEID@apache.org
-  gpg --export --armor $APACHEID@apache.org ) >> KEYS
-
-# Commit to SVN
-svn ci -m "Added gpg key for $APACHEID"
-```
-
-#### Upload the key to a public key server
-
-Use the key id to publish it to several public key servers:
-```shell
-gpg --send-key 8C75C738C33372AE198FD10CC238A8CAAC055FD2
-gpg --send-key --keyserver=keys.openpgp.org 8C75C738C33372AE198FD10CC238A8CAAC055FD2
-gpg --send-key --keyserver=keyserver.ubuntu.com 8C75C738C33372AE198FD10CC238A8CAAC055FD2
-```
\ No newline at end of file
diff --git a/wiki/release/release-candidate-validation.md b/wiki/release/release-candidate-validation.md
deleted file mode 100644
index 082cc466da87e..0000000000000
--- a/wiki/release/release-candidate-validation.md
+++ /dev/null
@@ -1,611 +0,0 @@
-
-
-# Release Candidate Validation
-
-- [Validate Binary Distribution](#validate-the-binary-distribution)
-    * [Download And Verify Binary Distributions](#download-the-binary-distributions)
-    * [Validate Pub/Sub and Java Functions](#validate-pubsub-and-java-functions)
-    * [Validate Connectors](#validate-connectors)
-    * [Validate Stateful Functions](#validate-stateful-functions)
-
-The following are manual instructions for reviewing and validating a release candidate.
-You can automate these steps. Contributions are welcome!
-
-## Validate the binary distribution
-
-### Download And Verify the binary distributions
-
-Download the server distribution `apache-pulsar--bin.tar.gz` and extract it. The extracted files are in a directory called `apache-pulsar-`. All the operations below happen within that directory.
-
-```shell
-$ cd apache-pulsar-
-$ mkdir connectors
-```
-
-Download the Pulsar IO Connector files
-```
-pulsar-io-aerospike-.nar
-pulsar-io-cassandra-.nar
-pulsar-io-kafka-.nar
-pulsar-io-kinesis-.nar
-pulsar-io-rabbitmq-.nar
-pulsar-io-twitter-.nar
-```
-and place them in the `connectors` directory.
-
-Download the `*.asc` file and verify the GPG signature
-
-```bash
-gpg verify apache-pulsar--bin.tar.gz.asc
-```
-
-### Validate Pub/Sub and Java Functions
-
-1. Open a terminal to start a standalone cluster.
-
-```shell
-$ bin/pulsar standalone
-```
-
-When you start a standalone cluster, there are a few things to check.
-
-a) The standalone cluster is able to locate all the connectors. The following logging information should be displayed.
-
-```shell
-Found connector ConnectorDefinition(name=kinesis, description=Kinesis sink connector, sourceClass=null, sinkClass=org.apache.pulsar.io.kinesis.KinesisSink) from /Users/sijie/tmp/apache-pulsar-2.1.0-incubating/./connectors/pulsar-io-kinesis-2.1.0-incubating.nar
-...
-Found connector ConnectorDefinition(name=cassandra, description=Writes data into Cassandra, sourceClass=null, sinkClass=org.apache.pulsar.io.cassandra.CassandraStringSink) from /Users/sijie/tmp/apache-pulsar-2.1.0-incubating/./connectors/pulsar-io-cassandra-2.1.0-incubating.nar
-...
-Found connector ConnectorDefinition(name=aerospike, description=Aerospike database sink, sourceClass=null, sinkClass=org.apache.pulsar.io.aerospike.AerospikeStringSink) from /Users/sijie/tmp/apache-pulsar-2.1.0-incubating/./connectors/pulsar-io-aerospike-2.1.0-incubating.nar
-```
-
-b) (since Pulsar 2.1 release) The standalone starts bookkeeper table service. The output is similar as follows:
-
-```shell
-12:12:26.099 [main] INFO  org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble - 'default' namespace for table service : namespace_name: "default"
-default_stream_conf {
-  key_type: HASH
-  min_num_ranges: 24
-  initial_num_ranges: 24
-  split_policy {
-    fixed_range_policy {
-      num_ranges: 2
-    }
-  }
-  rolling_policy {
-    size_policy {
-      max_segment_size: 134217728
-    }
-  }
-  retention_policy {
-    time_policy {
-      retention_minutes: -1
-    }
-  }
-}
-```
-
-c) Functions worker is started correctly. The output is similar as follows:
-
-```shell
-14:28:24.101 [main] INFO  org.apache.pulsar.functions.worker.WorkerService - Starting worker c-standalone-fw-localhost-8080...
-14:28:24.907 [main] INFO  org.apache.pulsar.functions.worker.WorkerService - Worker Configs: {
-  "workerId" : "c-standalone-fw-localhost-8080",
-  "workerHostname" : "localhost",
-  "workerPort" : 8080,
-  "workerPortTls" : 6751,
-  "jvmGCMetricsLoggerClassName" : null,
-  "numHttpServerThreads" : 8,
-  "connectorsDirectory" : "./connectors",
-  "functionMetadataTopicName" : "metadata",
-  "functionWebServiceUrl" : null,
-  "pulsarServiceUrl" : "pulsar://127.0.0.1:6650",
-  "pulsarWebServiceUrl" : "http://127.0.0.1:8080",
-  "clusterCoordinationTopicName" : "coordinate",
-  "pulsarFunctionsNamespace" : "public/functions",
-  "pulsarFunctionsCluster" : "standalone",
-  "numFunctionPackageReplicas" : 1,
-  "downloadDirectory" : "/tmp/pulsar_functions",
-  "stateStorageServiceUrl" : "bk://127.0.0.1:4181",
-  "functionAssignmentTopicName" : "assignments",
-  "schedulerClassName" : "org.apache.pulsar.functions.worker.scheduler.RoundRobinScheduler",
-  "failureCheckFreqMs" : 30000,
-  "rescheduleTimeoutMs" : 60000,
-  "initialBrokerReconnectMaxRetries" : 60,
-  "assignmentWriteMaxRetries" : 60,
-  "instanceLivenessCheckFreqMs" : 30000,
-  "clientAuthenticationPlugin" : null,
-  "clientAuthenticationParameters" : null,
-  "topicCompactionFrequencySec" : 1800,
-  "tlsEnabled" : true,
-  "tlsCertificateFilePath" : null,
-  "tlsKeyFilePath" : null,
-  "tlsTrustCertsFilePath" : null,
-  "tlsAllowInsecureConnection" : false,
-  "tlsRequireTrustedClientCertOnConnect" : false,
-  "useTls" : false,
-  "tlsHostnameVerificationEnable" : false,
-  "authenticationEnabled" : false,
-  "authenticationProviders" : null,
-  "authorizationEnabled" : false,
-  "superUserRoles" : null,
-  "properties" : { },
-  "threadContainerFactory" : null,
-  "processContainerFactory" : {
-    "javaInstanceJarLocation" : null,
-    "pythonInstanceLocation" : null,
-    "logDirectory" : null,
-    "extraFunctionDependenciesDir" : null
-  },
-  "kubernetesContainerFactory" : null,
-  "secretsProviderConfiguratorClassName" : null,
-  "secretsProviderConfiguratorConfig" : null,
-  "functionInstanceMinResources" : null,
-  "workerWebAddress" : "http://localhost:8080",
-  "functionMetadataTopic" : "persistent://public/functions/metadata",
-  "clusterCoordinationTopic" : "persistent://public/functions/coordinate",
-  "functionAssignmentTopic" : "persistent://public/functions/assignments"
-}
-```
-
-d) Do sanity check before moving to the next step.
-
-```shell
-// check pulsar binary port is listened correctly
-$ netstat -an | grep 6650 | grep LISTEN
-
-// check function cluster
-$ curl -s http://localhost:8080/admin/v2/worker/cluster
-// example output
-[{"workerId":"c-standalone-fw-localhost-6750","workerHostname":"localhost","port":6750}]
-
-// check brokers
-$ curl -s http://localhost:8080/admin/v2/namespaces/public
-// example outoupt
-["public/default","public/functions"]
-
-// check connectors
-$ curl -s http://localhost:8080/admin/v2/functions/connectors
-// example output
-[{"name":"aerospike","description":"Aerospike database sink","sinkClass":"org.apache.pulsar.io.aerospike.AerospikeStringSink"},{"name":"cassandra","description":"Writes data into Cassandra","sinkClass":"org.apache.pulsar.io.cassandra.CassandraStringSink"},{"name":"kafka","description":"Kafka source and sink connector","sourceClass":"org.apache.pulsar.io.kafka.KafkaStringSource","sinkClass":"org.apache.pulsar.io.kafka.KafkaStringSink"},{"name":"kinesis","description":"Kinesis sink connector","sinkClass":"org.apache.pulsar.io.kinesis.KinesisSink"},{"name":"rabbitmq","description":"RabbitMQ source connector","sourceClass":"org.apache.pulsar.io.rabbitmq.RabbitMQSource"},{"name":"twitter","description":"Ingest data from Twitter firehose","sourceClass":"org.apache.pulsar.io.twitter.TwitterFireHose"}]
-
-// check table services
-$ nc -vz4 localhost 4181
-```
-
-2. Open another terminal to submit a Java Exclamation function.
-
-a) Create tenant and namespace.
-
-```shell
-$ bin/pulsar-admin tenants create test
-$ bin/pulsar-admin namespaces create test/test-namespace
-```
-
-b) Create function.
-
-```shell
-$ bin/pulsar-admin functions create --function-config-file examples/example-function-config.yaml --jar examples/api-examples.jar
-```
-
-The following information is returned.
-`Created Successfully`
-
-3. At the same terminal as step 2, retrieve the function configuration.
-
-```shell
-$ bin/pulsar-admin functions get --tenant test --namespace test-namespace --name example
-```
-
-The output is similar as follows:
-
-```shell
-{
-  "tenant": "test",
-  "namespace": "test-namespace",
-  "name": "example",
-  "className": "org.apache.pulsar.functions.api.examples.ExclamationFunction",
-  "userConfig": "{\"PublishTopic\":\"test_result\"}",
-  "autoAck": true,
-  "parallelism": 1,
-  "source": {
-    "topicsToSerDeClassName": {
-      "test_src": ""
-    },
-    "typeClassName": "java.lang.String"
-  },
-  "sink": {
-    "topic": "test_result",
-    "typeClassName": "java.lang.String"
-  },
-  "resources": {}
-}
-```
-
-4. At the same terminal as step 3, retrieve the function status.
-
-```shell
-$ bin/pulsar-admin functions status --tenant test --namespace test-namespace --name example
-```
-The output is similar as follows:
-
-```shell
-{
-  "numInstances" : 1,
-  "numRunning" : 1,
-  "instances" : [ {
-    "instanceId" : 0,
-    "status" : {
-      "running" : true,
-      "error" : "",
-      "numRestarts" : 0,
-      "numReceived" : 0,
-      "numSuccessfullyProcessed" : 0,
-      "numUserExceptions" : 0,
-      "latestUserExceptions" : [ ],
-      "numSystemExceptions" : 0,
-      "latestSystemExceptions" : [ ],
-      "averageLatency" : 0.0,
-      "lastInvocationTime" : 0,
-      "workerId" : "c-standalone-fw-localhost-8080"
-    }
-  } ]
-}
-```
-
-5. At the same terminal as step 4, subscribe the output topic `test_result`.
-
-```shell
-$ bin/pulsar-client consume -s test-sub -n 0 test_result
-```
-
-6. Open a new terminal to produce messages into the input topic `test_src`.
-
-```shell
-$ bin/pulsar-client produce -m "test-messages-`date`" -n 10 test_src
-```
-
-7. At the terminal of step 5, the messages produced by the Exclamation function is returned. The output is similar as follows:
-
-```shell
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
------ got message -----
-test-messages-Thu Jul 19 11:59:15 PDT 2018!
-```
-
-### Validate Connectors
-
-> Make sure you have docker available at your laptop. If you haven't installed docker, you can skip this section.
-
-1. Set up a cassandra cluster.
-
-```shell
-$ docker run -d --rm  --name=cassandra -p 9042:9042 cassandra
-```
-
-Make sure that the cassandra cluster is running.
-
-```shell
-// run docker ps to find the docker process for cassandra
-$ docker ps
-```
-
-```shell
-// check if the cassandra is running as expected
-$ docker logs cassandra
-```
-
-```shell
-// check the cluster status
-$ docker exec cassandra nodetool status
-Datacenter: datacenter1
-=======================
-Status=Up/Down
-|/ State=Normal/Leaving/Joining/Moving
---  Address     Load       Tokens       Owns (effective)  Host ID                               Rack
-UN  172.17.0.2  103.67 KiB  256          100.0%            af0e4b2f-84e0-4f0b-bb14-bd5f9070ff26  rack1
-```
-
-2. Create keyspace and table.
-
-Run cqlsh:
-```shell
-$ docker exec -ti cassandra cqlsh localhost
-Connected to Test Cluster at localhost:9042.
-[cqlsh 5.0.1 | Cassandra 3.11.2 | CQL spec 3.4.4 | Native protocol v4]
-Use HELP for help.
-cqlsh>
-```
-
-In the cqlsh, create the `pulsar_test_keyspace` keyspace and the `pulsar_test_table` table.
-
-```shell
-cqlsh> CREATE KEYSPACE pulsar_test_keyspace WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};
-cqlsh> USE pulsar_test_keyspace;
-cqlsh:pulsar_test_keyspace> CREATE TABLE pulsar_test_table (key text PRIMARY KEY, col text);
-
-```
-
-3. Prepare a cassandra sink yaml file and put it under examples directory as `cassandra-sink.yml`.
-
-```shell
-$ cat examples/cassandra-sink.yml
-configs:
-    roots: "localhost:9042"
-    keyspace: "pulsar_test_keyspace"
-    columnFamily: "pulsar_test_table"
-    keyname: "key"
-    columnName: "col"
-```
-
-4. Submit a cassandra sink.
-
-```shell
-$ bin/pulsar-admin sink create --tenant public --namespace default --name cassandra-test-sink --sink-type cassandra --sink-config-file examples/cassandra-sink.yml --inputs test_cassandra
-"Created successfully"
-```
-
-```shell
-// get the sink info
-$ bin/pulsar-admin sink get --tenant public --namespace default --name cassandra-test-sink
-{
-  "tenant": "public",
-  "namespace": "default",
-  "name": "cassandra-test-sink",
-  "className": "org.apache.pulsar.io.cassandra.CassandraStringSink",
-  "inputSpecs": {
-    "test_cassandra": {
-      "isRegexPattern": false
-    }
-  },
-  "configs": {
-    "roots": "localhost:9042",
-    "keyspace": "pulsar_test_keyspace",
-    "columnFamily": "pulsar_test_table",
-    "keyname": "key",
-    "columnName": "col"
-  },
-  "parallelism": 1,
-  "processingGuarantees": "ATLEAST_ONCE",
-  "retainOrdering": false,
-  "autoAck": true,
-  "archive": "builtin://cassandra"
-}
-```
-
-```shell
-// get the running status
-$ bin/pulsar-admin sink status --tenant public --namespace default --name cassandra-test-sink
-{
-  "numInstances" : 1,
-  "numRunning" : 1,
-  "instances" : [ {
-    "instanceId" : 0,
-    "status" : {
-      "running" : true,
-      "error" : "",
-      "numRestarts" : 0,
-      "numReadFromPulsar" : 0,
-      "numSystemExceptions" : 0,
-      "latestSystemExceptions" : [ ],
-      "numSinkExceptions" : 0,
-      "latestSinkExceptions" : [ ],
-      "numWrittenToSink" : 0,
-      "lastReceivedTime" : 0,
-      "workerId" : "c-standalone-fw-localhost-8080"
-    }
-  } ]
-}
-```
-
-5. Produce messages to the source topic.
-```shell
-$ for i in {0..10}; do bin/pulsar-client produce -m "key-$i" -n 1 test_cassandra; done
-```
-
-6. Check the sink status, and 11 messages are processed.
-
-```shell
-$ bin/pulsar-admin sink status --tenant public --namespace default --name cassandra-test-sink
-{
-  "numInstances" : 1,
-  "numRunning" : 1,
-  "instances" : [ {
-    "instanceId" : 0,
-    "status" : {
-      "running" : true,
-      "error" : "",
-      "numRestarts" : 0,
-      "numReadFromPulsar" : 11,
-      "numSystemExceptions" : 0,
-      "latestSystemExceptions" : [ ],
-      "numSinkExceptions" : 0,
-      "latestSinkExceptions" : [ ],
-      "numWrittenToSink" : 11,
-      "lastReceivedTime" : 1554833501277,
-      "workerId" : "c-standalone-fw-localhost-8080"
-    }
-  } ]
-}
-```
-
-7. Check results in cassandra.
-
-```shell
-$ docker exec -ti cassandra cqlsh localhost
-Connected to Test Cluster at localhost:9042.
-[cqlsh 5.0.1 | Cassandra 3.11.2 | CQL spec 3.4.4 | Native protocol v4]
-Use HELP for help.
-cqlsh> use pulsar_test_keyspace;
-cqlsh:pulsar_test_keyspace> select * from pulsar_test_table;
-
- key    | col
---------+--------
-  key-5 |  key-5
-  key-0 |  key-0
-  key-9 |  key-9
-  key-2 |  key-2
-  key-1 |  key-1
-  key-3 |  key-3
-  key-6 |  key-6
-  key-7 |  key-7
-  key-4 |  key-4
-  key-8 |  key-8
- key-10 | key-10
-
-(11 rows)
-```
-
-8. Delete the sink.
-
-```shell
-$ bin/pulsar-admin sink delete --tenant public --namespace default --name cassandra-test-sink
-"Deleted successfully"
-```
-
-### Validate Stateful Functions
-
-Since Pulsar 2.1 release, Pulsar enables bookkeeper table service for stateful Pulsar functions (as a developer preview).
-
-The following are instructions to validate counter functions.
-
-1. Create a wordcount function.
-
-```shell
-$ bin/pulsar-admin functions create --function-config-file examples/example-function-config.yaml --jar examples/api-examples.jar --name word_count --className org.apache.pulsar.functions.api.examples.WordCountFunction --inputs test_wordcount_src --output test_wordcount_dest
-"Created successfully"
-```
-
-2. Get function information and status.
-
-```shell
-$ bin/pulsar-admin functions get --tenant test --namespace test-namespace --name word_count
-{
-  "tenant": "test",
-  "namespace": "test-namespace",
-  "name": "word_count",
-  "className": "org.apache.pulsar.functions.api.examples.WordCountFunction",
-  "inputSpecs": {
-    "test_wordcount_src": {
-      "isRegexPattern": false
-    }
-  },
-  "output": "test_wordcount_dest",
-  "processingGuarantees": "ATLEAST_ONCE",
-  "retainOrdering": false,
-  "userConfig": {
-    "PublishTopic": "test_result"
-  },
-  "runtime": "JAVA",
-  "autoAck": true,
-  "parallelism": 1,
-  "resources": {
-    "cpu": 1.0,
-    "ram": 1073741824,
-    "disk": 10737418240
-  },
-  "cleanupSubscription": true
-}
-```
-
-```shell
-$ bin/pulsar-admin functions status --tenant test --namespace test-namespace --name word_count
-{
-  "numInstances" : 1,
-  "numRunning" : 1,
-  "instances" : [ {
-    "instanceId" : 0,
-    "status" : {
-      "running" : true,
-      "error" : "",
-      "numRestarts" : 0,
-      "numReceived" : 0,
-      "numSuccessfullyProcessed" : 0,
-      "numUserExceptions" : 0,
-      "latestUserExceptions" : [ ],
-      "numSystemExceptions" : 0,
-      "latestSystemExceptions" : [ ],
-      "averageLatency" : 0.0,
-      "lastInvocationTime" : 0,
-      "workerId" : "c-standalone-fw-localhost-8080"
-    }
-  } ]
-}
-```
-
-3. Query the state table for the function: watching on a key called "hello"
-
-```shell
-$ bin/pulsar-admin functions querystate --tenant test --namespace test-namespace --name word_count -k hello -w
-key 'hello' doesn't exist.
-key 'hello' doesn't exist.
-key 'hello' doesn't exist
-```
-
-4. Produce the messages to source topic `test_wordcount_src`.
-
-Produce 10 messages "hello" to the `test_wordcount_src` topic. The value of "hello" is updated to 10.
-
-```shell
-$ bin/pulsar-client produce -m "hello" -n 10 test_wordcount_src
-```
-
-Checkout the result in the terminal of step 3.
-
-```shell
-{
-  "key": "hello",
-  "numberValue": 10,
-  "version": 9
-}
-```
-
-Produce another 10 messages "hello". The result is updated to 20.
-
-```shell
-$ bin/pulsar-client produce -m "hello" -n 10 test_wordcount_src
-```
-
-The result in the terminal of step 3 is updated to `20`.
-
-```shell
-  "key": "hello",
-  "numberValue": 20,
-  "version": 19
-```
diff --git a/wiki/release/release-note-guide.md b/wiki/release/release-note-guide.md
deleted file mode 100644
index 2ae6a51be265d..0000000000000
--- a/wiki/release/release-note-guide.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Pulsar Release Note Guide
-
-This guide explains everything about Pulsar release notes.
-
-
-- [Intro to release notes](#intro-to-release-notes)
-  - [Basic info](#basic-info)
-  - [Maintenance info](#maintenance-info)
-- [Submit release notes](#submit-release-notes)
-
-
-
-## Intro to release notes
-
-This chapter gives an overview of Pulsar release notes.
-
-### Basic info
-
-[Pulsar release notes](https://pulsar.apache.org/release-notes/) consist of the following parts.
-
-Release note | Component
----|---
-[Pulsar core](https://pulsar.apache.org/release-notes/#pulsar-release-notes)| Pulsar
-[Pulsar clients](../../site2/docs/client-libraries.md) |- Java 

     - WebSocket 

     - C++ 

     - Python 

     - Go 

     - NodeJs 

     - C#
-
-### Maintenance info
-
-For the [Pulsar Release Note page](https://pulsar.apache.org/release-notes/):
-
-- It is generated automatically using [release-json-gen.sh](https://github.com/apache/pulsar-site/blob/main/site2/tools/release-json-gen.sh).
-  
-  For implementation details, see [PIP 112: Generate Release Notes Automatically](https://github.com/apache/pulsar/wiki/PIP-112:-Generate-Release-Notes-Automatically).
-
-- The info is fetched from the [Pulsar Releases Page - GitHub](https://github.com/apache/pulsar/releases).
-  
-- It is updated when one of the following conditions is met:
-
-  - A commit is pushed to the [pulsar-site repo](https://github.com/apache/pulsar-site). 
-  
-  - A [Pulsar site sync job](https://github.com/apache/pulsar-site/actions/workflows/ci-pulsar-website-docs-sync.yaml) is performed (every 6 hours).
-
-## Submit release notes
-
-Follow the steps below to submit release notes for Pulsar and clients (**Java and WebSocket**).
-
-> **Note**
->
-> For **C++, Python, Go, Node.js, and C#**, you do not need to take care of them since their release notes are synced from their repos to the [Pulsar Release Note page](https://pulsar.apache.org/release-notes).
-
-1. Submit a PR to add **separate** release notes for Pulsar and clients (**Java and WebSocket**) to [pulsar-site/site2/website-next/release-notes/versioned/](https://github.com/apache/pulsar-site/tree/main/site2/website-next/release-notes/versioned). 
-
-    Get this PR reviewed and merged.
-
-2. Copy the release note to the [Pulsar Releases Page - GitHub](https://github.com/apache/pulsar/releases).
-
-    
    
-    
-      
-        
-        
-      
-    
-    
-      
-        
-        
-      
-      
-        
-        
-      
-    
-    
    ComponentStep
    Pulsar coreCopy the release note content.
    Pulsar clients - Java

     - WebSocket 

     
-            		Create independent sections for each client and copy release note content.

    Example

    Java client release note example
    
-
-    After the new release is published, all the information about the release is automatically added to the [Pulsar Release Note page](https://pulsar.apache.org/release-notes/).
-
-3. Check whether the release information is shown on the [Pulsar Release Note page](https://pulsar.apache.org/release-notes/) after the website is updated and built successfully.
\ No newline at end of file
diff --git a/wiki/release/release-process.md b/wiki/release/release-process.md
deleted file mode 100644
index d7146192856f0..0000000000000
--- a/wiki/release/release-process.md
+++ /dev/null
@@ -1,574 +0,0 @@
-
-
-# Release Process
-
-This page contains instructions for Pulsar committers on how to perform a release.
-
-> **NOTE**: The term `major/minor releases` used throughout this document is defined as follows:
->
-> * Major releases refer to feature releases, such as 2.10.0, 2.11.0, and so on.
->
-> * Minor releases refer to bug-fix releases, such as 2.10.1, 2.10.2, and so on.
-
-
-## Preparation
-
-Open a discussion in dev@apache.org to notify others that you volunteer to be the release manager of a specific release. If there are no disagreements, you can start the release process.
-
-For major releases, you should create a new branch named `branch-2.X.0` once all PRs with the 2.X.0 milestone are merged. If some PRs with the 2.X.0 milestone are still working in progress and might take much time to complete, you can move them to the next milestone if they are not important. In this case, you'd better notify the author in the PR.
-
-For minor releases, if there are no disagreements, you should cherry-pick all merged PRs with the `release/X.Y.Z` labels into `branch-X.Y`. After these PRs are cherry-picked, you should add the `cherry-picked/branch-X.Y` labels.
-
-Sometimes some PRs cannot be cherry-picked cleanly, you might need to create a separate PR and move the `release/X.Y.Z` label from the original PR to it. In this case, you can ask the author to help create the new PR.
-
-For PRs that are still open, you can choose to delay them to the next release or ping others to review so that they can be merged.
-
-To verify the release branch is not broken, you can synchronize the branch in your private repo and open a PR to trigger the CI. Example: https://github.com/BewareMyPower/pulsar/pull/3
-
-> You can use the following command to catch basic compilation or checkstyle errors in your local env before cherry-picking.
->
-> ```bash
-> mvn -Pcore-modules,-main -T 1C clean install -DskipTests -Dspotbugs.skip=true
-> ```
-
-## Requirements
-
-If you haven't already done it, [create and publish the GPG key](https://github.com/apache/pulsar/blob/master/wiki/release/create-gpg-keys.md) to sign the release artifacts.
-
-Before you start the next release steps, make sure you have installed the **JDK8** and maven **3.6.1** for Pulsar 2.6 and Pulsar 2.7, and **JDK11** and Maven **3.6.1** for Pulsar 2.8 onwards. And **clean up the bookkeeper's local compiled** to make sure the bookkeeper dependency is fetched from the Maven repo, details to see https://lists.apache.org/thread/gsbh95b2d9xtcg5fmtxpm9k9q6w68gd2
-
-## Create the release branch
-
-We are going to create a branch from `master` to `branch-v2.X`
-where the tag will be generated and where new fixes will be
-applied as part of the maintenance for the release.
-
-The branch needs only to be created when creating major releases,
-and not for minor releases like `2.3.1`. For minor releases, go to the next step.
-
-For example, when you create the `v2.3.0` release, the branch `branch-2.3` will be created; but for `v2.3.1`, we
-keep using the old `branch-2.3`.
-
-In these instructions, I'm referring to a fictitious release `2.X.0`. Change the release version in the examples accordingly with the real version.
-
-It is recommended to create a fresh clone of the repository to avoid any local files interfering in the process:
-
-```shell
-git clone git@github.com:apache/pulsar.git
-cd pulsar
-git checkout -b branch-2.X origin/master
-```
-
-Alternatively, you can use a git workspace to create a new, clean directory on your machine without needing to re-download the project.
-
-```shell
-git worktree add ../pulsar.branch-2.X branch-2.X
-```
-
-If you created a new branch, update the `CI - OWASP Dependency Check` workflow so that it will run on the new branch. At the time of writing, here is the file that should be updated: https://github.com/apache/pulsar/blob/master/.github/workflows/ci-owasp-dependency-check.yaml.
-
-Note also that you should stop the GitHub action for Pulsar versions that are EOL.
-
-Also, if you created a new branch, please update the `Security Policy and Supported Versions` page on the website. This page has a table for support timelines based on when minor releases take place.
-
-## Update project version and tag
-
-During the release process, you are going to initially create
-"candidate" tags, that after verification and approval will
-get promoted to the "real" final tag.
-
-In this process, the maven version of the project will always
-be the final one.
-
-```shell
-# Bump to the release version
-./src/set-project-version.sh 2.X.0
-
-# Some version may not update the right parent version of `protobuf-shaded/pom.xml`, please double check it.
-
-# Commit
-git commit -m 'Release 2.X.0' -a
-
-# Create a "candidate" tag
-# If you don't sign your commits already, use the following
-export GPG_TTY=$(tty)
-git tag -u $USER@apache.org v2.X.0-candidate-1 -m 'Release v2.X.0-candidate-1'
-# If you already sign your commits using your apache.org email, use the following
-git tag -s v2.X.0-candidate-1 -m 'Release v2.X.0-candidate-1'
-
-# Verify that you signed your tag before pushing it:
-git tag -v v2.X.0-candidate-1
-
-# Push both the branch and the tag to Github repo
-git push origin branch-2.X
-git push origin v2.X.0-candidate-1
-```
-
-For minor releases, the tag is like `2.3.1`.
-
-## Build and inspect the artifacts
-
-```shell
-mvn clean install -DskipTests
-```
-
-After the build, there will be 4 generated artifacts:
-
-* `distribution/server/target/apache-pulsar-2.X.0-bin.tar.gz`
-* `target/apache-pulsar-2.X.0-src.tar.gz`
-* `distribution/offloaders/target/apache-pulsar-offloaders-2.X.0-bin.tar.gz`
-* directory `distribution/io/target/apache-pulsar-io-connectors-2.x.0-bin` contains all io connect nars
-
-Inspect the artifacts:
-* Check that the `LICENSE` and `NOTICE` files cover all included jars for the -bin package)
-    - Use script to cross-validate `LICENSE` file with included jars:
-       ```
-       src/check-binary-license distribution/server/target/apache-pulsar-2.x.0-bin.tar.gz
-       ```
-* Unpack src package: `target/apache-pulsar-2.X.0-src.tar.gz`
-    - Run Apache RAT to verify the license headers in the `src` package:
-       ```shell
-       cd apache-pulsar-2.X.0
-       mvn apache-rat:check
-       ```
-* Unpack bin package: `distribution/server/target/apache-pulsar-2.X.0-bin.tar.gz`, Check that the standalone Pulsar service starts correctly:
- ```shell
- cd apache-pulsar-2.X.0
- cp -r ../../../io/target/apache-pulsar-io-connectors-2.X.0-bin connectors
- bin/pulsar standalone
- ```
-
-* Use instructions in [Release-Candidate-Validation](https://github.com/apache/pulsar/blob/master/wiki/release/release-candidate-validation.md) to do some sanity checks on the produced binary distributions.
-
-### Build RPM and DEB packages
-
-```shell
-pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
-
-pulsar-client-cpp/pkg/deb/docker-build-deb.sh
-```
-
-> For 2.11.0 or higher, you can set the environment variable `BUILD_IMAGE` to build the base image locally instead of pulling from the DockerHub.
-> Since only a few members have the permission to push the image to DockerHub, the image might not be the latest, if you failed to build the RPM and DEB packages, you can run `export BUILD_IMAGE=1` before running these commands.
-
-This will leave the RPM/YUM and DEB repo files in `pulsar-client-cpp/pkg/rpm/RPMS/x86_64` and
-`pulsar-client-cpp/pkg/deb/BUILD/DEB` directory.
-
-> **NOTE**: If you get error `c++: internal compiler error: Killed (program cc1plus)` when run `pulsar-client-cpp/pkg/deb/docker-build-deb.sh`. You may need to expand your docker memory greater than 2GB.
-
-## Sign and stage the artifacts
-
-The `src` and `bin` artifacts need to be signed and uploaded to the dist SVN
-repository for staging.
-
-Before running the script, make sure that the `user@apache.org` code signing key is the default gpg signing key.
-One way to ensure this is to create/edit file `~/.gnupg/gpg.conf` and add a line
-```
-default-key 
-```
-where `` should be replaced with the private key fingerprint for the `user@apache.org` key. The key fingerprint can be found in `gpg -K` output.
-
-```shell
-svn co https://dist.apache.org/repos/dist/dev/pulsar pulsar-dist-dev
-cd pulsar-dist-dev
-
-# '-candidate-1' needs to be incremented in case of multiple iteration in getting
-#    to the final release)
-svn mkdir pulsar-2.X.0-candidate-1
-
-cd pulsar-2.X.0-candidate-1
-$PULSAR_PATH/src/stage-release.sh .
-
-svn add *
-svn ci -m 'Staging artifacts and signature for Pulsar release 2.X.0'
-```
-
-## Stage artifacts in maven
-
-Upload the artifacts to ASF Nexus:
-
-```shell
-# remove CPP client binaries (they would file the license/RAT check in "deploy")
-cd pulsar-client-cpp
-git clean -xfd
-cd ..
-
-export APACHE_USER=$USER
-export APACHE_PASSWORD=$MY_PASSWORD
-export GPG_TTY=$(tty)
-# src/settings.xml from master branch to /tmp/mvn-apache-settings.xml since it's missing in some branches
-curl -s -o /tmp/mvn-apache-settings.xml https://raw.githubusercontent.com/apache/pulsar/master/src/settings.xml
-# publish artifacts
-mvn deploy -DskipTests -Papache-release --settings /tmp/mvn-apache-settings.xml
-# publish org.apache.pulsar.tests:integration and it's parent pom org.apache.pulsar.tests:tests-parent
-mvn deploy -DskipTests -Papache-release --settings /tmp/mvn-apache-settings.xml -f tests/pom.xml -pl org.apache.pulsar.tests:tests-parent,org.apache.pulsar.tests:integration
-```
-
-> **NOTE**: The `GPG_TTY` environment variable must be set for all the following steps. Otherwise, some operations might fail by `gpg failed to sign the data`.
-
-This will ask for the GPG key passphrase and then upload it to the staging repository.
-
-> If you have deployed before, re-deploying might fail on pulsar-presto-connector-original.
->
-> See https://github.com/apache/pulsar/issues/17047.
->
-> You can run `mvn clean deploy` instead of `mvn deploy` as a workaround.
-
-Log in to the ASF Nexus repository at https://repository.apache.org
-
-Click on "Staging Repositories" on the left sidebar and then select the current
-Pulsar staging repo. This should be called something like `orgapachepulsar-XYZ`.
-
-Use the "Close" button to close the repository. This operation will take few
-minutes. Once complete click "Refresh" and now a link to the staging repository
-should be available, something like
-https://repository.apache.org/content/repositories/orgapachepulsar-XYZ
-
-## Publish release candidate docker images
-
-Run the following commands:
-
-```shell
-cd $PULSAR_HOME/docker
-./build.sh
-DOCKER_USER= DOCKER_PASSWORD= DOCKER_ORG= ./publish.sh
-```
-
-After that, the following images will be built and pushed to your own DockerHub account.
-- pulsar
-- pulsar-all
-- pulsar-grafana
-- pulsar-standalone
-
-
-## Run the vote
-
-Send an email to the Pulsar Dev mailing list:
-
-```
-To: dev@pulsar.apache.org
-Subject: [VOTE] Pulsar Release 2.X.0 Candidate 1
-
-This is the first release candidate for Apache Pulsar, version 2.X.0.
-
-It fixes the following issues:
-https://github.com/apache/pulsar/milestone/8?closed=1
-
-*** Please download, test and vote on this release. This vote will stay open
-for at least 72 hours ***
-
-Note that we are voting upon the source (tag), binaries are provided for
-convenience.
-
-Source and binary files:
-https://dist.apache.org/repos/dist/dev/pulsar/pulsar-2.X.0-candidate-1/
-
-SHA-512 checksums:
-028313cbbb24c5647e85a6df58a48d3c560aacc9  apache-pulsar-2.X.0-SNAPSHOT-bin.tar.gz
-f7cc55137281d5257e3c8127e1bc7016408834b1  apache-pulsar-2.x.0-SNAPSHOT-src.tar.gz
-
-Maven staging repo:
-https://repository.apache.org/content/repositories/orgapachepulsar-169/
-
-The tag to be voted upon:
-v2.X.0-candidate-1 (21f4a4cffefaa9391b79d79a7849da9c539af834)
-https://github.com/apache/pulsar/releases/tag/v2.X.0-candidate-1
-
-Pulsar's KEYS file containing PGP keys you use to sign the release:
-https://dist.apache.org/repos/dist/dev/pulsar/KEYS
-
-Docker images:
-
-
-
-
-
-Please download the source package, and follow the README to build
-and run the Pulsar standalone service.
-```
-
-The vote should be open for at least 72 hours (3 days). Votes from Pulsar PMC members
-will be considered binding, while anyone else is encouraged to verify the release and
-vote as well.
-
-If the release is approved here, you can then proceed to the next step. Otherwise, you should repeat the previous steps and prepare another candidate release to vote.
-
-## Move master branch to next version
-
-> **NOTE**: This step is for major releases only.
-
-You need to move the master version to the next iteration `Y` (`X + 1`).
-
-```shell
-git checkout master
-./src/set-project-version.sh 2.Y.0-SNAPSHOT
-
-git commit -m 'Bumped version to 2.Y.0-SNAPSHOT' -a
-```
-
-Since this needs to be merged into `master`, you need to follow the regular process
-and create a Pull Request on GitHub.
-
-## Promote the release
-
-Create the final git tag:
-
-```shell
-git tag -u $USER@apache.org v2.X.0 -m 'Release v2.X.0'
-git push origin v2.X.0
-```
-
-Promote the artifacts on the release location(repo https://dist.apache.org/repos/dist/release limited to PMC, You may need a PMC member's help if you are not one):
-```shell
-svn move -m "Release Apache Pulsar 2.X.Y" https://dist.apache.org/repos/dist/dev/pulsar/pulsar-2.X.0-candidate-1 \
-         https://dist.apache.org/repos/dist/release/pulsar/pulsar-2.X.0
-```
-
-Promote the Maven staging repository for release. Login to `https://repository.apache.org` and
-select the staging repository associated with the RC candidate that was approved. The naming
-will be like `orgapachepulsar-XYZ`. Select the repository and click on "Release". Artifacts
-will now be made available on Maven central.
-
-## Publish Docker Images
-
-Copy the approved candidate docker images from your personal account to apachepulsar org.
-
-```bash
-PULSAR_VERSION=2.x.x
-OTHER_DOCKER_USER=otheruser
-for image in pulsar pulsar-all pulsar-grafana pulsar-standalone; do
-    docker pull "${OTHER_DOCKER_USER}/$image:${PULSAR_VERSION}" && {
-      docker tag "${OTHER_DOCKER_USER}/$image:${PULSAR_VERSION}" "apachepulsar/$image:${PULSAR_VERSION}"
-      echo "Pushing apachepulsar/$image:${PULSAR_VERSION}"
-      docker push "apachepulsar/$image:${PULSAR_VERSION}"
-    }
-done
-```
-
-If you don't have the permission, you can ask someone with access to apachepulsar org to do that.
-
-## Release Helm Chart
-
-**This step can be skipped if the major version number is not the latest.**
-
-1. Bump the image version in the Helm Chart: [charts/pulsar/values.yaml](https://github.com/apache/pulsar-helm-chart/blob/master/charts/pulsar/values.yaml)
-
-2. Bump the chart version and `appVersion` in the Helm Chart to the released version: [charts/pulsar/Chart.yaml](https://github.com/apache/pulsar-helm-chart/blob/master/charts/pulsar/Chart.yaml)
-
-3. Send a pull request for reviews and get it merged.
-
-4. Once it is merged, the chart will be automatically released to Github releases at https://github.com/apache/pulsar-helm-chart and updated to https://pulsar.apache.org/charts.
-
-## Publish Python Clients
-
-> **NOTES**:
->
-> 1. You need to create an account on PyPI: https://pypi.org/account/register/
->
-> 2. Ask anyone that has been a release manager before to add you as a maintainer for pulsar-docker on PyPI
->
-> 3. Once you have completed the following steps in this section, you can check if the wheels are uploaded successfully in [Download files](https://pypi.org/project/pulsar-client/#files). Remember to switch to the correct version in [Release history](https://pypi.org/project/pulsar-client/#history)).
-
-### Linux
-
-There is a script that builds and packages the Python client inside Docker images.
-
-> Make sure you run following command at the release tag!!
-
-```shell
-pulsar-client-cpp/docker/build-wheels.sh
-```
-
-The wheel files will be left under `pulsar-client-cpp/python/wheelhouse`. Make sure all the files have `manylinux` in the filenames. Otherwise, those files will not be able to upload to PyPI.
-
-Run the following command to push the built wheel files.
-
-```shell
-cd pulsar-client-cpp/python/wheelhouse
-pip install twine
-twine upload pulsar_client-*.whl
-```
-
-### MacOS
-
-There is a script that builds and packages the Python client inside Docker images.
-
-```shell
-pulsar-client-cpp/python/build-mac-wheels.sh
-```
-
-The wheel files will be generated at each platform directory under `pulsar-client-cpp/python/pkg/osx/`.
-Then you can run `twin upload` to upload those wheel files.
-
-## Update Python Client docs
-
-After publishing the python client docs, run the following script from the apache/pulsar-site `main` branch:
-
-```shell
-PULSAR_VERSION=2.X.Y ./site2/tools/api/python/build-docs-in-docker.sh
-```
-
-Note that it builds the docs within a docker image, so you'll need to have docker running.
-
-Once the docs are generated, you can add them and submit them in a PR. The expected doc output is `site2/website/static/api/python`.
-
-## Publish Homebrew libpulsar package
-
-**This step can be skipped if the major version number is not the latest.**
-
-Release a new version of libpulsar for Homebrew, You can follow the example [here](https://github.com/Homebrew/homebrew-core/pull/53514).
-
-## Update swagger file
-
-> For major releases, the swagger file update happen under `master` branch.
-> while for minor releases, swagger file is created from branch-2.x, and need copy to a new branch based on master.
-
-```shell
-git checkout branch-2.X
-mvn -am -pl pulsar-broker install -DskipTests -Pswagger
-git checkout master
-git checkout -b fix/swagger-file
-mkdir -p site2/website/static/swagger/2.X.0
-cp pulsar-broker/target/docs/*.json site2/website/static/swagger/2.X.0
-```
-Send out a PR request for review.
-
-## Write release notes
-
-See [Pulsar Release Notes Guide](./release-note-guide.md).
-
-## Update the site
-
-> **NOTE**: This step is for major releases only.
-
-For major releases, such as 2.10.0, the website is updated based on the `master` branch.
-
-1. Create a new branch off master.
-
-```shell
-git checkout -b doc_release_
-```
-
-2. Go to the website directory.
-
-```shell
-cd site2/website
-```
-
-3. Generate a new version of the documentation.
-
-```shell
-yarn install
-yarn run version 
-```
-
-After you run this command, a new folder `version-` is added in the `site2/website/versioned_docs` directory, a new sidebar file `version--sidebars.json` is added in the `site2/website/versioned_sidebars` directory, and the new version is added in the `versions.json` file, shown as follows:
-
-  ```shell
-  versioned_docs/version-
-  versioned_sidebars/version--sidebars.json
-  ```
-
-> **NOTE**: You can move the latest version under the old version in the `versions.json` file. Make sure the Algolia index works before moving 2.X.0 as the current stable.
-
-4. Update the `releases.json` file by adding `` to the second of the list (this is to make the search work. After your PR is merged, the Pulsar website is built and tagged for search, you can change it to the first list).
-
-5. Send out a PR request for review.
-
-   After your PR is approved and merged to master, the website is published automatically after the new website is built. The website is built every 6 hours.
-
-6. Check the new website after the website is built.
-   Open https://pulsar.apache.org in your browsers to verify all the changes are alive. If the website build succeeds but the website is not updated, you can try to sync the git repository. Navigate to https://selfserve.apache.org/ and click the "Synchronize Git Repositories" and then select apache/pulsar.
-
-7. Publish the release on GitHub, and copy the same release notes: https://github.com/apache/pulsar/releases.
-
-8. Update the deploy version to the current release version in `deployment/terraform-ansible/deploy-pulsar.yaml`.
-
-9. Generate the doc set and sidebar file for the next major release `2.X.x` based on the `site2/docs` folder. You can follow steps 1, 2, and 3, and submit those files to the `apache/pulsar` repository. This step is a preparation for the `2.X.x` release.
-
-> **NOTE**: Starting from 2.8.0, you don't need to generate an independent doc set or update the Pulsar site for minor releases, such as 2.8.1, 2.8.2, and so on. Instead, the generic doc set 2.8.x is used.
-
-## Announce the release
-
-Once the release artifacts are available in the Apache Mirrors and the website is updated,
-we need to announce the release.
-
-Send an email to these lines:
-
-```
-To: dev@pulsar.apache.org, users@pulsar.apache.org, announce@apache.org
-Subject: [ANNOUNCE] Apache Pulsar 2.X.0 released
-
-The Apache Pulsar team is proud to announce Apache Pulsar version 2.X.0.
-
-Pulsar is a highly scalable, low latency messaging platform running on
-commodity hardware. It provides simple pub-sub semantics over topics,
-guaranteed at-least-once delivery of messages, automatic cursor management for
-subscribers, and cross-datacenter replication.
-
-For Pulsar release details and downloads, visit:
-
-https://pulsar.apache.org/download
-
-Release Notes are at:
-https://pulsar.apache.org/release-notes
-
-We would like to thank the contributors that made the release possible.
-
-Regards,
-
-The Pulsar Team
-```
-
-Send the email in plain text mode since the announce@apache.org mailing list will reject messages with text/html content.
-In Gmail, there's an option to set `Plain text mode` in the `⋮`/ `More options` menu.
-
-
-## Write a blog post for the release (optional)
-
-It is encouraged to write a blog post to summarize the features introduced in this release,
-especially for feature releases.
-You can follow the example [here](https://github.com/apache/pulsar/pull/2308)
-
-## Remove old releases
-
-Remove the old releases (if any). You only need the latest release there, and older releases are
-available through the Apache archive:
-
-```shell
-# Get the list of releases
-svn ls https://dist.apache.org/repos/dist/release/pulsar
-
-# Delete each release (except for the last one)
-svn rm https://dist.apache.org/repos/dist/release/pulsar/pulsar-2.Y.0
-```
-
-## Move release branch to next version
-
-Run the following commands in the release branches.
-
-```shell
-./src/set-project-version.sh 2.X.Y-SNAPSHOT
-
-git commit -m 'Bumped version to 2.X.Y-SNAPSHOT' -a
-git push origin branch-2.X
-```
diff --git a/wireshark/README.md b/wireshark/README.md
index aa4968103e95d..2fb23d40383f2 100644
--- a/wireshark/README.md
+++ b/wireshark/README.md
@@ -19,6 +19,8 @@
 
 -->
 
+> **Note**: This Lua script may cause a crash in the newest version of Wireshark, see [#18439](https://github.com/apache/pulsar/issues/18439). Make sure the version of Wireshark is earlier than v4.0.0.
+
 # How to use 
 
 ## Step 1: prepare PulsarApi.proto file
@@ -30,6 +32,9 @@ You need to put PulsarApi.proto to a separate path.
 
 3. Add the path of PulsarApi.proto.
 
+4. Check `Dissect Protobuf fields as Wireshark fields` box. When this box is checked, 
+you can use `pbf.pulsar.proto` to visit fields in protobuf package.  
+
 ## Step 2: add pulsar.lua to plugins
 
 1. Open Wireshark.
@@ -40,6 +45,8 @@ You need to put PulsarApi.proto to a separate path.
 
 ## Step 3: start to use
 
-This plugin registers a Pulsar protocol automatically in 6650. You can use it to decode Pulsar messages now.
-
+This plugin registers a Pulsar protocol automatically in 6650. You can use this Wireshark filter string to find out Pulsar packages (ignore ping/pong):
 
+```
+tcp.port eq 6650 and pulsar and pbf.pulsar.proto.BaseCommand.type ne "ping" and pbf.pulsar.proto.BaseCommand.type ne "pong"
+```